Revert "add sales building type question"

This reverts commit 2daa1f64cc.

app/models/form/sales/pages/building_type.rb

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

app/models/form/sales/questions/building_type.rb

@@ -1,17 +0,0 @@
-class Form::Sales::Questions::BuildingType < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "builtype"
-    @check_answer_label = "Building type"
-    @header = "What type of building is the property?"
-    @type = "radio"
-    @answer_options = ANSWER_OPTIONS
-    @page = page
-    @hint_text = ""
-  end
-
-  ANSWER_OPTIONS = {
-    "1" => { "value" => "Purpose built" },
-    "2" => { "value" => "Converted from previous residential or non-residential property" },
-  }.freeze
-end

app/models/form/sales/subsections/setup.rb

@@ -18,7 +18,6 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
       Form::Sales::Pages::OutrightOwnershipType.new(nil, nil, self),
       Form::Sales::Pages::JointPurchase.new(nil, nil, self),
       Form::Sales::Pages::NumberJointBuyers.new(nil, nil, self),
-      Form::Sales::Pages::BuildingType.new(nil, nil, self),
     ]
   end
 end

db/migrate/20220927133538_add_building_type_to_sales_log.rb

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

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_133538) do
+ActiveRecord::Schema[7.0].define(version: 2022_09_27_105552) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -329,15 +329,14 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_27_133538) do
     t.string "purchid"
     t.integer "type"
     t.integer "ownershipsch"
-    t.integer "jointpur"
     t.string "othtype"
-    t.integer "beds"
+    t.integer "jointpur"
     t.integer "jointmore"
+    t.integer "beds"
     t.integer "age1"
     t.integer "age1_known"
     t.string "sex1"
     t.integer "buy1livein"
-    t.integer "builtype"
     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"

spec/factories/sales_log.rb

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

spec/models/form/sales/pages/building_type_spec.rb

@@ -1,29 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Form::Sales::Pages::BuildingType, 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[builtype])
-  end
-
-  it "has the correct id" do
-    expect(page.id).to eq("builtype")
-  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

spec/models/form/sales/questions/building_type_spec.rb

@@ -1,44 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Form::Sales::Questions::BuildingType, 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("builtype")
-  end
-
-  it "has the correct header" do
-    expect(question.header).to eq("What type of building is the property?")
-  end
-
-  it "has the correct check_answer_label" do
-    expect(question.check_answer_label).to eq("Building type")
-  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 hint_text" do
-    expect(question.hint_text).to eq("")
-  end
-
-  it "has the correct answer_options" do
-    expect(question.answer_options).to eq({
-      "1" => { "value" => "Purpose built" },
-      "2" => { "value" => "Converted from previous residential or non-residential property" },
-    })
-  end
-end

spec/models/form/sales/subsections/setup_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
 
   it "has correct pages" do
     expect(setup.pages.map(&:id)).to eq(
-      %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase number_joint_buyers builtype],
+      %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase number_joint_buyers],
     )
   end
 

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(14)
       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(14)
       expect(form.name).to eq("2021_2022_sales")
     end
   end

spec/models/form_spec.rb

@@ -218,9 +218,9 @@ RSpec.describe Form, type: :model do
       expect(form.sections[0].class).to eq(Form::Sales::Sections::Setup)
       expect(form.subsections.count).to eq(1)
       expect(form.subsections.first.id).to eq("setup")
-      expect(form.pages.count).to eq(11)
+      expect(form.pages.count).to eq(10)
       expect(form.pages.first.id).to eq("organisation")
-      expect(form.questions.count).to eq(12)
+      expect(form.questions.count).to eq(11)
       expect(form.questions.first.id).to eq("owning_organisation_id")
       expect(form.start_date).to eq(Time.zone.parse("2022-04-01"))
       expect(form.end_date).to eq(Time.zone.parse("2023-07-01"))