From d2e4fe09646e7b337868bf6711e2a3e5062a426b Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 31 Mar 2023 13:58:10 -0300
Subject: [PATCH] fix: los registros en njalla no siempre son necesarios

---
 app/models/deploy_distributed_press.rb | 36 ++++++++++++++++++--------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index 9f78ba28..b77dfe19 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -34,8 +34,12 @@ class DeployDistributedPress < Deploy
     create_njalla_records!
     save
 
-    if remote_site_id.blank? || remote_info['njalla'].blank?
-      raise DeployJob::DeployException, ''
+    if remote_site_id.blank?
+      raise DeployJob::DeployException, 'El sitio no se creó en Distributed Press'
+    end
+
+    if create_njalla_records? && remote_info['njalla'].blank?
+      raise DeployJob::DeployException, 'No se pudieron crear los registros necesarios en Njalla'
     end
 
     site_client.tap do |c|
@@ -129,17 +133,20 @@ class DeployDistributedPress < Deploy
 
   # Crea los registros en Njalla
   #
+  # XXX: Esto depende de nuestro DNS actual, cuando lo migremos hay
+  # que eliminarlo.
+  #
   # @return [nil]
   def create_njalla_records!
-    # XXX: Esto depende de nuestro DNS actual, cuando lo migremos hay
-    # que eliminarlo.
-    unless site.name.end_with? '.'
-      self.remote_info ||= {}
-      self.remote_info['njalla'] ||= {}
-      self.remote_info['njalla']['a']     ||= njalla.add_record(name: site.name, type: 'CNAME', content: "#{Site.domain}.").to_h
-      self.remote_info['njalla']['cname'] ||= njalla.add_record(name: "www.#{site.name}", type: 'CNAME', content: "#{Site.domain}.").to_h
-      self.remote_info['njalla']['ns']    ||= njalla.add_record(name: "_dnslink.#{site.name}", type: 'NS', content: "#{publisher.hostname}.").to_h
-    end
+    return unless create_njalla_records?
+
+    self.remote_info ||= {}
+    self.remote_info['njalla'] ||= {}
+    self.remote_info['njalla']['a']     ||= njalla.add_record(name: site.name, type: 'CNAME', content: "#{Site.domain}.").to_h
+    self.remote_info['njalla']['cname'] ||= njalla.add_record(name: "www.#{site.name}", type: 'CNAME', content: "#{Site.domain}.").to_h
+    self.remote_info['njalla']['ns']    ||= njalla.add_record(name: "_dnslink.#{site.name}", type: 'NS', content: "#{publisher.hostname}.").to_h
+
+    nil
   rescue HTTParty::Error => e
     ExceptionNotifier.notify_exception(e, data: { site: site.name })
     self.remote_info['njalla'] = nil
@@ -166,6 +173,8 @@ class DeployDistributedPress < Deploy
   end
 
   def delete_njalla_records!
+    return unless create_njalla_records?
+
     %w[a ns cname].each do |type|
       next if (id = remote_info.dig('njalla', type, 'id')).blank?
 
@@ -184,4 +193,9 @@ class DeployDistributedPress < Deploy
         Njalla::V1::Domain.new(domain: Site.domain, client: client)
       end
   end
+
+  # Detecta si tenemos que crear registros en Njalla
+  def create_njalla_records?
+    !site.name.end_with?('.')
+  end
 end