Browse Source

CLCD-495 ready for review

pull/50/head
Matthew Phelan 3 years ago
parent
commit
5a7183f450
  1. 16
      app/models/case_log.rb
  2. 5
      db/migrate/20211015090040_update_property_number_of_times_relet_type.rb
  3. 4
      db/schema.rb
  4. 5
      spec/requests/case_log_controller_spec.rb

16
app/models/case_log.rb

@ -1,7 +1,7 @@
class CaseLogValidator < ActiveModel::Validator class CaseLogValidator < ActiveModel::Validator
# Methods need to be named 'validate_' followed by field name # Methods to be used on save and continue need to be named 'validate_'
# this is how the metaprogramming of the method name being # followed by field name this is how the metaprogramming of the method
# call in the validate method works. # name being call in the validate method works.
def validate_tenant_age(record) def validate_tenant_age(record)
if record.tenant_age && !/^[1-9][0-9]?$|^120$/.match?(record.tenant_age.to_s) if record.tenant_age && !/^[1-9][0-9]?$|^120$/.match?(record.tenant_age.to_s)
@ -9,13 +9,19 @@ class CaseLogValidator < ActiveModel::Validator
end end
end end
def validate_property_number_of_times_relet(record)
if record.property_number_of_times_relet && !/^[1-9]$|^0[1-9]$|^1[0-9]$|^20$/.match?(record.property_number_of_times_relet.to_s)
record.errors.add :property_number_of_times_relet, "must be between 0 and 20"
end
end
def validate(record) def validate(record)
# If we've come from the form UI we only want to validate the specific fields # If we've come from the form UI we only want to validate the specific fields
# that have just been submitted. If we're submitting a log via API or Bulk Upload # that have just been submitted. If we're submitting a log via API or Bulk Upload
# we want to validate all data fields. # we want to validate all data fields.
question_to_validate = options[:previous_page] question_to_validate = options[:previous_page]
if question_to_validate && respond_to?("validate_#{question_to_validate}") if question_to_validate && respond_to?("validate_#{question_to_validate}")
public_send("validate_#{question_to_validate}", record) public_send("validate_#{question_to_validate}", record)
else else
# This assumes that all methods in this class other than this one are # This assumes that all methods in this class other than this one are
# validations to be run # validations to be run
@ -30,7 +36,7 @@ class CaseLog < ApplicationRecord
before_save :update_status! before_save :update_status!
attr_writer :previous_page attr_writer :previous_page
enum status: { "in progress" => 0, "submitted" => 1 } enum status: { "in progress" => 0, "submitted" => 1 }
AUTOGENERATED_FIELDS = %w[status created_at updated_at id].freeze AUTOGENERATED_FIELDS = %w[status created_at updated_at id].freeze

5
db/migrate/20211015090040_update_property_number_of_times_relet_type.rb

@ -0,0 +1,5 @@
class UpdatePropertyNumberOfTimesReletType < ActiveRecord::Migration[6.1]
def change
change_column :case_logs, :property_number_of_times_relet, :integer
end
end

4
db/schema.rb

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2021_10_13_113607) do ActiveRecord::Schema.define(version: 2021_10_15_090040) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -84,7 +84,6 @@ ActiveRecord::Schema.define(version: 2021_10_13_113607) do
t.string "property_void_date" t.string "property_void_date"
t.string "property_major_repairs" t.string "property_major_repairs"
t.string "property_major_repairs_date" t.string "property_major_repairs_date"
t.string "property_number_of_times_relet"
t.string "property_wheelchair_accessible" t.string "property_wheelchair_accessible"
t.string "net_income" t.string "net_income"
t.string "net_income_frequency" t.string "net_income_frequency"
@ -131,6 +130,7 @@ ActiveRecord::Schema.define(version: 2021_10_13_113607) do
t.boolean "reasonable_preference_reason_medical_grounds" t.boolean "reasonable_preference_reason_medical_grounds"
t.boolean "reasonable_preference_reason_avoid_hardship" t.boolean "reasonable_preference_reason_avoid_hardship"
t.boolean "reasonable_preference_reason_do_not_know" t.boolean "reasonable_preference_reason_do_not_know"
t.integer "property_number_of_times_relet"
end end
end end

5
spec/requests/case_log_controller_spec.rb

@ -4,6 +4,7 @@ RSpec.describe CaseLogsController, type: :request do
describe "POST #create" do describe "POST #create" do
let(:tenant_code) { "T365" } let(:tenant_code) { "T365" }
let(:tenant_age) { 35 } let(:tenant_age) { 35 }
let(:property_number_of_times_relet) { 12 }
let(:property_postcode) { "SE11 6TY" } let(:property_postcode) { "SE11 6TY" }
let(:api_username) { "test_user" } let(:api_username) { "test_user" }
let(:api_password) { "test_password" } let(:api_password) { "test_password" }
@ -27,6 +28,7 @@ RSpec.describe CaseLogsController, type: :request do
"tenant_code": tenant_code, "tenant_code": tenant_code,
"tenant_age": tenant_age, "tenant_age": tenant_age,
"property_postcode": property_postcode, "property_postcode": property_postcode,
"property_number_of_times_relet": property_number_of_times_relet
} }
end end
@ -55,11 +57,12 @@ RSpec.describe CaseLogsController, type: :request do
context "invalid json params" do context "invalid json params" do
let(:tenant_age) { 2000 } let(:tenant_age) { 2000 }
let(:property_number_of_times_relet) { 21 }
it "validates case log parameters" do it "validates case log parameters" do
json_response = JSON.parse(response.body) json_response = JSON.parse(response.body)
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(json_response["errors"]).to eq(["Tenant age must be between 0 and 120"]) expect(json_response["errors"]).to match_array(["Tenant age must be between 0 and 120", "Property number of times relet must be between 0 and 20"])
end end
end end

Loading…
Cancel
Save