From 0521f7c4eded020d56aa6c27b2f11f1998f044e9 Mon Sep 17 00:00:00 2001
From: Ted <ted.booton@madetech.com>
Date: Mon, 11 Jul 2022 14:38:57 +0100
Subject: [PATCH] rebase

---
 app/models/organisation.rb                             | 10 ++++++++++
 ...20707125124_add_foreign_key_to_user_organisation.rb |  7 +++++++
 ...20707133909_add_foreign_key_to_logs_organisation.rb |  6 ++++++
 3 files changed, 23 insertions(+)
 create mode 100644 db/migrate/20220707125124_add_foreign_key_to_user_organisation.rb
 create mode 100644 db/migrate/20220707133909_add_foreign_key_to_logs_organisation.rb

diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index 4a3b50f8d..e4c1e05c2 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -1,4 +1,5 @@
 class Organisation < ApplicationRecord
+<<<<<<< HEAD
   has_many :users, dependent: :delete_all
   has_many :owned_case_logs, class_name: "CaseLog", foreign_key: "owning_organisation_id", dependent: :delete_all
   has_many :managed_case_logs, class_name: "CaseLog", foreign_key: "managing_organisation_id"
@@ -7,6 +8,15 @@ class Organisation < ApplicationRecord
 
   has_many :owned_schemes, class_name: "Scheme", foreign_key: "owning_organisation_id", dependent: :delete_all
   has_many :managed_schemes, class_name: "Scheme", foreign_key: "managing_organisation_id"
+=======
+  has_many :users, dependent: :destroy
+  has_many :owned_case_logs, class_name: "CaseLog", foreign_key: "owning_organisation_id", dependent: :destroy
+  has_many :managed_case_logs, class_name: "CaseLog", foreign_key: "managing_organisation_id", dependent: :destroy
+  has_many :data_protection_confirmations
+  has_many :organisation_rent_periods
+  has_many :owned_schemes, class_name: "Scheme", foreign_key: "stock_owning_organisation_id", dependent: :destroy
+  has_many :managed_schemes, class_name: "Scheme", dependent: :destroy
+>>>>>>> 8120be4f (added cascading delete to models)
 
   scope :search_by_name, ->(name) { where("name ILIKE ?", "%#{name}%") }
   scope :search_by, ->(param) { search_by_name(param) }
diff --git a/db/migrate/20220707125124_add_foreign_key_to_user_organisation.rb b/db/migrate/20220707125124_add_foreign_key_to_user_organisation.rb
new file mode 100644
index 000000000..1f96a0baf
--- /dev/null
+++ b/db/migrate/20220707125124_add_foreign_key_to_user_organisation.rb
@@ -0,0 +1,7 @@
+class AddForeignKeyToUserOrganisation < ActiveRecord::Migration[7.0]
+ 
+  def change
+    add_reference :organisations, :users, foreign_key: true, on_delete: :cascade
+  end
+end
+
diff --git a/db/migrate/20220707133909_add_foreign_key_to_logs_organisation.rb b/db/migrate/20220707133909_add_foreign_key_to_logs_organisation.rb
new file mode 100644
index 000000000..79833a1c1
--- /dev/null
+++ b/db/migrate/20220707133909_add_foreign_key_to_logs_organisation.rb
@@ -0,0 +1,6 @@
+class AddForeignKeyToLogsOrganisation < ActiveRecord::Migration[7.0]
+  
+  def change
+    add_reference :organisations, :case_logs, foreign_key: true, on_delete: :cascade
+  end
+end
\ No newline at end of file