From 7191baff4abd7d6358769a5aebdd032e84c80aba Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 31 May 2021 13:23:40 -0300
Subject: [PATCH] =?UTF-8?q?reindexar=20despu=C3=A9s=20de=20mergear?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/sites_controller.rb |  2 +-
 app/services/site_service.rb        | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/controllers/sites_controller.rb b/app/controllers/sites_controller.rb
index 20ce5bad..bdaa9011 100644
--- a/app/controllers/sites_controller.rb
+++ b/app/controllers/sites_controller.rb
@@ -107,7 +107,7 @@ class SitesController < ApplicationController
   def merge
     authorize site
 
-    if site.repository.merge(current_usuarie)
+    if SiteService.new(site: site, usuarie: current_usuarie).merge
       flash[:success] = I18n.t('sites.fetch.merge.success')
     else
       flash[:error] = I18n.t('sites.fetch.merge.error')
diff --git a/app/services/site_service.rb b/app/services/site_service.rb
index 4f3905a5..389549c3 100644
--- a/app/services/site_service.rb
+++ b/app/services/site_service.rb
@@ -61,6 +61,18 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do
     commit_config(action: :tor)
   end
 
+  # Trae cambios desde la rama remota y reindexa los artículos.
+  #
+  # @return [Boolean]
+  def merge
+    result = site.repository.merge(usuarie)
+
+    # TODO: Implementar callbacks
+    site.try(:index_posts!) if result
+
+    result.present?
+  end
+
   private
 
   # Guarda los cambios de la configuración en el repositorio git