diff --git a/app/models/scheme.rb b/app/models/scheme.rb index 4d3653da3..096706018 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -52,15 +52,20 @@ class Scheme < ApplicationRecord }.freeze REGISTERED_UNDER_CARE_ACT = { - 0 => "Yes – part registered as a care home", - 1 => "No", + 0 => "No", + 1 => "Yes – part registered as a care home", + }.freeze + + SENSITIVE = { + 0 => "No", + 1 => "Yes", }.freeze def display_attributes [ { name: "Service code", value: code }, { name: "Name", value: service_name }, - { name: "Confidential information", value: sensitive }, + { name: "Confidential information", value: sensitive_display }, { name: "Managing agent", value: organisation.name }, { name: "Type of service", value: scheme_type_display }, { name: "Registered under Care Standards Act 2000", value: registered_under_care_act_display }, @@ -76,6 +81,10 @@ class Scheme < ApplicationRecord SCHEME_TYPE[scheme_type] end + def sensitive_display + SENSITIVE[sensitive] + end + def registered_under_care_act_display REGISTERED_UNDER_CARE_ACT[registered_under_care_act] end diff --git a/db/migrate/20220613094847_add_missing_attributes_to_scheme.rb b/db/migrate/20220613094847_add_missing_attributes_to_scheme.rb index ab2f9718e..ca0121d3d 100644 --- a/db/migrate/20220613094847_add_missing_attributes_to_scheme.rb +++ b/db/migrate/20220613094847_add_missing_attributes_to_scheme.rb @@ -3,8 +3,8 @@ class AddMissingAttributesToScheme < ActiveRecord::Migration[7.0] change_table :schemes, bulk: true do |t| t.string :primary_client_group t.string :secondary_client_group - t.boolean :sensitive - t.boolean :total_units + t.integer :sensitive + t.integer :total_units t.integer :scheme_type t.integer :registered_under_care_act t.integer :support_type diff --git a/db/schema.rb b/db/schema.rb index 42b120a8e..6a4e5f2ea 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -285,8 +285,8 @@ ActiveRecord::Schema[7.0].define(version: 2022_06_13_094847) do t.datetime "updated_at", null: false t.string "primary_client_group" t.string "secondary_client_group" - t.boolean "sensitive" - t.boolean "total_units" + t.integer "sensitive" + t.integer "total_units" t.integer "scheme_type" t.integer "registered_under_care_act" t.integer "support_type" diff --git a/db/seeds.rb b/db/seeds.rb index 5ab572a29..ad1fc1ac4 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -73,7 +73,7 @@ unless Rails.env.test? Scheme.create!( code: "S878", service_name: "Beulahside Care", - sensitive: true, + sensitive: 0, registered_under_care_act: 0, support_type: 1, scheme_type: 4, @@ -88,7 +88,7 @@ unless Rails.env.test? Scheme.create!( code: "S312", service_name: "Abdullahview Point", - sensitive: false, + sensitive: 0, registered_under_care_act: 1, support_type: 1, scheme_type: 5, @@ -103,7 +103,7 @@ unless Rails.env.test? Scheme.create!( code: "7XYZ", service_name: "Caspermouth Center", - sensitive: true, + sensitive: 1, registered_under_care_act: 1, support_type: 4, scheme_type: 7, diff --git a/spec/factories/scheme.rb b/spec/factories/scheme.rb index 66bf69216..6c3537146 100644 --- a/spec/factories/scheme.rb +++ b/spec/factories/scheme.rb @@ -2,10 +2,10 @@ FactoryBot.define do factory :scheme do code { Faker::Name.initials(number: 4) } service_name { Faker::Name.name_with_middle } - sensitive { Faker::Boolean.boolean } + sensitive { Faker::Number.within(range: 0..1) } registered_under_care_act { Faker::Number.within(range: 0..1) } support_type { Faker::Number.within(range: 0..6) } - scheme_type { %i[0 4 5 6 7].sample } + scheme_type { 0 } total_units { Faker::Number.number(digits: 2) } intended_stay { %w[M P S V X].sample } primary_client_group { %w[O H M L A G F B D E I S N R Q P X].sample } diff --git a/spec/requests/schemes_controller_spec.rb b/spec/requests/schemes_controller_spec.rb index 5e1abcfa2..4d5c248d5 100644 --- a/spec/requests/schemes_controller_spec.rb +++ b/spec/requests/schemes_controller_spec.rb @@ -198,10 +198,10 @@ RSpec.describe SchemesController, type: :request do expect(page).to have_content(specific_scheme.code) expect(page).to have_content(specific_scheme.service_name) expect(page).to have_content(specific_scheme.organisation.name) - expect(page).to have_content(specific_scheme.sensitive) + expect(page).to have_content(specific_scheme.sensitive_display) expect(page).to have_content(specific_scheme.code) expect(page).to have_content(specific_scheme.service_name) - expect(page).to have_content(specific_scheme.sensitive) + expect(page).to have_content(specific_scheme.sensitive_display) expect(page).to have_content(specific_scheme.scheme_type_display) expect(page).to have_content(specific_scheme.registered_under_care_act_display) expect(page).to have_content(specific_scheme.total_units) @@ -232,10 +232,10 @@ RSpec.describe SchemesController, type: :request do expect(page).to have_content(specific_scheme.code) expect(page).to have_content(specific_scheme.service_name) expect(page).to have_content(specific_scheme.organisation.name) - expect(page).to have_content(specific_scheme.sensitive) + expect(page).to have_content(specific_scheme.sensitive_display) expect(page).to have_content(specific_scheme.code) expect(page).to have_content(specific_scheme.service_name) - expect(page).to have_content(specific_scheme.sensitive) + expect(page).to have_content(specific_scheme.sensitive_display) expect(page).to have_content(specific_scheme.scheme_type_display) expect(page).to have_content(specific_scheme.registered_under_care_act_display) expect(page).to have_content(specific_scheme.total_units)