feat: generar el sitio en orden #10464

app/jobs/deploy_job.rb

@@ -30,28 +30,30 @@ class DeployJob < ApplicationJob
         return
       end
 
+      @deployed = {}
       @site.update status: 'building'
-      # Asegurarse que DeployLocal sea el primero!
+      @site.deployment_list.each do |d|
-      @deployed = {
+        begin
-        deploy_local: {
+          raise DeployException, 'Una dependencia falló' if failed_dependencies? d
-          status: deploy_locally,
+
-          seconds: deploy_local.build_stats.last.seconds,
+          status = d.deploy
-          size: deploy_local.size,
+          seconds = d.build_stats.last.try(:seconds)
-          urls: [deploy_local.url]
+        rescue StandardError => e
+          status = false
+          seconds = 0
+
+          notify_exception e, d
+        end
+
+        @deployed[d.type.underscore.to_sym] = {
+          status: status,
+          seconds: seconds || 0,
+          size: d.size,
+          urls: d.respond_to?(:urls) ? d.urls : [d.url].compact
         }
-      }
-
-      # No es opcional
-      unless @deployed[:deploy_local][:status]
-        # Hacer fallar la tarea
-        raise DeployException, "#{@site.name}: Falló la compilación"
       end
-
-      deploy_others
     rescue DeployTimedOutException => e
       notify_exception e
-    rescue DeployException => e
-      notify_exception e, deploy_local
     ensure
       @site&.update status: 'waiting'
 
@@ -62,47 +64,37 @@ class DeployJob < ApplicationJob
 
   private
 
+  # Detecta si un método de publicación tiene dependencias fallidas
+  #
+  # @param :deploy [Deploy]
+  # @return [Boolean]
+  def failed_dependencies?(deploy)
+    failed_dependencies(deploy).present?
+  end
+
+  # Obtiene las dependencias fallidas de un deploy
+  #
+  # @param :deploy [Deploy]
+  # @return [Array]
+  def failed_dependencies(deploy)
+    deploy.class::DEPENDENCIES & (@deployed.reject do |_, v|
+      v[:status]
+    end.keys)
+  end
+
   # @param :exception [StandardError]
   # @param :deploy [Deploy]
   def notify_exception(exception, deploy = nil)
     data = {
       site: @site.id,
       deploy: deploy&.type,
-      log: deploy&.build_stats&.last&.log
+      log: deploy&.build_stats&.last&.log,
+      failed_dependencies: (failed_dependencies(deploy) if deploy)
     }
 
     ExceptionNotifier.notify_exception(exception, data: data)
   end
 
-  def deploy_local
-    @deploy_local ||= @site.deploys.find_by(type: 'DeployLocal')
-  end
-
-  def deploy_locally
-    deploy_local.deploy(output: @output)
-  end
-
-  def deploy_others
-    @site.deploys.where.not(type: 'DeployLocal').find_each do |d|
-      begin
-        status = d.deploy(output: @output)
-        seconds = d.build_stats.last.try(:seconds)
-      rescue StandardError => e
-        status = false
-        seconds = 0
-
-        notify_exception e, d
-      end
-
-      @deployed[d.type.underscore.to_sym] = {
-        status: status,
-        seconds: seconds || 0,
-        size: d.size,
-        urls: d.respond_to?(:urls) ? d.urls : [d.url].compact
-      }
-    end
-  end
-
   def notify_usuaries
     @site.roles.where(rol: 'usuarie', temporal: false).pluck(:usuarie_id).each do |usuarie|
       DeployMailer.with(usuarie: usuarie, site: @site.id)

app/models/deploy_alternative_domain.rb

@@ -4,7 +4,7 @@
 class DeployAlternativeDomain < Deploy
   store :values, accessors: %i[hostname], coder: JSON
 
-  DEPENDENCIES = %i[local]
+  DEPENDENCIES = %i[deploy_local]
 
   # Generar un link simbólico del sitio principal al alternativo
   def deploy(**)

app/models/deploy_rsync.rb

@@ -6,11 +6,11 @@ class DeployRsync < Deploy
   store :values, accessors: %i[destination host_keys], coder: JSON
 
   DEPENDENCIES = %i[
-    alternative_domain
+    deploy_alternative_domain
-    hidden_service
+    deploy_hidden_service
-    local
+    deploy_local
-    www
+    deploy_www
-    zip
+    deploy_zip
   ]
 
   def deploy(output: false)

app/models/deploy_www.rb

@@ -4,7 +4,7 @@
 class DeployWww < Deploy
   store :values, accessors: %i[], coder: JSON
 
-  DEPENDENCIES = %i[local]
+  DEPENDENCIES = %i[deploy_local]
 
   before_destroy :remove_destination!
 

app/models/deploy_zip.rb

@@ -8,7 +8,7 @@ require 'zip'
 class DeployZip < Deploy
   store :values, accessors: %i[], coder: JSON
 
-  DEPENDENCIES = %i[local]
+  DEPENDENCIES = %i[deploy_local]
 
   # Una vez que el sitio está generado, tomar todos los archivos y
   # y generar un zip accesible públicamente.

app/models/site/deploy_dependencies.rb

@@ -19,7 +19,7 @@ class Site
 
           deploys.each do |deploy|
             deploy.class::DEPENDENCIES.each do |dependency|
-              deploys.where(type: "Deploy#{dependency.to_s.classify}").each do |deploy_dependency|
+              deploys.where(type: dependency.to_s.classify).each do |deploy_dependency|
                 graph.add_edge deploy_dependency, deploy
               end
             end