From f70f914063d24b3cd30891f810900bff748bf191 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Thu, 17 Apr 2025 15:06:45 +0100
Subject: [PATCH] Remove change_type attribute from organisation name changes

---
 app/controllers/organisation_name_changes_controller.rb    | 1 -
 app/models/organisation_name_change.rb                     | 7 -------
 .../20250416111741_create_organisation_name_changes.rb     | 1 -
 db/schema.rb                                               | 1 -
 spec/factories/organisation_name_change.rb                 | 1 -
 5 files changed, 11 deletions(-)

diff --git a/app/controllers/organisation_name_changes_controller.rb b/app/controllers/organisation_name_changes_controller.rb
index 43dda2cb0..dc32b2ddc 100644
--- a/app/controllers/organisation_name_changes_controller.rb
+++ b/app/controllers/organisation_name_changes_controller.rb
@@ -4,7 +4,6 @@ class OrganisationNameChangesController < ApplicationController
 
   def create
     @organisation_name_change = @organisation.organisation_name_changes.new(organisation_name_change_params)
-    @organisation_name_change.change_type = :user_change
 
     if @organisation_name_change.save
       notice_message = @organisation_name_change.immediate_change ? "Name change saved successfully." : "Name change scheduled for #{@organisation_name_change.formatted_startdate}."
diff --git a/app/models/organisation_name_change.rb b/app/models/organisation_name_change.rb
index ed06d4daa..e3fb7b789 100644
--- a/app/models/organisation_name_change.rb
+++ b/app/models/organisation_name_change.rb
@@ -16,13 +16,6 @@ class OrganisationNameChange < ApplicationRecord
 
   before_validation :set_startdate_if_immediate
 
-  CHANGE_TYPE = {
-    user_change: 1,
-    merge: 2, # Currently not used, we could differentiate name changes resulting from a merge
-  }.freeze
-
-  enum :change_type, CHANGE_TYPE, prefix: true
-
   has_paper_trail
 
   def status
diff --git a/db/migrate/20250416111741_create_organisation_name_changes.rb b/db/migrate/20250416111741_create_organisation_name_changes.rb
index b0db49c65..c0440cc95 100644
--- a/db/migrate/20250416111741_create_organisation_name_changes.rb
+++ b/db/migrate/20250416111741_create_organisation_name_changes.rb
@@ -5,7 +5,6 @@ class CreateOrganisationNameChanges < ActiveRecord::Migration[7.0]
       t.string :name, null: false
       t.date :startdate, null: false
       t.date :discarded_at
-      t.integer :change_type
 
       t.timestamps
     end
diff --git a/db/schema.rb b/db/schema.rb
index b0ddb0273..833703534 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -502,7 +502,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_04_16_111741) do
     t.string "name", null: false
     t.date "startdate", null: false
     t.date "discarded_at"
-    t.integer "change_type"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["organisation_id", "startdate"], name: "index_org_name_changes_on_org_id_and_startdate", unique: true
diff --git a/spec/factories/organisation_name_change.rb b/spec/factories/organisation_name_change.rb
index 715106a27..1d90e2069 100644
--- a/spec/factories/organisation_name_change.rb
+++ b/spec/factories/organisation_name_change.rb
@@ -4,7 +4,6 @@ FactoryBot.define do
     name { "#{Faker::Name.name} Housing Org" }
     immediate_change { true }
     startdate { Time.zone.tomorrow }
-    change_type { :user_change }
 
     trait :future_change do
       immediate_change { false }