Merge pull request #2355 from alphagov/allow-unpublishing-when-manual…

…-is-withdrawn

Allow unpublsihing when a manual state is withdrawn

app/lib/withdraw_and_redirect_manual.rb

@@ -13,19 +13,17 @@ def execute
 
     return if dry_run
 
-    published_manual = manual.current_versions[:published]
-
-    raise ManualNotPublishedError, manual.slug if published_manual.blank?
-
-    published_manual.withdraw
-    published_manual.save!(user)
+    raise ManualNotPublishedError, manual.slug unless manual.can_withdraw?
 
     Adapters.publishing.unpublish_and_redirect_manual_and_sections(
-      published_manual,
+      manual,
       redirect:,
       include_sections:,
       discard_drafts:,
     )
+
+    manual.withdraw
+    manual.save!(user)
   end
 
 private

app/models/manual.rb

@@ -196,6 +196,10 @@ def withdrawn?
     state == "withdrawn"
   end
 
+  def can_withdraw?
+    current_versions[:published] || withdrawn?
+  end
+
   def has_ever_been_published?
     @ever_been_published
   end

spec/lib/withdraw_and_redirect_manual_spec.rb

@@ -33,30 +33,43 @@
     allow(publishing_adapter).to receive(:unpublish_and_redirect_manual_and_sections)
   end
 
-  it "withdraws the manual" do
+  it "withdraws the manual and unpublishes" do
     subject.execute
 
     reloaded_manual = Manual.find(manual.id, user)
     expect(reloaded_manual.withdrawn?).to eq(true)
-  end
-
-  it "calls the publishing adapter to unpublish the manual" do
-    subject.execute
     expect(publishing_adapter).to have_received(:unpublish_and_redirect_manual_and_sections)
-      .with(instance_of(Manual),
-            redirect:,
-            include_sections:,
-            discard_drafts:)
+                                    .with(instance_of(Manual),
+                                          redirect:,
+                                          include_sections:,
+                                          discard_drafts:)
   end
 
-  context "when there is no published manual" do
+  context "when the manual is in draft" do
     let(:state) { "draft" }
 
     it "raises an error" do
       expect { subject.execute }.to raise_error(WithdrawAndRedirectManual::ManualNotPublishedError)
     end
   end
 
+  context "when the manual is withdrawn" do
+    it "withdraws and unpublishes the manual again" do
+      manual.withdraw
+      manual.save!(user)
+
+      subject.execute
+
+      reloaded_manual = Manual.find(manual.id, user)
+      expect(reloaded_manual.withdrawn?).to eq(true)
+      expect(publishing_adapter).to have_received(:unpublish_and_redirect_manual_and_sections)
+                                      .with(instance_of(Manual),
+                                            redirect:,
+                                            include_sections:,
+                                            discard_drafts:)
+    end
+  end
+
   context "when a dry run is flagged" do
     let(:dry_run) { true }