Merge branch 'CLDC-3382-Support-user-functionality-merge-organisations' into CLDC-3588-helpdesk-ticket-question

app/controllers/merge_requests_controller.rb

@@ -42,6 +42,11 @@ class MergeRequestsController < ApplicationController
     render :merging_organisations
   end
 
+  def delete
+    @merge_request.discard!
+    redirect_to organisations_path(anchor: "merge-requests")
+  end
+
 private
 
   def page

app/models/merge_request.rb

@@ -18,7 +18,7 @@ class MergeRequest < ApplicationRecord
   scope :merged, -> { where(status: "request_merged") }
   scope :visible, lambda {
     open_collection_period_start_date = FormHandler.instance.start_date_of_earliest_open_collection_period
-    merged.where("merge_requests.merge_date >= ?", open_collection_period_start_date).or(not_merged)
+    merged.where("merge_requests.merge_date >= ?", open_collection_period_start_date).or(not_merged).where(discarded_at: nil)
   }
 
   def absorbing_organisation_name
@@ -28,4 +28,8 @@ class MergeRequest < ApplicationRecord
   def dpo_user
     absorbing_organisation.data_protection_officers.filter_by_active.first
   end
+
+  def discard!
+    update!(discarded_at: Time.zone.now)
+  end
 end

app/views/merge_requests/delete_confirmation.html.erb

@@ -0,0 +1,23 @@
+<% content_for :before_content do %>
+  <% content_for :title, "Are you sure you want to delete this merge request?" %>
+  <%= govuk_back_link(href: :back) %>
+<% end %>
+
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds-from-desktop">
+    <h1 class="govuk-heading-xl">
+      <%= content_for(:title) %>
+    </h1>
+
+    <%= govuk_warning_text(text: "You cannot undo this.") %>
+
+    <div class="govuk-button-group">
+      <%= govuk_button_to(
+        "Delete merge request",
+        delete_merge_request_path(@merge_request),
+        method: :delete,
+      ) %>
+      <%= govuk_button_link_to "Cancel", merge_request_path(@merge_request), secondary: true %>
+    </div>
+  </div>
+</div>

app/views/merge_requests/show.html.erb

@@ -1,7 +1,7 @@
 <% content_for :before_content do %>
   <% title = "Merge details: #{@merge_request.absorbing_organisation_name}" %>
   <% content_for :title, title %>
-  <%= govuk_back_link href: "#{organisations_path}#merge-requests" %>
+  <%= govuk_back_link href: organisations_path(anchor: "merge-requests") %>
 <% end %>
 <% unless @merge_request.signed_dsa || @merge_request.absorbing_organisation_id.blank? %>
   <div class="govuk-notification-banner" role="region" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner">
@@ -27,12 +27,8 @@
 </h1>
 <% unless @merge_request.status == "request_merged" %>
 <div class="govuk-button-group">
-  <button type="submit" <%= @merge_request.status == "ready_to_merge" ? "" : "disabled aria-disabled=\"true\"" %> class="govuk-button" data-module="govuk-button">
+  <%= govuk_button_link_to "Begin merge", "#", disabled: @merge_request.status != "ready_to_merge" %>
-    Begin merge
+  <%= govuk_button_link_to "Delete merge request", delete_confirmation_merge_request_path(@merge_request), warning: true %>
-  </button>
-  <button type="submit" class="govuk-button govuk-button--warning" data-module="govuk-button">
-    Delete merge request
-  </button>
 </div>
 <% end %>
 

config/routes.rb

@@ -201,6 +201,8 @@ Rails.application.routes.draw do
       get "absorbing-organisation"
       get "merge-date"
       get "helpdesk-ticket"
+      get "delete-confirmation", to: "merge_requests#delete_confirmation"
+      delete "delete", to: "merge_requests#delete"
     end
   end
 

spec/models/merge_request_spec.rb

@@ -23,4 +23,23 @@ RSpec.describe MergeRequest, type: :model do
       expect(described_class.visible).to include(not_merged)
     end
   end
+
+  describe "#discard!" do
+    let(:merge_request) { create(:merge_request) }
+
+    it "sets the discarded_at field" do
+      merge_request.discard!
+      expect(merge_request.discarded_at).not_to be_nil
+    end
+
+    it "does not delete the record" do
+      merge_request.discard!
+      expect(merge_request).to be_persisted
+    end
+
+    it "is not visible in the visible scope" do
+      merge_request.discard!
+      expect(described_class.visible).not_to include(merge_request)
+    end
+  end
 end

spec/requests/merge_request_spec.rb

@@ -0,0 +1,28 @@
+require "rails_helper"
+
+RSpec.describe MergeRequest, type: :request do
+  let(:user) { create(:user, :data_coordinator) }
+  let(:organisation) { user.organisation }
+  let(:merge_request) { create(:merge_request) }
+  let(:support_user) { create(:user, :support, organisation:) }
+  let(:page) { Capybara::Node::Simple.new(response.body) }
+
+  before do
+    allow(support_user).to receive(:need_two_factor_authentication?).and_return(false)
+    sign_in support_user
+  end
+
+  context "when deleting a merge request" do
+    it "discards the merge request" do
+      delete delete_merge_request_path(merge_request)
+      expect(merge_request.reload.discarded_at).not_to be_nil
+    end
+
+    it "redirects to the merge request list" do
+      delete delete_merge_request_path(merge_request)
+      expect(response).to redirect_to(organisations_path(anchor: "merge-requests"))
+      follow_redirect!
+      expect(page).to have_content("Merge requests")
+    end
+  end
+end