Merge pull request #960 from alphagov/first-interactors

First Interactors

Gemfile

@@ -16,6 +16,7 @@ gem "govuk_publishing_components", "~> 16.11"
 gem "govuk_sidekiq", "~> 3"
 gem "hashdiff", "~> 0.3"
 gem "image_processing", "~> 1"
+gem "interactor", "~> 3"
 gem "kaminari", "~> 1"
 gem "notifications-ruby-client", "~> 3.1"
 gem "pg", "~> 1"

Gemfile.lock

@@ -189,6 +189,7 @@ GEM
     image_processing (1.9.0)
       mini_magick (>= 4.9.3, < 5)
       ruby-vips (>= 2.0.13, < 3)
+    interactor (3.1.1)
     io-like (0.3.0)
     jaro_winkler (1.5.2)
     jasmine (3.4.0)
@@ -466,6 +467,7 @@ DEPENDENCIES
   govuk_test (~> 0.4)
   hashdiff (~> 0.3)
   image_processing (~> 1)
+  interactor (~> 3)
   jasmine (~> 3.4)
   jasmine_selenium_runner (~> 3)
   kaminari (~> 1)

app/controllers/contacts_controller.rb

@@ -10,34 +10,8 @@ def search
   end
 
   def insert
-    Edition.find_and_lock_current(document: params[:document]) do |edition|
-      redirect_location = edit_document_path(edition.document) + "#body"
+    Contacts::InsertInteractor.call(params: params, user: current_user)
 
-      if params[:contact_id].empty?
-        redirect_to redirect_location
-        next
-      end
-
-      contact_markdown = "[Contact:#{params[:contact_id]}]\n"
-      revision = edition.revision
-
-      body = revision.contents.fetch("body", "").chomp
-      updated_body = if body.present?
-                       "#{body}\n\n#{contact_markdown}"
-                     else
-                       contact_markdown
-                     end
-
-      updater = Versioning::RevisionUpdater.new(revision, current_user)
-      updater.assign(contents: revision.contents.merge("body" => updated_body))
-
-      if updater.changed?
-        edition.assign_revision(updater.next_revision, current_user).save!
-        TimelineEntry.create_for_revision(entry_type: :updated_content, edition: edition)
-        PreviewService.new(edition).try_create_preview
-      end
-
-      redirect_to redirect_location
-    end
+    redirect_to edit_document_path(params[:document], anchor: "body")
   end
 end

app/controllers/documents_controller.rb

@@ -28,53 +28,32 @@ def confirm_delete_draft
   end
 
   def destroy
-    Edition.find_and_lock_current(document: params[:document]) do |edition|
-      begin
-        DeleteDraftService.new(edition.document, current_user).delete
-
-        TimelineEntry.create_for_status_change(entry_type: :draft_discarded,
-                                               status: edition.status)
-
-        redirect_to documents_path
-      rescue GdsApi::BaseError => e
-        GovukError.notify(e)
-        redirect_to edition.document, alert_with_description: t("documents.show.flashes.delete_draft_error")
-      end
+    result = Documents::DestroyInteractor.call(params: params, user: current_user)
+    if result.api_error
+      redirect_to document_path(params[:document]),
+                  alert_with_description: t("documents.show.flashes.delete_draft_error")
+    else
+      redirect_to documents_path
     end
   end
 
   def update
-    Edition.find_and_lock_current(document: params[:document]) do |edition|
-      updater = Versioning::RevisionUpdater.new(edition.revision, current_user)
-      updater.assign(update_params(edition.document))
-
-      add_contact_request = params[:submit] == "add_contact"
-      @issues = Requirements::EditPageChecker.new(edition, updater.next_revision)
-                                             .pre_preview_issues
-
-      if @issues.any?
-        flash.now["alert_with_items"] = {
-          "title" => I18n.t!("documents.edit.flashes.requirements"),
-          "items" => @issues.items,
-        }
-
-        render :edit,
-               assigns: { edition: edition, revision: updater.next_revision },
-               status: :unprocessable_entity
-        next
-      end
-
-      if updater.changed?
-        edition.assign_revision(updater.next_revision, current_user).save!
-        TimelineEntry.create_for_revision(entry_type: :updated_content, edition: edition)
-        PreviewService.new(edition).try_create_preview
-      end
-
-      if add_contact_request
-        redirect_to search_contacts_path(edition.document)
-      else
-        redirect_to edition.document
-      end
+    result = Documents::UpdateInteractor.call(params: params, user: current_user)
+    edition, revision, issues, = result.to_h.values_at(:edition, :revision, :issues)
+
+    if issues
+      flash.now["alert_with_items"] = {
+        "title" => I18n.t!("documents.edit.flashes.requirements"),
+        "items" => issues.items,
+      }
+
+      render :edit,
+             assigns: { edition: edition, revision: revision },
+             status: :unprocessable_entity
+    elsif params[:submit] == "add_contact"
+      redirect_to search_contacts_path(edition.document)
+    else
+      redirect_to edition.document
     end
   end
 
@@ -94,16 +73,4 @@ def filter_params
       per_page: 50,
     }
   end
-
-  def update_params(document)
-    contents_params = document.document_type.contents.map(&:id)
-
-    params.require(:revision)
-      .permit(:update_type, :change_note, :title, :summary, contents: contents_params)
-      .tap do |p|
-        p[:title] = p[:title]&.strip
-        p[:summary] = p[:summary]&.strip
-        p[:base_path] = PathGeneratorService.new.path(document, p[:title])
-      end
-  end
 end

app/controllers/editions_controller.rb

@@ -2,35 +2,13 @@
 
 class EditionsController < ApplicationController
   def create
-    Edition.find_and_lock_current(document: params[:document]) do |edition|
-      unless edition.live?
-        # FIXME: this shouldn't be an exception but we've not worked out the
-        # right response - maybe bad request or a redirect with flash?
-        raise "Can't create a new edition when the current edition is a draft"
-      end
-
-      edition.update!(current: false)
-
-      next_edition = Edition.find_by(
-        document: edition.document,
-        number: edition.number + 1,
-      )
-
-      if next_edition
-        next_edition.resume_discarded(edition, current_user)
-
-        TimelineEntry.create_for_status_change(entry_type: :draft_reset,
-                                               status: next_edition.status)
-      else
-        next_edition = Edition.create_next_edition(edition, current_user)
-
-        TimelineEntry.create_for_status_change(entry_type: :new_edition,
-                                               status: next_edition.status)
-      end
-
-      PreviewService.new(next_edition).try_create_preview
-
-      redirect_to edit_document_path(next_edition.document)
+    result = Editions::CreateInteractor.call(params: params, user: current_user)
+    if result.draft_current_edition
+      # FIXME: this shouldn't be an exception but we've not worked out the
+      # right response - maybe bad request or a redirect with flash?
+      raise "Can't create a new edition when the current edition is a draft"
+    else
+      redirect_to edit_document_path(params[:document])
     end
   end
 end