feat: update to main

db/schema.rb

@@ -420,6 +420,12 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_04_164318) do
     t.string "relat4"
     t.string "relat5"
     t.string "relat6"
+    t.integer "hb"
+    t.string "sex4"
+    t.string "sex5"
+    t.string "sex6"
+    t.integer "savings_value_check"
+    t.integer "deposit_value_check"
     t.integer "frombeds"
     t.integer "staircase"
     t.integer "stairbought"
@@ -455,9 +461,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_04_164318) do
     t.integer "hhregresstill"
     t.integer "proplen"
     t.integer "prevten"
-    t.integer "savings_value_check"
-    t.integer "deposit_value_check"
-    t.integer "hb"
     t.integer "mortgageused"
     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"

spec/models/form_handler_spec.rb

@@ -52,14 +52,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(116)
+      expect(form.pages.count).to eq(122)
       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(116)
+      expect(form.pages.count).to eq(122)
       expect(form.name).to eq("2021_2022_sales")
     end
   end