diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb index 3b8d600ae..aa9da0ea7 100644 --- a/app/controllers/schemes_controller.rb +++ b/app/controllers/schemes_controller.rb @@ -171,7 +171,7 @@ private :support_services_provider_before_type_cast, :intended_stay).merge(support_services_provider: params[:scheme][:support_services_provider_before_type_cast]) - full_params = Scheme.support_services_providers.key?(required_params[:support_services_provider]) && required_params[:owning_organisation_id].present? ? required_params.merge(managing_organisation_id: required_params[:owning_organisation_id]) : required_params + full_params = required_params[:support_services_provider] == "0" && required_params[:owning_organisation_id].present? ? required_params.merge(managing_organisation_id: required_params[:owning_organisation_id]) : required_params full_params[:sensitive] = full_params[:sensitive].to_i if full_params[:sensitive] full_params[:support_services_provider] = full_params[:support_services_provider].to_i unless full_params[:support_services_provider] && full_params[:support_services_provider].empty? diff --git a/db/schema.rb b/db/schema.rb index 39bb14d87..096056489 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -322,7 +322,6 @@ ActiveRecord::Schema[7.0].define(version: 2022_07_15_133937) do t.integer "old_visible_id" t.integer "total_units" t.integer "support_services_provider" - t.integer "support_services_provider_for_coordinator" 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 diff --git a/db/seeds.rb b/db/seeds.rb index 932a08d55..03a61cf59 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -74,7 +74,7 @@ unless Rails.env.test? service_name: "Beulahside Care", sensitive: 0, registered_under_care_act: 1, - support_type: 1, + support_type: 2, scheme_type: 4, intended_stay: "M", primary_client_group: "O", @@ -87,7 +87,7 @@ unless Rails.env.test? service_name: "Abdullahview Point", sensitive: 0, registered_under_care_act: 1, - support_type: 1, + support_type: 2, scheme_type: 5, intended_stay: "S", primary_client_group: "D", @@ -115,9 +115,9 @@ unless Rails.env.test? postcode: "CU193AA", name: "Rectory Road", type_of_unit: 4, + units: 1, type_of_building: "Purpose built", - county: "Mid Sussex", - wheelchair_adaptation: 0, + wheelchair_adaptation: 2, ) Location.create!( @@ -126,8 +126,8 @@ unless Rails.env.test? postcode: "DM250DC", name: "Smithy Lane", type_of_unit: 1, + units: 1, type_of_building: "Converted from previous residential or non-residential property", - county: "Fife", wheelchair_adaptation: 1, ) @@ -137,8 +137,8 @@ unless Rails.env.test? postcode: "YX130WP", name: "Smithy Lane", type_of_unit: 2, + units: 1, type_of_building: "Converted from previous residential or non-residential property", - county: "Rochford", wheelchair_adaptation: 1, ) end