From 50fc3f0817fb1a619febf4ff3ae7ce8cecbdb8b1 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Tue, 18 Apr 2023 16:24:01 +0100
Subject: [PATCH] PR comments

---
 app/controllers/merge_requests_controller.rb   | 9 ++++++---
 app/models/merge_request.rb                    | 1 -
 app/views/organisations/merge_request.html.erb | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb
index 12efd3fa3..3d1aa3f5f 100644
--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -4,10 +4,13 @@ class MergeRequestsController < ApplicationController
   before_action :authenticate_scope!, except: [:create]
 
   def create
-    @merge_request = MergeRequest.create!(merge_request_params)
-    MergeRequestOrganisation.create!({ merge_request: @merge_request, merging_organisation_id: merge_request_params.fetch(:requesting_organisation_id) })
-
+    ActiveRecord::Base.transaction do
+      @merge_request = MergeRequest.create!(merge_request_params.merge(status: :unsubmitted))
+      MergeRequestOrganisation.create!({ merge_request: @merge_request, merging_organisation: @merge_request.requesting_organisation })
+    end
     redirect_to organisations_merge_request_path(@merge_request)
+  rescue ActiveRecord::RecordInvalid
+    render_not_found
   end
 
   def organisations
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 79989d7e8..111d25321 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -2,7 +2,6 @@ class MergeRequest < ApplicationRecord
   belongs_to :requesting_organisation, class_name: "Organisation"
   has_many :merge_request_organisations
   has_many :merging_organisations, through: :merge_request_organisations, source: :merging_organisation
-  scope :unsubmitted, -> { where.not(status: "unsubmitted") }
 
   STATUS = {
     "unsubmitted" => 0,
diff --git a/app/views/organisations/merge_request.html.erb b/app/views/organisations/merge_request.html.erb
index 3e064772c..d8602b46c 100644
--- a/app/views/organisations/merge_request.html.erb
+++ b/app/views/organisations/merge_request.html.erb
@@ -43,7 +43,6 @@
 
     <%= form_for @merge_request, url: merge_requests_path do |f| %>
       <%= f.hidden_field :requesting_organisation_id, value: @organisation.id %>
-            <%= f.hidden_field :status, value: "unsubmitted" %>
       <%= f.submit "Start now", class: "govuk-button govuk-button--start" %>
     <% end %>
   </div>