From b0bf0c0c535b8c52ce6d4fafc5a3167c95322a4e Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 10 Apr 2024 11:00:18 -0300
Subject: [PATCH] BREAKING CHANGE: usar global ids en los jobs

---
 app/controllers/api/v1/contact_controller.rb |  2 +-
 app/controllers/api/v1/notices_controller.rb |  2 +-
 app/jobs/application_job.rb                  |  8 ++---
 app/jobs/backtrace_job.rb                    |  9 ++----
 app/jobs/contact_job.rb                      |  8 ++---
 app/jobs/deploy_job.rb                       | 32 ++++++++++----------
 app/jobs/git_push_job.rb                     |  4 ---
 app/jobs/maintenance_job.rb                  |  3 +-
 app/jobs/periodic_job.rb                     |  3 --
 app/jobs/stat_collection_job.rb              |  6 ++--
 app/jobs/uri_collection_job.rb               |  4 +--
 app/mailers/application_mailer.rb            |  2 +-
 app/mailers/deploy_mailer.rb                 |  3 +-
 app/mailers/invitadx_mailer.rb               |  9 ------
 app/models/log_entry.rb                      |  2 +-
 app/services/site_service.rb                 |  2 +-
 lib/tasks/stats.rake                         |  6 ++--
 17 files changed, 37 insertions(+), 68 deletions(-)
 delete mode 100644 app/mailers/invitadx_mailer.rb

diff --git a/app/controllers/api/v1/contact_controller.rb b/app/controllers/api/v1/contact_controller.rb
index d949dc30..c340097f 100644
--- a/app/controllers/api/v1/contact_controller.rb
+++ b/app/controllers/api/v1/contact_controller.rb
@@ -18,7 +18,7 @@ module Api
 
         # Si todo salió bien, enviar los correos y redirigir al sitio.
         # El sitio nos dice a dónde tenemos que ir.
-        ContactJob.perform_later site.id,
+        ContactJob.perform_later site,
                                  params[:form],
                                  contact_params.to_h.symbolize_keys,
                                  params[:redirect]
diff --git a/app/controllers/api/v1/notices_controller.rb b/app/controllers/api/v1/notices_controller.rb
index 8f384f1a..01bec517 100644
--- a/app/controllers/api/v1/notices_controller.rb
+++ b/app/controllers/api/v1/notices_controller.rb
@@ -11,7 +11,7 @@ module Api
       # respondemos con lo mismo.
       def create
         if (site&.airbrake_valid? airbrake_token) && !detected_device.bot?
-          BacktraceJob.perform_later site_id: params[:site_id],
+          BacktraceJob.perform_later site: site,
                                      params: airbrake_params.to_h
         end
 
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
index 8b85358c..66345949 100644
--- a/app/jobs/application_job.rb
+++ b/app/jobs/application_job.rb
@@ -4,14 +4,10 @@
 class ApplicationJob < ActiveJob::Base
   include Que::ActiveJob::JobExtensions
 
+  attr_reader :site
+
   # Si falla por cualquier cosa informar y descartar
   discard_on(Exception) do |error|
     ExceptionNotifier.notify_exception(error, data: { site: site.name })
   end
-
-  private
-
-  def site
-    @site ||= Site.find @params[:site_id]
-  end
 end
diff --git a/app/jobs/backtrace_job.rb b/app/jobs/backtrace_job.rb
index 97e6007b..830dc9b3 100644
--- a/app/jobs/backtrace_job.rb
+++ b/app/jobs/backtrace_job.rb
@@ -6,10 +6,9 @@ class BacktraceJob < ApplicationJob
 
   EMPTY_SOURCEMAP = { 'mappings' => '' }.freeze
 
-  attr_reader :params, :site_id
+  attr_reader :params
 
-  def perform(site_id:, params:)
-    @site_id = site_id
+  def perform(site:, params:)
     @params = params
 
     unless sources.empty?
@@ -44,10 +43,6 @@ class BacktraceJob < ApplicationJob
 
   private
 
-  def site
-    @site ||= Site.find_by_id(site_id)
-  end
-
   # Obtiene todos los archivos del backtrace solo si los puede descargar
   # desde fuentes seguras.
   #
diff --git a/app/jobs/contact_job.rb b/app/jobs/contact_job.rb
index c15d7eee..2ac80ce3 100644
--- a/app/jobs/contact_job.rb
+++ b/app/jobs/contact_job.rb
@@ -5,11 +5,7 @@ class ContactJob < ApplicationJob
   # @param [Integer]
   # @param [String]
   # @param [Hash]
-  def perform(site_id, form_name, form, origin = nil)
-    # Retrocompabilidad al actualizar a 2.7.1
-    # @see ApplicationJob#site
-    @params = { site_id: site_id }
-
+  def perform(site, form_name, form, origin = nil)
     # Sanitizar los valores
     form.each_key do |key|
       form[key] = ActionController::Base.helpers.sanitize form[key]
@@ -23,7 +19,7 @@ class ContactJob < ApplicationJob
     usuaries.each_slice(10) do |u|
       ContactMailer.with(form_name: form_name,
                          form: form,
-                         site_id: site_id,
+                         site: site,
                          usuaries_emails: u,
                          origin: origin)
                    .notify_usuaries.deliver_now
diff --git a/app/jobs/deploy_job.rb b/app/jobs/deploy_job.rb
index 6765bb89..103656f4 100644
--- a/app/jobs/deploy_job.rb
+++ b/app/jobs/deploy_job.rb
@@ -16,34 +16,32 @@ class DeployJob < ApplicationJob
 
   # rubocop:disable Metrics/MethodLength
   def perform(site, notify: true, time: Time.now, output: false)
-    @output = output
+    @site = site
 
     ActiveRecord::Base.connection_pool.with_connection do
-      @site = Site.find(site)
-
       # Si ya hay una tarea corriendo, aplazar esta.  Si estuvo
       # esperando más de 10 minutos, recuperar el estado anterior.
       #
       # Como el trabajo actual se aplaza al siguiente, arrastrar la
       # hora original para poder ir haciendo timeouts.
-      if @site.building?
+      if site.building?
         notify = false
 
         if 10.minutes.ago >= time
           raise DeployTimedOutException,
-                "#{@site.name} la tarea estuvo más de 10 minutos esperando, volviendo al estado original"
+                "#{site.name} la tarea estuvo más de 10 minutos esperando, volviendo al estado original"
         else
           raise DeployAlreadyRunningException
         end
       end
 
       @deployed = {}
-      @site.update status: 'building'
-      @site.deployment_list.each do |d|
+      site.update status: 'building'
+      site.deployment_list.each do |d|
         begin
           raise DeployException, 'Una dependencia falló' if failed_dependencies? d
 
-          status = d.deploy(output: @output)
+          status = d.deploy(output: output)
           seconds = d.build_stats.last.try(:seconds) || 0
           size = d.size
           urls = d.urls.map do |url|
@@ -52,7 +50,7 @@ class DeployJob < ApplicationJob
             nil
           end.compact
 
-          if d == @site.deployment_list.last && !status
+          if d == site.deployment_list.last && !status
             raise DeployException, 'Falló la compilación'
           end
         rescue StandardError => e
@@ -73,7 +71,7 @@ class DeployJob < ApplicationJob
         }
       end
 
-      return unless @output
+      return unless output
 
       puts (Terminal::Table.new do |t|
         t << (%w[type] + @deployed.values.first.keys)
@@ -83,12 +81,12 @@ class DeployJob < ApplicationJob
         end
       end)
     ensure
-      if @site.present?
-        @site.update status: 'waiting'
+      if site.present?
+        site.update status: 'waiting'
 
         notify_usuaries if notify
 
-        puts "\a" if @output
+        puts "\a" if output
       end
     end
   end
@@ -118,7 +116,7 @@ class DeployJob < ApplicationJob
   # @param :deploy [Deploy]
   def notify_exception(exception, deploy = nil)
     data = {
-      site: @site.id,
+      site: site.name,
       deploy: deploy&.type,
       log: deploy&.build_stats&.last&.log,
       failed_dependencies: (failed_dependencies(deploy) if deploy)
@@ -128,8 +126,10 @@ class DeployJob < ApplicationJob
   end
 
   def notify_usuaries
-    @site.roles.where(rol: 'usuarie', temporal: false).pluck(:usuarie_id).each do |usuarie|
-      DeployMailer.with(usuarie: usuarie, site: @site.id)
+    usuarie_ids = site.roles.where(rol: 'usuarie', temporal: false).pluck(:usuarie_id)
+
+    Usuarie.where(id: usuarie_ids).find_each do |usuarie|
+      DeployMailer.with(usuarie_id: usuarie, site: site)
                   .deployed(@deployed)
                   .deliver_now
     end
diff --git a/app/jobs/git_push_job.rb b/app/jobs/git_push_job.rb
index 260e3476..d8c811ba 100644
--- a/app/jobs/git_push_job.rb
+++ b/app/jobs/git_push_job.rb
@@ -3,13 +3,9 @@
 # Permite pushear los cambios cada vez que se
 # hacen commits en un sitio
 class GitPushJob < ApplicationJob
-  attr_reader :site
-
   # @param :site [Site]
   # @return [nil]
   def perform(site)
-    @site = site
-
     site.repository.push if site.repository.origin
   end
 end
diff --git a/app/jobs/maintenance_job.rb b/app/jobs/maintenance_job.rb
index c7a962f9..02f29a77 100644
--- a/app/jobs/maintenance_job.rb
+++ b/app/jobs/maintenance_job.rb
@@ -15,8 +15,7 @@
 # Lo mismo para salir de mantenimiento, agregando el atributo
 # are_we_back: true al crear el Maintenance.
 class MaintenanceJob < ApplicationJob
-  def perform(maintenance_id:)
-    maintenance = Maintenance.find(maintenance_id)
+  def perform(maintenance:)
     # Decidir cuál vamos a enviar según el estado de Maintenance
     mailer = maintenance.are_we_back ? :were_back : :notice
 
diff --git a/app/jobs/periodic_job.rb b/app/jobs/periodic_job.rb
index 2f60a2b3..f66434c9 100644
--- a/app/jobs/periodic_job.rb
+++ b/app/jobs/periodic_job.rb
@@ -6,9 +6,6 @@ class PeriodicJob < ApplicationJob
 
   STARTING_INTERVAL = Stat::INTERVALS.first
 
-  # Tener el sitio a mano
-  attr_reader :site
-
   # Descartar y notificar si pasó algo más.
   #
   # XXX: En realidad deberíamos seguir reintentando?
diff --git a/app/jobs/stat_collection_job.rb b/app/jobs/stat_collection_job.rb
index e402e3b5..02752901 100644
--- a/app/jobs/stat_collection_job.rb
+++ b/app/jobs/stat_collection_job.rb
@@ -7,8 +7,8 @@ class StatCollectionJob < PeriodicJob
 
   STAT_NAME = 'stat_collection_job'
 
-  def perform(site_id:, once: true)
-    @site = Site.find site_id
+  def perform(site:, once: true)
+    @site = site
     beginning = beginning_of_interval
     stat = site.stats.create! name: STAT_NAME
 
@@ -22,7 +22,7 @@ class StatCollectionJob < PeriodicJob
       rollup.average(:seconds)
     end
 
-    dimensions = { site_id: site_id }
+    dimensions = { site_id: site.id }
 
     reduce_rollup(name: 'builds', operation: :sum, dimensions: dimensions)
     reduce_rollup(name: 'space_used', operation: :average, dimensions: dimensions)
diff --git a/app/jobs/uri_collection_job.rb b/app/jobs/uri_collection_job.rb
index 4cbbf593..92d788bc 100644
--- a/app/jobs/uri_collection_job.rb
+++ b/app/jobs/uri_collection_job.rb
@@ -16,8 +16,8 @@ class UriCollectionJob < PeriodicJob
   IMAGES = %w[.png .jpg .jpeg .gif .webp .jfif].freeze
   STAT_NAME = 'uri_collection_job'
 
-  def perform(site_id:, once: true)
-    @site = Site.find site_id
+  def perform(site:, once: true)
+    @site = site
 
     # Obtener el principio del intervalo anterior
     beginning_of_interval
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 8369550d..1f1d453e 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -10,7 +10,7 @@ class ApplicationMailer < ActionMailer::Base
   private
 
   def site
-    @site ||= Site.find @params[:site_id]
+    @site ||= @params[:site]
   end
 
   def inline_logo!
diff --git a/app/mailers/deploy_mailer.rb b/app/mailers/deploy_mailer.rb
index 37748b42..abf6932c 100644
--- a/app/mailers/deploy_mailer.rb
+++ b/app/mailers/deploy_mailer.rb
@@ -13,8 +13,7 @@ class DeployMailer < ApplicationMailer
 
   # rubocop:disable Metrics/AbcSize
   def deployed(deploys = {})
-    usuarie = Usuarie.find(params[:usuarie])
-    site = usuarie.sites.find(params[:site])
+    usuarie = params[:usuarie]
     hostname = site.hostname
     deploys ||= {}
 
diff --git a/app/mailers/invitadx_mailer.rb b/app/mailers/invitadx_mailer.rb
deleted file mode 100644
index cfb80a55..00000000
--- a/app/mailers/invitadx_mailer.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class InvitadxMailer < ApplicationMailer
-  def confirmation_required
-    @invitadx = params[:invitadx]
-    @site = params[:site]
-    mail from: "#{@site.config.dig('title')} <#{ENV.fetch('DEFAULT_FROM', 'sutty@kefir.red')}>", to: @invitadx.email, subject: t('.subject')
-  end
-end
diff --git a/app/models/log_entry.rb b/app/models/log_entry.rb
index 9685e0d0..7525177a 100644
--- a/app/models/log_entry.rb
+++ b/app/models/log_entry.rb
@@ -11,7 +11,7 @@ class LogEntry < ApplicationRecord
   def resend
     return if sent
 
-    ContactJob.perform_later site_id, params[:form], params
+    ContactJob.perform_later site, params[:form], params
   end
 
   def params
diff --git a/app/services/site_service.rb b/app/services/site_service.rb
index 5c37cfe3..3a6b36f7 100644
--- a/app/services/site_service.rb
+++ b/app/services/site_service.rb
@@ -5,7 +5,7 @@
 SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do
   def deploy
     site.enqueue!
-    DeployJob.perform_later site.id
+    DeployJob.perform_later site
   end
 
   # Crea un sitio, agrega un rol nuevo y guarda los cambios a la
diff --git a/lib/tasks/stats.rake b/lib/tasks/stats.rake
index 9461782a..fbcb5fa4 100644
--- a/lib/tasks/stats.rake
+++ b/lib/tasks/stats.rake
@@ -3,9 +3,9 @@
 namespace :stats do
   desc 'Process stats'
   task process_all: :environment do
-    Site.all.pluck(:id).each do |site_id|
-      UriCollectionJob.perform_now site_id: site_id, once: true
-      StatCollectionJob.perform_now site_id: site_id, once: true
+    Site.all.find_each do |site|
+      UriCollectionJob.perform_now site: site, once: true
+      StatCollectionJob.perform_now site: site, once: true
     end
   end
 end