Browse Source

Remove user_type in additional places

pull/2539/head
Manny Dinssa 2 years ago
parent
commit
e8a8cd02d0
  1. 4
      app/models/user.rb
  2. 2
      db/migrate/20240726152326_create_csv_variable_definitions.rb
  3. 5
      db/migrate/20240813142947_remove_user_type_from_csv_variable_definitions.rb
  4. 1
      spec/factories/csv_variable_definitions.rb

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

2
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

5
db/migrate/20240813142947_remove_user_type_from_csv_variable_definitions.rb

@ -1,5 +0,0 @@
class RemoveUserTypeFromCsvVariableDefinitions < ActiveRecord::Migration[7.0]
def change
remove_column :csv_variable_definitions, :user_type, :string
end
end

1
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

Loading…
Cancel
Save