From e6e4dba07f1a53ab8f2a04aa9ee069052e3d784c Mon Sep 17 00:00:00 2001 From: JG Date: Wed, 13 Jul 2022 11:49:08 +0100 Subject: [PATCH] fixed after rebasing --- app/models/location.rb | 2 +- db/schema.rb | 2 +- db/seeds.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/location.rb b/app/models/location.rb index f16feae1c..1af550e1e 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -1,6 +1,6 @@ class Location < ApplicationRecord validate :validate_postcode - validates :total_units, :type_of_unit, :wheelchair_adaptation, presence: true + validates :type_of_unit, :wheelchair_adaptation, presence: true belongs_to :scheme before_save :infer_la!, if: :postcode_changed? diff --git a/db/schema.rb b/db/schema.rb index 7c1e0e654..096056489 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -257,7 +257,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_07_15_133937) do create_table "logs_exports", force: :cascade do |t| t.datetime "created_at", default: -> { "CURRENT_TIMESTAMP" } - t.datetime "started_at", precision: nil, null: false + t.datetime "started_at", null: false t.integer "base_number", default: 1, null: false t.integer "increment_number", default: 1, null: false t.boolean "empty_export", default: false, null: false diff --git a/db/seeds.rb b/db/seeds.rb index 3ac0aa7d5..932a08d55 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -73,7 +73,7 @@ unless Rails.env.test? scheme1 = Scheme.create!( service_name: "Beulahside Care", sensitive: 0, - registered_under_care_act: 0, + registered_under_care_act: 1, support_type: 1, scheme_type: 4, intended_stay: "M",