From fd9d68b3df712ab276d6863b3bd4f3a61a6621b9 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 31 Mar 2023 12:01:00 -0300
Subject: [PATCH 1/4] =?UTF-8?q?BREAKING=20CHANGE:=20usar=20la=20=C3=BAltim?=
 =?UTF-8?q?a=20instancia=20de=20Distributed=20Press?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/deploy_distributed_press.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index a2e2e20a..64c66cfc 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -88,7 +88,7 @@ class DeployDistributedPress < Deploy
   #
   # @return [DistributedPressPublisher]
   def publisher
-    @publisher ||= DistributedPressPublisher.first
+    @publisher ||= DistributedPressPublisher.last
   end
 
   # El cliente para actualizar el sitio

From d4f5bb60eea6afae230dc878bda083d757159eb7 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 31 Mar 2023 12:14:14 -0300
Subject: [PATCH 2/4] feat: indicarle a distributed press que elimine el sitio

sutty/distributed-press-api-client#10
---
 Gemfile                                |  2 +-
 app/models/deploy_distributed_press.rb | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9d1b6d67..2ff1c68c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ gem 'commonmarker'
 gem 'devise'
 gem 'devise-i18n'
 gem 'devise_invitable'
-gem 'distributed-press-api-client', '~> 0.2.2'
+gem 'distributed-press-api-client', '~> 0.2.3'
 gem 'njalla-api-client'
 gem 'email_address', git: 'https://github.com/fauno/email_address', branch: 'i18n'
 gem 'exception_notification'
diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index 64c66cfc..28ddebc0 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -16,6 +16,7 @@ class DeployDistributedPress < Deploy
   store :values, accessors: %i[hostname remote_site_id remote_info], coder: JSON
 
   before_create :create_remote_site!, :create_njalla_records!
+  before_destroy :delete_remote_site!
 
   DEPENDENCIES = %i[deploy_local]
 
@@ -120,9 +121,9 @@ class DeployDistributedPress < Deploy
 
     self.remote_site_id = created_site[:id]
     self.remote_info = created_site.to_h
+    nil
   rescue DistributedPress::V1::Error => e
     ExceptionNotifier.notify_exception(e, data: { site: site.name })
-  ensure
     nil
   end
 
@@ -156,6 +157,14 @@ class DeployDistributedPress < Deploy
     nil
   end
 
+  def delete_remote_site!
+    site_client.destroy(publishing_site)
+    nil
+  rescue DistributedPress::V1::Error => e
+    ExceptionNotifier.notify_exception(e, data: { site: site.name })
+    nil
+  end
+
   # Actualizar registros en Njalla
   #
   # @return [Njalla::V1::Domain]

From db67b9dbf3273e2221071bed50802fd95899443f Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 31 Mar 2023 13:35:42 -0300
Subject: [PATCH 3/4] feat: eliminar registros en njalla

---
 Gemfile                                |  2 +-
 Gemfile.lock                           |  2 +-
 app/models/deploy_distributed_press.rb | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2ff1c68c..b2472035 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,7 +40,7 @@ gem 'devise'
 gem 'devise-i18n'
 gem 'devise_invitable'
 gem 'distributed-press-api-client', '~> 0.2.3'
-gem 'njalla-api-client'
+gem 'njalla-api-client', '~> 0.2.0'
 gem 'email_address', git: 'https://github.com/fauno/email_address', branch: 'i18n'
 gem 'exception_notification'
 gem 'fast_blank'
diff --git a/Gemfile.lock b/Gemfile.lock
index c2c29531..c5e0af41 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -387,7 +387,7 @@ GEM
     nokogiri (1.12.5-x86_64-linux-musl)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    njalla-api-client (0.1.0)
+    njalla-api-client (0.2.0)
       dry-schema
       httparty (~> 0.18)
     orm_adapter (0.5.0)
diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index 28ddebc0..3d101204 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -16,7 +16,7 @@ class DeployDistributedPress < Deploy
   store :values, accessors: %i[hostname remote_site_id remote_info], coder: JSON
 
   before_create :create_remote_site!, :create_njalla_records!
-  before_destroy :delete_remote_site!
+  before_destroy :delete_remote_site!, :delete_njalla_records!
 
   DEPENDENCIES = %i[deploy_local]
 
@@ -165,6 +165,14 @@ class DeployDistributedPress < Deploy
     nil
   end
 
+  def delete_njalla_records!
+    %[a ns cname].each do |type|
+      next unless (id = remote_info.dig('njalla', type, 'id'))
+
+      njalla.remove_record(id: id)
+    end
+  end
+
   # Actualizar registros en Njalla
   #
   # @return [Njalla::V1::Domain]

From 786aba5552e4c7f445c0911a628284dfdc2d5f01 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 31 Mar 2023 13:36:02 -0300
Subject: [PATCH 4/4] fixup! feat: indicarle a distributed press que elimine el
 sitio

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c5e0af41..67ce13e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -622,7 +622,7 @@ DEPENDENCIES
   devise
   devise-i18n
   devise_invitable
-  distributed-press-api-client (~> 0.2.2)
+  distributed-press-api-client (~> 0.2.3)
   dotenv-rails
   down
   ed25519