PR comments

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

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,

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>