From b79bc8ce1e61287ef84d865ec3ce37dcf9403014 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Fri, 9 Aug 2024 19:24:56 +0100
Subject: [PATCH] Update merge request model

---
 app/models/merge_request.rb                      |  8 ++++++++
 ...41_add_additional_fields_to_merge_requests.rb | 16 ++++++++++++++++
 db/schema.rb                                     | 12 +++++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20240809154241_add_additional_fields_to_merge_requests.rb

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 42496a8fe..c92eda60f 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -31,4 +31,12 @@ class MergeRequest < ApplicationRecord
   def absorbing_organisation_name
     absorbing_organisation&.name || ""
   end
+
+  def requesting_user
+    User.find(requester_id) if requester_id
+  end
+
+  def dpo_user
+    absorbing_organisation.users.find_by(is_dpo: true) if absorbing_organisation
+  end
 end
diff --git a/db/migrate/20240809154241_add_additional_fields_to_merge_requests.rb b/db/migrate/20240809154241_add_additional_fields_to_merge_requests.rb
new file mode 100644
index 000000000..6f2a37fd0
--- /dev/null
+++ b/db/migrate/20240809154241_add_additional_fields_to_merge_requests.rb
@@ -0,0 +1,16 @@
+class AddAdditionalFieldsToMergeRequests < ActiveRecord::Migration[7.0]
+  def change
+    change_table :merge_requests, bulk: true do |t|
+      t.integer :requester_id
+      t.string :helpdesk_ticket
+      t.integer :total_users
+      t.integer :total_schemes
+      t.integer :total_lettings_logs
+      t.integer :total_sales_logs
+      t.integer :total_stock_owners
+      t.integer :total_managing_agents
+      t.boolean :signed_dsa, default: false
+      t.datetime :discarded_at
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f9a17bd49..8296332f5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2024_08_08_134014) do
+ActiveRecord::Schema[7.0].define(version: 2024_08_09_154241) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -431,6 +431,16 @@ ActiveRecord::Schema[7.0].define(version: 2024_08_08_134014) do
     t.string "new_organisation_postcode"
     t.string "new_organisation_telephone_number"
     t.datetime "merge_date"
+    t.integer "requester_id"
+    t.string "helpdesk_ticket"
+    t.integer "total_users"
+    t.integer "total_schemes"
+    t.integer "total_lettings_logs"
+    t.integer "total_sales_logs"
+    t.integer "total_stock_owners"
+    t.integer "total_managing_agents"
+    t.boolean "signed_dsa", default: false
+    t.datetime "discarded_at"
   end
 
   create_table "notifications", force: :cascade do |t|