rebase

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) }

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
+

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