Browse Source

model changes (#915)

pull/916/head
Dushan 2 years ago committed by GitHub
parent
commit
78d805f704
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      app/models/form/sales/pages/property_unit_type.rb
  2. 19
      app/models/form/sales/questions/property_unit_type.rb
  3. 1
      app/models/form/sales/subsections/property_information.rb
  4. 5
      db/migrate/20220928132657_add_prop_type_to_sales_log.rb
  5. 3
      db/schema.rb
  6. 1
      spec/factories/sales_log.rb
  7. 29
      spec/models/form/sales/pages/property_unit_type_spec.rb
  8. 43
      spec/models/form/sales/questions/property_unit_type_spec.rb
  9. 2
      spec/models/form/sales/subsections/property_information_spec.rb
  10. 4
      spec/models/form_handler_spec.rb

15
app/models/form/sales/pages/property_unit_type.rb

@ -0,0 +1,15 @@
class Form::Sales::Pages::PropertyUnitType < ::Form::Page
def initialize(id, hsh, subsection)
super
@id = "property_unit_type"
@header = ""
@description = ""
@subsection = subsection
end
def questions
@questions ||= [
Form::Sales::Questions::PropertyUnitType.new(nil, nil, self),
]
end
end

19
app/models/form/sales/questions/property_unit_type.rb

@ -0,0 +1,19 @@
class Form::Sales::Questions::PropertyUnitType < ::Form::Question
def initialize(id, hsh, page)
super
@id = "proptype"
@check_answer_label = "Type of unit"
@header = "What type of unit is the property?"
@type = "radio"
@answer_options = ANSWER_OPTIONS
@page = page
end
ANSWER_OPTIONS = {
"1" => { "value" => "Flat or maisonette" },
"2" => { "value" => "Bedsit" },
"3" => { "value" => "House" },
"4" => { "value" => "Bungalow" },
"9" => { "value" => "Other" },
}.freeze
end

1
app/models/form/sales/subsections/property_information.rb

@ -10,6 +10,7 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
def pages
@pages ||= [
Form::Sales::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
Form::Sales::Pages::PropertyUnitType.new(nil, nil, self),
]
end
end

5
db/migrate/20220928132657_add_prop_type_to_sales_log.rb

@ -0,0 +1,5 @@
class AddPropTypeToSalesLog < ActiveRecord::Migration[7.0]
def change
add_column :sales_logs, :proptype, :integer
end
end

3
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_09_27_133123) do
ActiveRecord::Schema[7.0].define(version: 2022_09_28_132657) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -339,6 +339,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_27_133123) do
t.string "sex1"
t.integer "buy1livein"
t.integer "buylivein"
t.integer "proptype"
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"

1
spec/factories/sales_log.rb

@ -23,6 +23,7 @@ FactoryBot.define do
age1 { 30 }
sex1 { "X" }
buy1livein { 1 }
proptype { 1 }
end
end
end

29
spec/models/form/sales/pages/property_unit_type_spec.rb

@ -0,0 +1,29 @@
require "rails_helper"
RSpec.describe Form::Sales::Pages::PropertyUnitType, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection) }
let(:page_id) { nil }
let(:page_definition) { nil }
let(:subsection) { instance_double(Form::Subsection) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
end
it "has correct questions" do
expect(page.questions.map(&:id)).to eq(%w[proptype])
end
it "has the correct id" do
expect(page.id).to eq("property_unit_type")
end
it "has the correct header" do
expect(page.header).to eq("")
end
it "has the correct description" do
expect(page.description).to eq("")
end
end

43
spec/models/form/sales/questions/property_unit_type_spec.rb

@ -0,0 +1,43 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::PropertyUnitType, type: :model do
subject(:question) { described_class.new(question_id, question_definition, page) }
let(:question_id) { nil }
let(:question_definition) { nil }
let(:page) { instance_double(Form::Page) }
it "has correct page" do
expect(question.page).to eq(page)
end
it "has the correct id" do
expect(question.id).to eq("proptype")
end
it "has the correct header" do
expect(question.header).to eq("What type of unit is the property?")
end
it "has the correct check_answer_label" do
expect(question.check_answer_label).to eq("Type of unit")
end
it "has the correct type" do
expect(question.type).to eq("radio")
end
it "is not marked as derived" do
expect(question.derived?).to be false
end
it "has the correct answer_options" do
expect(question.answer_options).to eq({
"1" => { "value" => "Flat or maisonette" },
"2" => { "value" => "Bedsit" },
"3" => { "value" => "House" },
"4" => { "value" => "Bungalow" },
"9" => { "value" => "Other" },
})
end
end

2
spec/models/form/sales/subsections/property_information_spec.rb

@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do
it "has correct pages" do
expect(property_information.pages.map(&:id)).to eq(
%w[property_number_of_bedrooms],
%w[property_number_of_bedrooms property_unit_type],
)
end

4
spec/models/form_handler_spec.rb

@ -61,14 +61,14 @@ RSpec.describe FormHandler do
it "is able to load a current sales form" do
form = form_handler.get_form("current_sales")
expect(form).to be_a(Form)
expect(form.pages.count).to eq(15)
expect(form.pages.count).to eq(16)
expect(form.name).to eq("2022_2023_sales")
end
it "is able to load a previous sales form" do
form = form_handler.get_form("previous_sales")
expect(form).to be_a(Form)
expect(form.pages.count).to eq(15)
expect(form.pages.count).to eq(16)
expect(form.name).to eq("2021_2022_sales")
end
end

Loading…
Cancel
Save