From e8a8cd02d049cce3e0d52ac6ce7a749b291713f1 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 14 Aug 2024 11:13:40 +0100
Subject: [PATCH] Remove user_type in additional places

---
 app/models/user.rb                                           | 4 ----
 db/migrate/20240726152326_create_csv_variable_definitions.rb | 2 --
 ...3142947_remove_user_type_from_csv_variable_definitions.rb | 5 -----
 spec/factories/csv_variable_definitions.rb                   | 1 -
 4 files changed, 12 deletions(-)
 delete mode 100644 db/migrate/20240813142947_remove_user_type_from_csv_variable_definitions.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 7c4dc3a14..d25faaa53 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -263,10 +263,6 @@ class User < ApplicationRecord
     :active
   end
 
-  def user_type
-    support? ? "support" : "user"
-  end
-
   def discard!
     self.discarded_at = Time.zone.now
     save!(validate: false)
diff --git a/db/migrate/20240726152326_create_csv_variable_definitions.rb b/db/migrate/20240726152326_create_csv_variable_definitions.rb
index d194b6dec..31dfba66a 100644
--- a/db/migrate/20240726152326_create_csv_variable_definitions.rb
+++ b/db/migrate/20240726152326_create_csv_variable_definitions.rb
@@ -4,13 +4,11 @@ class CreateCsvVariableDefinitions < ActiveRecord::Migration[7.0]
       t.string :variable, null: false
       t.string :definition, null: false
       t.string :log_type, null: false
-      t.string :user_type, null: false
       t.integer :year, null: false
       t.datetime :last_accessed
       t.timestamps
     end
 
-    add_check_constraint :csv_variable_definitions, "user_type IN ('user', 'support')", name: "user_type_check"
     add_check_constraint :csv_variable_definitions, "log_type IN ('lettings', 'sales')", name: "log_type_check"
     add_check_constraint :csv_variable_definitions, "year BETWEEN 2000 AND 2099", name: "year_check"
   end
diff --git a/db/migrate/20240813142947_remove_user_type_from_csv_variable_definitions.rb b/db/migrate/20240813142947_remove_user_type_from_csv_variable_definitions.rb
deleted file mode 100644
index 045ffcf43..000000000
--- a/db/migrate/20240813142947_remove_user_type_from_csv_variable_definitions.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemoveUserTypeFromCsvVariableDefinitions < ActiveRecord::Migration[7.0]
-  def change
-    remove_column :csv_variable_definitions, :user_type, :string
-  end
-end
diff --git a/spec/factories/csv_variable_definitions.rb b/spec/factories/csv_variable_definitions.rb
index 56481e11a..c7cf1eadc 100644
--- a/spec/factories/csv_variable_definitions.rb
+++ b/spec/factories/csv_variable_definitions.rb
@@ -3,7 +3,6 @@ FactoryBot.define do
     variable { "variable" }
     definition { "definition" }
     log_type { "lettings" }
-    user_type { "support" }
     year { 2024 }
   end
 end