Add relationships between merge request and organisations

app/models/merge_request.rb

@@ -1,12 +1,9 @@
 class MergeRequest < ApplicationRecord
   belongs_to :requesting_organisation, class_name: "Organisation"
-  # has_many :merging_organisations, class_name: "Organisation", primary_key: "merging_organisation_ids", foreign_key: "id"
+  has_many :merge_request_organisations
-  # default_scope -> { select(column_names + ["merging_organisation_ids"]) }
+  has_many :merging_organisations, through: :merge_request_organisations, source: :merging_organisation
-  validate :validate_merging_organisations
 
-  def merging_organisations
+  validate :validate_merging_organisations
-    Organisation.where(id: merging_organisation_ids)
-  end
 
 private
 

app/models/merge_request_organisation.rb

@@ -0,0 +1,8 @@
+class MergeRequestOrganisation < ApplicationRecord
+  belongs_to :merge_request, class_name: "MergeRequest"
+  belongs_to :merging_organisation, class_name: "Organisation"
+  validates :merge_request_id, presence: { message: I18n.t("validations.organisation.stock_owner.blank") }
+  validates :merging_organisation_id, presence: { message: I18n.t("validations.organisation.managing_agent.blank") }
+
+  has_paper_trail
+end