Browse Source

feat: remove unneccessary db field

pull/980/head
natdeanlewissoftwire 2 years ago
parent
commit
8fe59def9b
  1. 4
      app/models/scheme.rb
  2. 7
      db/migrate/20221110111447_add_second_deactivation_field_to_schemes.rb
  3. 0
      db/migrate/20221110163351_add_deactivation_date_to_schemes.rb
  4. 15
      db/schema.rb

4
app/models/scheme.rb

@ -21,6 +21,8 @@ class Scheme < ApplicationRecord
auto_strip_attributes :service_name
attr_accessor :deactivation_date_type
SENSITIVE = {
No: 0,
Yes: 1,
@ -196,7 +198,7 @@ class Scheme < ApplicationRecord
end
def validate_confirmed
required_attributes = attribute_names - %w[id created_at updated_at old_id old_visible_id confirmed end_date sensitive secondary_client_group total_units has_other_client_group deactivation_date_type]
required_attributes = attribute_names - %w[id created_at updated_at old_id old_visible_id confirmed end_date sensitive secondary_client_group total_units has_other_client_group deactivation_date]
if confirmed == true
required_attributes.any? do |attribute|

7
db/migrate/20221110111447_add_second_deactivation_field_to_schemes.rb

@ -1,7 +0,0 @@
class AddSecondDeactivationFieldToSchemes < ActiveRecord::Migration[7.0]
def change
change_table :schemes, bulk: true do |t|
t.column :deactivation_date_type, :integer
end
end
end

0
db/migrate/20221109095650_add_deactivation_date_to_schemes.rb → db/migrate/20221110163351_add_deactivation_date_to_schemes.rb

15
db/schema.rb

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.0].define(version: 2022_11_10_111447) do
ActiveRecord::Schema[7.0].define(version: 2022_11_10_163351) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -359,12 +359,6 @@ ActiveRecord::Schema[7.0].define(version: 2022_11_10_111447) do
t.integer "hholdcount"
t.integer "age3"
t.integer "age3_known"
t.integer "age4"
t.integer "age4_known"
t.integer "age5"
t.integer "age5_known"
t.integer "age6"
t.integer "age6_known"
t.string "la"
t.integer "la_known"
t.integer "income1"
@ -372,6 +366,12 @@ ActiveRecord::Schema[7.0].define(version: 2022_11_10_111447) do
t.integer "details_known_2"
t.integer "details_known_3"
t.integer "details_known_4"
t.integer "age4"
t.integer "age4_known"
t.integer "age5"
t.integer "age5_known"
t.integer "age6"
t.integer "age6_known"
t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"
@ -398,7 +398,6 @@ ActiveRecord::Schema[7.0].define(version: 2022_11_10_111447) do
t.integer "total_units"
t.boolean "confirmed"
t.datetime "deactivation_date"
t.integer "deactivation_date_type"
t.index ["managing_organisation_id"], name: "index_schemes_on_managing_organisation_id"
t.index ["owning_organisation_id"], name: "index_schemes_on_owning_organisation_id"
end

Loading…
Cancel
Save