UPRN questions and flows

app/helpers/question_view_helper.rb

@@ -8,14 +8,16 @@ module QuestionViewHelper
   def legend(question, page_header, conditional)
     {
       text: [question.question_number_string(conditional:), question.header.html_safe].compact.join(" - "),
-      size: label_size(page_header, conditional),
+      size: label_size(page_header, conditional, question),
       tag: label_tag(page_header, conditional),
     }
   end
 
 private
 
-  def label_size(page_header, conditional)
+  def label_size(page_header, conditional, question)
+    return if question.plain_label.present?
+
     page_header.blank? && !conditional ? "l" : "m"
   end
 

app/models/derived_variables/sales_log_variables.rb

@@ -23,6 +23,15 @@ module DerivedVariables::SalesLogVariables
     self.totadult = total_adult + total_elder
     self.hhmemb = number_of_household_members
     self.hhtype = household_type
+
+    if uprn_known&.zero?
+      self.uprn = nil
+    end
+
+    if uprn_confirmed&.zero?
+      self.uprn = nil
+      self.uprn_known = 0
+    end
   end
 
 private

app/models/form/page.rb

@@ -1,6 +1,7 @@
 class Form::Page
   attr_accessor :id, :header, :header_partial, :description, :questions, :depends_on, :title_text,
-                :informative_text, :subsection, :hide_subsection_label, :next_unresolved_page_id
+                :informative_text, :subsection, :hide_subsection_label, :next_unresolved_page_id,
+                :skip_text
 
   def initialize(id, hsh, subsection)
     @id = id
@@ -15,6 +16,7 @@ class Form::Page
       @informative_text = hsh["informative_text"]
       @hide_subsection_label = hsh["hide_subsection_label"]
       @next_unresolved_page_id = hsh["next_unresolved_page_id"]
+      @skip_text = hsh["skip_text"]
     end
   end
 
@@ -36,6 +38,8 @@ class Form::Page
     questions.all? { |question| question.type == "interruption_screen" }
   end
 
+  def skip_href(log = nil); end
+
 private
 
   def conditional_question_ids

app/models/form/question.rb

@@ -4,7 +4,7 @@ class Form::Question
                 :conditional_for, :readonly, :answer_options, :page, :check_answer_label,
                 :inferred_answers, :hidden_in_check_answers, :inferred_check_answers_value,
                 :guidance_partial, :prefix, :suffix, :requires_js, :fields_added, :derived,
-                :check_answers_card_number, :unresolved_hint_text, :question_number
+                :check_answers_card_number, :unresolved_hint_text, :question_number, :plain_label
 
   module GuidancePosition
     TOP = 1
@@ -41,6 +41,7 @@ class Form::Question
       @check_answers_card_number = hsh["check_answers_card_number"] || 0
       @unresolved_hint_text = hsh["unresolved_hint_text"]
       @question_number = hsh["question_number"]
+      @plain_label = hsh["plain_label"]
     end
   end
 
@@ -57,6 +58,8 @@ class Form::Question
     inferred_answer_value(log) || answer_label
   end
 
+  def notification_banner(_log = nil); end
+
   def get_inferred_answers(log)
     return [] unless inferred_answers
 

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

@@ -0,0 +1,21 @@
+class Form::Sales::Pages::Address < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "address"
+    @header = "What is the property's address?"
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::AddressLine1.new(nil, nil, self),
+      Form::Sales::Questions::AddressLine2.new(nil, nil, self),
+      Form::Sales::Questions::TownOrCity.new(nil, nil, self),
+      Form::Sales::Questions::County.new(nil, nil, self),
+      Form::Sales::Questions::PostcodeForFullAddress.new(nil, nil, self),
+    ]
+  end
+
+  def routed_to?(log, _current_user)
+    log.uprn_confirmed != 1 || log.uprn_known&.zero?
+  end
+end

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

@@ -0,0 +1,26 @@
+class Form::Sales::Pages::Uprn < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "uprn"
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::Uprn.new(nil, nil, self),
+    ]
+  end
+
+  def routed_to?(log, _current_user)
+    log.uprn_known == 1
+  end
+
+  def skip_text
+    "Enter address instead"
+  end
+
+  def skip_href(log = nil)
+    return unless log
+
+    "/#{log.model_name.param_key.dasherize}s/#{log.id}/address"
+  end
+end

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

@@ -0,0 +1,17 @@
+class Form::Sales::Pages::UprnConfirmation < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "uprn_confirmation"
+    @header = "We found an address that might be this property"
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::UprnConfirmation.new(nil, nil, self),
+    ]
+  end
+
+  def routed_to?(log, _current_user)
+    log.uprn.present? && log.uprn_known == 1
+  end
+end

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

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

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

@@ -0,0 +1,35 @@
+class Form::Sales::Questions::AddressLine1 < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "address_line1"
+    @check_answer_label = "Address"
+    @header = "Address line 1"
+    @type = "text"
+    @plain_label = true
+  end
+
+  def hidden_in_check_answers?(log, _current_user = nil)
+    return true if log.uprn_known.nil?
+    return false if log.uprn_known&.zero?
+    return true if log.uprn_confirmed.nil? && log.uprn.present?
+    return true if log.uprn_known == 1 && log.uprn.blank?
+
+    log.uprn_confirmed == 1
+  end
+
+  def answer_label(log, _current_user = nil)
+    [
+      log.address_line1,
+      log.address_line2,
+      log.postcode_full,
+      log.town_or_city,
+      log.county,
+    ].select(&:present?).join("\n")
+  end
+
+  def get_extra_check_answer_value(log)
+    la = LocalAuthority.find_by(code: log.la)&.name
+
+    la.presence
+  end
+end

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

@@ -0,0 +1,13 @@
+class Form::Sales::Questions::AddressLine2 < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "address_line2"
+    @header = "Address line 2 (optional)"
+    @type = "text"
+    @plain_label = true
+  end
+
+  def hidden_in_check_answers?(_log = nil, _current_user = nil)
+    true
+  end
+end

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

@@ -0,0 +1,13 @@
+class Form::Sales::Questions::County < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "county"
+    @header = "County (optional)"
+    @type = "text"
+    @plain_label = true
+  end
+
+  def hidden_in_check_answers?(_log = nil, _current_user = nil)
+    true
+  end
+end

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

@@ -0,0 +1,25 @@
+class Form::Sales::Questions::PostcodeForFullAddress < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "postcode_full"
+    @header = "Postcode"
+    @type = "text"
+    @width = 5
+    @inferred_check_answers_value = [{
+      "condition" => {
+        "pcodenk" => 1,
+      },
+      "value" => "Not known",
+    }]
+    @inferred_answers = {
+      "la" => {
+        "is_la_inferred" => true,
+      },
+    }
+    @plain_label = true
+  end
+
+  def hidden_in_check_answers?(_log = nil, _current_user = nil)
+    true
+  end
+end

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

@@ -0,0 +1,13 @@
+class Form::Sales::Questions::TownOrCity < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "town_or_city"
+    @header = "Town or city"
+    @type = "text"
+    @plain_label = true
+  end
+
+  def hidden_in_check_answers?(_log = nil, _current_user = nil)
+    true
+  end
+end

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

@@ -0,0 +1,34 @@
+class Form::Sales::Questions::Uprn < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "uprn"
+    @check_answer_label = "UPRN"
+    @header = "What is the property's UPRN"
+    @type = "text"
+    @hint_text = "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and sectors UK-wide. For example 10010457355."
+    @width = 10
+  end
+
+  def unanswered_error_message
+    I18n.t("validations.property.uprn.invalid")
+  end
+
+  def get_extra_check_answer_value(log)
+    value = [
+      log.address_line1,
+      log.address_line2,
+      log.town_or_city,
+      log.county,
+      log.postcode_full,
+      (LocalAuthority.find_by(code: log.uprn)&.name if log.uprn.present?),
+    ].select(&:present?)
+
+    return unless value.any?
+
+    "\n\n#{value.join("\n")}"
+  end
+
+  def hidden_in_check_answers?(log, _current_user = nil)
+    log.uprn_known != 1
+  end
+end

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

@@ -0,0 +1,34 @@
+class Form::Sales::Questions::UprnConfirmation < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "uprn_confirmed"
+    @header = "Is this the property address?"
+    @type = "radio"
+    @answer_options = ANSWER_OPTIONS
+    @check_answer_label = "Is this the right address?"
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "Yes" },
+    "0" => { "value" => "No, I want to enter the address manually" },
+  }.freeze
+
+  def notification_banner(log = nil)
+    return unless log&.uprn
+
+    {
+      title: "UPRN: #{log.uprn}",
+      heading: [
+        log.address_line1,
+        log.address_line2,
+        log.postcode_full,
+        log.town_or_city,
+        log.county,
+      ].select(&:present?).join("\n"),
+    }
+  end
+
+  def hidden_in_check_answers?(log, _current_user = nil)
+    log.uprn_known != 1 || log.uprn_confirmed.present?
+  end
+end

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

@@ -0,0 +1,21 @@
+class Form::Sales::Questions::UprnKnown < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "uprn_known"
+    @check_answer_label = "UPRN known?"
+    @header = "Do you know the sale UPRN?"
+    @type = "radio"
+    @answer_options = ANSWER_OPTIONS
+    @hint_text = "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and sectors UK-wide. For example 10010457355.<br><br>
+    You can continue without the UPRN, but it means we will need you to enter the address of the property."
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "Yes" },
+    "0" => { "value" => "No" },
+  }.freeze
+
+  def unanswered_error_message
+    I18n.t("validations.property.uprn_known.invalid")
+  end
+end

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

@@ -8,15 +8,36 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
 
   def pages
     @pages ||= [
+      uprn_questions,
       Form::Sales::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
       Form::Sales::Pages::AboutPriceValueCheck.new("about_price_bedrooms_value_check", nil, self),
       Form::Sales::Pages::PropertyUnitType.new(nil, nil, self),
       Form::Sales::Pages::MonthlyChargesValueCheck.new("monthly_charges_property_type_value_check", nil, self),
       Form::Sales::Pages::PropertyBuildingType.new(nil, nil, self),
-      Form::Sales::Pages::Postcode.new(nil, nil, self),
-      Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
+      postcode_and_la_questions,
       Form::Sales::Pages::AboutPriceValueCheck.new("about_price_la_value_check", nil, self),
       Form::Sales::Pages::PropertyWheelchairAccessible.new(nil, nil, self),
+    ].flatten.compact
+  end
+
+  def uprn_questions
+    if form.start_date.year >= 2023
+      [
+        Form::Sales::Pages::UprnKnown.new(nil, nil, self),
+        Form::Sales::Pages::Uprn.new(nil, nil, self),
+        Form::Sales::Pages::UprnConfirmation.new(nil, nil, self),
+        Form::Sales::Pages::Address.new(nil, nil, self),
+        Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
+      ]
+    end
+  end
+
+  def postcode_and_la_questions
+    if form.start_date.year < 2023
+      [
+        Form::Sales::Pages::Postcode.new(nil, nil, self),
+        Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
       ]
     end
+  end
 end

app/models/log.rb

@@ -31,6 +31,24 @@ class Log < ApplicationRecord
   }
   scope :created_by, ->(user) { where(created_by: user) }
 
+  def process_uprn_change!
+    if uprn.present?
+      service = UprnClient.new(uprn)
+      service.call
+
+      return errors.add(:uprn, service.error) if service.error.present?
+
+      presenter = UprnDataPresenter.new(service.result)
+
+      self.uprn_confirmed = nil
+      self.address_line1 = presenter.address_line1
+      self.address_line2 = presenter.address_line2
+      self.town_or_city = presenter.town_or_city
+      self.postcode_full = presenter.postcode
+      process_postcode_changes!
+    end
+  end
+
   def collection_start_year
     return @start_year if @start_year
 

app/models/sales_log.rb

@@ -31,6 +31,7 @@ class SalesLog < Log
   before_validation :reset_location_fields!, unless: :postcode_known?
   before_validation :reset_previous_location_fields!, unless: :previous_postcode_known?
   before_validation :set_derived_fields!
+  after_validation :process_uprn_change!, if: :should_process_uprn_change?
 
   scope :filter_by_year, ->(year) { where(saledate: Time.zone.local(year.to_i, 4, 1)...Time.zone.local(year.to_i + 1, 4, 1)) }
   scope :filter_by_purchaser_code, ->(purchid) { where("purchid ILIKE ?", "%#{purchid}%") }
@@ -311,4 +312,8 @@ class SalesLog < Log
     field_value = public_send(field_name)
     format_as_currency(field_value)
   end
+
+  def should_process_uprn_change?
+    uprn_changed? && saledate && saledate.year >= 2023
+  end
 end

app/views/form/_check_answers_summary_list.html.erb

@@ -3,12 +3,19 @@
     <% summary_list.row do |row| %>
       <% row.key { get_question_label(question) } %>
       <% row.value do %>
-        <span class="govuk-!-margin-right-4"><%= get_answer_label(question, @log) %></span>
+          <%= simple_format(
+            get_answer_label(question, @log),
+            wrapper_tag: "span",
+            class: "govuk-!-margin-right-4",
+          ) %>
         <% extra_value = question.get_extra_check_answer_value(@log) %>
-        <% if extra_value %>
-          <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= extra_value %></span>
+        <% if extra_value && question.answer_label(lettings_log, current_user).present? %>
+          <%= simple_format(
+            extra_value,
+            wrapper_tag: "span",
+            class: "govuk-!-font-weight-regular app-!-colour-muted",
+          ) %>
         <% end %>
-        <br>
         <% question.get_inferred_answers(@log).each do |inferred_answer| %>
           <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
         <% end %>

app/views/form/_numeric_output_question.html.erb

@@ -1,7 +1,7 @@
 <%= render partial: "form/guidance/#{question.guidance_partial}" if question.top_guidance? %>
 
 <div class="govuk-form-group">
-  <label class="govuk-label govuk-label--<%= label_size(page_header, conditional) %>" for="lettings-log-<%= question.id %>-field">
+  <label class="govuk-label govuk-label--<%= label_size(page_header, conditional, question) %>" for="lettings-log-<%= question.id %>-field">
     <%= question.header.html_safe %>
   </label>
   <div class="govuk-hint">

app/views/form/_radio_question.html.erb

@@ -1,4 +1,13 @@
 <%= render partial: "form/guidance/#{question.guidance_partial}" if question.top_guidance? %>
+  <% banner = question.notification_banner(@log) %>
+  <% if banner %>
+    <%= govuk_notification_banner(
+      title_text: banner[:title],
+      title_heading_level: 3,
+    ) do
+      simple_format(banner[:heading])
+    end %>
+  <% end %>
 
 <%= f.govuk_radio_buttons_fieldset question.id.to_sym,
   caption: caption(caption_text, page_header, conditional),

app/views/form/page.html.erb

@@ -63,7 +63,10 @@
       <div class="govuk-button-group">
         <% if !@page.interruption_screen? && if request.query_parameters["referrer"] != "check_answers" %>
           <%= f.govuk_submit "Save and continue" %>
-          <%= govuk_link_to "Skip for now", send(@log.form.next_page_redirect_path(@page, @log, current_user), @log) %>
+          <%= govuk_link_to(
+            (@page.skip_text || "Skip for now"),
+            (@page.skip_href(@log) || send(@log.form.next_page_redirect_path(@page, @log, current_user), @log)),
+          ) %>
           <% else %>
           <%= f.govuk_submit "Save changes" %>
             <%= govuk_link_to "Cancel", send(@log.form.cancel_path(@page, @log), @log) %>

config/locales/en.yml

@@ -187,6 +187,10 @@ en:
         supported_housing_mismatch: Lettings type must be a supported housing type because you selected supported housing when uploading the file
 
     property:
+      uprn:
+        invalid: "UPRN must be 12 digits or less"
+      uprn_known:
+        invalid: "You must answer UPRN known?"
       mrcdate:
         before_tenancy_start: "Enter a major repairs date that is before the tenancy start date"
         not_first_let: "Major repairs date must not be completed if the tenancy is a first let"

spec/features/lettings_log_spec.rb

@@ -89,7 +89,7 @@ RSpec.describe "Lettings Log Features" do
         click_button("Save and continue")
         log_id = page.current_path.scan(/\d/).join
         visit("lettings-logs/#{log_id}/setup/check-answers")
-        expect(page).to have_content("Stock owner User org")
+        expect(page).to have_content("Stock owner User org", normalize_ws: true)
         expect(page).to have_content("You have answered 2 of 8 questions")
       end
     end
@@ -125,7 +125,7 @@ RSpec.describe "Lettings Log Features" do
           select(managing_org.name, from: "lettings-log-managing-organisation-id-field")
           click_button("Save and continue")
           visit("lettings-logs/#{log_id}/setup/check-answers")
-          expect(page).to have_content("Managing agent Managing org")
+          expect(page).to have_content("Managing agent Managing org", normalize_ws: true)
           expect(support_user.organisation.managing_agents).to eq([org_rel.child_organisation])
         end
       end
@@ -164,7 +164,7 @@ RSpec.describe "Lettings Log Features" do
             select(managing_org1.name, from: "lettings-log-managing-organisation-id-field")
             click_button("Save and continue")
             visit("lettings-logs/#{log_id}/setup/check-answers")
-            expect(page).to have_content("Managing agent Managing org 1")
+            expect(page).to have_content("Managing agent Managing org 1", normalize_ws: true)
           end
 
           context "and the owning organisation has 2 or more managing agents" do
@@ -183,10 +183,10 @@ RSpec.describe "Lettings Log Features" do
                 select(managing_org1.name, from: "lettings-log-managing-organisation-id-field")
                 click_button("Save and continue")
                 visit("lettings-logs/#{log_id}/setup/check-answers")
-                expect(page).to have_content("Managing agent Managing org 1")
+                expect(page).to have_content("Managing agent Managing org 1", normalize_ws: true)
                 org_rel1.destroy!
                 visit("lettings-logs/#{log_id}/setup/check-answers")
-                expect(page).to have_content("Managing agent Managing org 1")
+                expect(page).to have_content("Managing agent Managing org 1", normalize_ws: true)
                 expect(support_user.organisation.managing_agents).to eq([org_rel2.child_organisation])
               end
             end
@@ -237,7 +237,7 @@ RSpec.describe "Lettings Log Features" do
           log_id = page.current_path.scan(/\d/).join
           expect(page).to have_current_path("/lettings-logs/#{log_id}/stock-owner")
           visit("lettings-logs/#{log_id}/setup/check-answers")
-          expect(page).to have_content("Stock owner User org")
+          expect(page).to have_content("Stock owner User org", normalize_ws: true)
         end
 
         context "and there are 3 or more potential stock owners" do
@@ -254,10 +254,10 @@ RSpec.describe "Lettings Log Features" do
               select(owning_org1.name, from: "lettings-log-owning-organisation-id-field")
               click_button("Save and continue")
               visit("lettings-logs/#{log_id}/setup/check-answers")
-              expect(page).to have_content("Stock owner Owning org 1")
+              expect(page).to have_content("Stock owner Owning org 1", normalize_ws: true)
               org_rel1.destroy!
               visit("lettings-logs/#{log_id}/setup/check-answers")
-              expect(page).to have_content("Stock owner Owning org 1")
+              expect(page).to have_content("Stock owner Owning org 1", normalize_ws: true)
               expect(user.organisation.stock_owners).to eq([org_rel2.parent_organisation])
             end
           end
@@ -283,7 +283,8 @@ RSpec.describe "Lettings Log Features" do
           select(user.organisation.name, from: "lettings-log-managing-organisation-id-field")
           click_button("Save and continue")
           visit("lettings-logs/#{log_id}/setup/check-answers")
-          expect(page).to have_content("Managing agent User org")
+
+          expect(page).to have_content("Managing agent User org", normalize_ws: true)
           expect(user.organisation.stock_owners).to eq([org_rel1.parent_organisation, org_rel2.parent_organisation])
         end
       end
@@ -328,7 +329,7 @@ RSpec.describe "Lettings Log Features" do
             select(managing_org.name, from: "lettings-log-managing-organisation-id-field")
             click_button("Save and continue")
             visit("lettings-logs/#{log_id}/setup/check-answers")
-            expect(page).to have_content("Managing agent Managing org")
+            expect(page).to have_content("Managing agent Managing org", normalize_ws: true)
             expect(user.organisation.managing_agents).to eq([org_rel2.child_organisation])
           end
         end

spec/fixtures/files/lettings_logs_download.csv

@@ -1,2 +1,2 @@
-id,status,created_at,updated_at,created_by_name,is_dpo,owning_organisation_name,managing_organisation_name,collection_start_year,needstype,renewal,startdate,rent_type_detail,irproduct_other,tenancycode,propcode,age1,sex1,ecstat1,hhmemb,relat2,age2,sex2,retirement_value_check,ecstat2,armedforces,leftreg,illness,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_h,is_previous_la_inferred,prevloc_label,prevloc,illness_type_1,illness_type_2,is_la_inferred,la_label,la,postcode_known,postcode_full,previous_la_known,wchair,preg_occ,cbl,earnings,incfreq,net_income_value_check,benefits,hb,period,brent,scharge,pscharge,supcharg,tcharge,offered,layear,ppostcode_full,mrcdate,declaration,ethnic,national,prevten,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,reservist,startertenancy,tenancylength,tenancy,rsnvac,unittype_gn,beds,waityear,reasonpref,chr,cap,reasonother,housingneeds_f,housingneeds_g,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,property_owner_organisation,property_manager_organisation,purchaser_code,reason,majorrepairs,hbrentshortfall,property_relet,incref,first_time_property_let_as_social_housing,unitletas,builtype,voiddate,renttype,lettype,totchild,totelder,totadult,net_income_known,nocharge,is_carehome,household_charge,referral,tshortfall,chcharge,ppcodenk,age1_known,age2_known,age3_known,age4_known,age5_known,age6_known,age7_known,age8_known,ethnic_group,letting_allocation_unknown,details_known_2,details_known_3,details_known_4,details_known_5,details_known_6,details_known_7,details_known_8,has_benefits,wrent,wscharge,wpschrge,wsupchrg,wtcharge,wtshortfall,refused,housingneeds,wchchrg,newprop,relat3,relat4,relat5,relat6,relat7,relat8,rent_value_check,old_form_id,lar,irproduct,old_id,joint,tshortfall_known,sheltered,pregnancy_value_check,hhtype,new_old,vacdays,major_repairs_date_value_check,void_date_value_check,housingneeds_type,housingneeds_other,unresolved,updated_by_id,unittype_sh,scheme_code,scheme_service_name,scheme_sensitive,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate
-{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,Supported housing,,2 October 2021,London Affordable Rent,,,,,,,,,,,,,,,,,,,,No,,,,,No,Westminster,E09000033,,SE1 1TE,,No,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,8,0,0,0,,0,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,0,,,,,,,,,,,,,,,,,,,9,1,,,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}
+id,status,created_at,updated_at,created_by_name,is_dpo,owning_organisation_name,managing_organisation_name,collection_start_year,needstype,renewal,startdate,rent_type_detail,irproduct_other,tenancycode,propcode,age1,sex1,ecstat1,hhmemb,relat2,age2,sex2,retirement_value_check,ecstat2,armedforces,leftreg,illness,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_h,is_previous_la_inferred,prevloc_label,prevloc,illness_type_1,illness_type_2,is_la_inferred,la_label,la,postcode_known,postcode_full,previous_la_known,wchair,preg_occ,cbl,earnings,incfreq,net_income_value_check,benefits,hb,period,brent,scharge,pscharge,supcharg,tcharge,offered,layear,ppostcode_full,mrcdate,declaration,ethnic,national,prevten,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,reservist,startertenancy,tenancylength,tenancy,rsnvac,unittype_gn,beds,waityear,reasonpref,chr,cap,reasonother,housingneeds_f,housingneeds_g,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,property_owner_organisation,property_manager_organisation,purchaser_code,reason,majorrepairs,hbrentshortfall,property_relet,incref,first_time_property_let_as_social_housing,unitletas,builtype,voiddate,renttype,lettype,totchild,totelder,totadult,net_income_known,nocharge,is_carehome,household_charge,referral,tshortfall,chcharge,ppcodenk,age1_known,age2_known,age3_known,age4_known,age5_known,age6_known,age7_known,age8_known,ethnic_group,letting_allocation_unknown,details_known_2,details_known_3,details_known_4,details_known_5,details_known_6,details_known_7,details_known_8,has_benefits,wrent,wscharge,wpschrge,wsupchrg,wtcharge,wtshortfall,refused,housingneeds,wchchrg,newprop,relat3,relat4,relat5,relat6,relat7,relat8,rent_value_check,old_form_id,lar,irproduct,old_id,joint,tshortfall_known,sheltered,pregnancy_value_check,hhtype,new_old,vacdays,major_repairs_date_value_check,void_date_value_check,housingneeds_type,housingneeds_other,unresolved,updated_by_id,uprn,uprn_known,uprn_confirmed,address_line1,address_line2,town_or_city,county,unittype_sh,scheme_code,scheme_service_name,scheme_sensitive,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate
+{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,Supported housing,,2 October 2021,London Affordable Rent,,,,,,,,,,,,,,,,,,,,No,,,,,No,Westminster,E09000033,,SE1 1TE,,No,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,8,0,0,0,,0,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,0,,,,,,,,,,,,,,,,,,,9,1,,,,,,,,,,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}

spec/fixtures/files/lettings_logs_download_codes_only.csv

@@ -1,2 +1,2 @@
-id,status,created_at,updated_at,created_by_name,is_dpo,owning_organisation_name,managing_organisation_name,collection_start_year,needstype,renewal,startdate,rent_type_detail,irproduct_other,tenancycode,propcode,age1,sex1,ecstat1,hhmemb,relat2,age2,sex2,retirement_value_check,ecstat2,armedforces,leftreg,illness,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_h,is_previous_la_inferred,prevloc_label,prevloc,illness_type_1,illness_type_2,is_la_inferred,la_label,la,postcode_known,postcode_full,previous_la_known,wchair,preg_occ,cbl,earnings,incfreq,net_income_value_check,benefits,hb,period,brent,scharge,pscharge,supcharg,tcharge,offered,layear,ppostcode_full,mrcdate,declaration,ethnic,national,prevten,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,reservist,startertenancy,tenancylength,tenancy,rsnvac,unittype_gn,beds,waityear,reasonpref,chr,cap,reasonother,housingneeds_f,housingneeds_g,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,property_owner_organisation,property_manager_organisation,purchaser_code,reason,majorrepairs,hbrentshortfall,property_relet,incref,first_time_property_let_as_social_housing,unitletas,builtype,voiddate,renttype,lettype,totchild,totelder,totadult,net_income_known,nocharge,is_carehome,household_charge,referral,tshortfall,chcharge,ppcodenk,age1_known,age2_known,age3_known,age4_known,age5_known,age6_known,age7_known,age8_known,ethnic_group,letting_allocation_unknown,details_known_2,details_known_3,details_known_4,details_known_5,details_known_6,details_known_7,details_known_8,has_benefits,wrent,wscharge,wpschrge,wsupchrg,wtcharge,wtshortfall,refused,housingneeds,wchchrg,newprop,relat3,relat4,relat5,relat6,relat7,relat8,rent_value_check,old_form_id,lar,irproduct,old_id,joint,tshortfall_known,sheltered,pregnancy_value_check,hhtype,new_old,vacdays,major_repairs_date_value_check,void_date_value_check,housingneeds_type,housingneeds_other,unresolved,updated_by_id,unittype_sh,scheme_code,scheme_service_name,scheme_sensitive,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate
-{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,false,DLUHC,DLUHC,2021,2,,2 October 2021,2,,,,,,,,,,,,,,,,,,,,false,,,,,false,Westminster,E09000033,,SE1 1TE,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,8,0,0,0,,0,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,0,,,,,,,,,,,,,,,,,,,9,1,,,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},0,1,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,6,A,Westminster,{location_startdate}
+id,status,created_at,updated_at,created_by_name,is_dpo,owning_organisation_name,managing_organisation_name,collection_start_year,needstype,renewal,startdate,rent_type_detail,irproduct_other,tenancycode,propcode,age1,sex1,ecstat1,hhmemb,relat2,age2,sex2,retirement_value_check,ecstat2,armedforces,leftreg,illness,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_h,is_previous_la_inferred,prevloc_label,prevloc,illness_type_1,illness_type_2,is_la_inferred,la_label,la,postcode_known,postcode_full,previous_la_known,wchair,preg_occ,cbl,earnings,incfreq,net_income_value_check,benefits,hb,period,brent,scharge,pscharge,supcharg,tcharge,offered,layear,ppostcode_full,mrcdate,declaration,ethnic,national,prevten,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,reservist,startertenancy,tenancylength,tenancy,rsnvac,unittype_gn,beds,waityear,reasonpref,chr,cap,reasonother,housingneeds_f,housingneeds_g,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,property_owner_organisation,property_manager_organisation,purchaser_code,reason,majorrepairs,hbrentshortfall,property_relet,incref,first_time_property_let_as_social_housing,unitletas,builtype,voiddate,renttype,lettype,totchild,totelder,totadult,net_income_known,nocharge,is_carehome,household_charge,referral,tshortfall,chcharge,ppcodenk,age1_known,age2_known,age3_known,age4_known,age5_known,age6_known,age7_known,age8_known,ethnic_group,letting_allocation_unknown,details_known_2,details_known_3,details_known_4,details_known_5,details_known_6,details_known_7,details_known_8,has_benefits,wrent,wscharge,wpschrge,wsupchrg,wtcharge,wtshortfall,refused,housingneeds,wchchrg,newprop,relat3,relat4,relat5,relat6,relat7,relat8,rent_value_check,old_form_id,lar,irproduct,old_id,joint,tshortfall_known,sheltered,pregnancy_value_check,hhtype,new_old,vacdays,major_repairs_date_value_check,void_date_value_check,housingneeds_type,housingneeds_other,unresolved,updated_by_id,uprn,uprn_known,uprn_confirmed,address_line1,address_line2,town_or_city,county,unittype_sh,scheme_code,scheme_service_name,scheme_sensitive,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate
+{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,false,DLUHC,DLUHC,2021,2,,2 October 2021,2,,,,,,,,,,,,,,,,,,,,false,,,,,false,Westminster,E09000033,,SE1 1TE,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,8,0,0,0,,0,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,0,,,,,,,,,,,,,,,,,,,9,1,,,,,,,,,,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},0,1,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,6,A,Westminster,{location_startdate}

spec/fixtures/files/lettings_logs_download_non_support.csv

@@ -1,2 +1,2 @@
-id,status,created_at,updated_at,created_by_name,is_dpo,owning_organisation_name,managing_organisation_name,collection_start_year,renewal,startdate,irproduct_other,tenancycode,propcode,age1,sex1,ecstat1,relat2,age2,sex2,ecstat2,armedforces,leftreg,illness,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_h,prevloc_label,illness_type_1,illness_type_2,la_label,postcode_full,wchair,preg_occ,cbl,earnings,incfreq,benefits,hb,period,brent,scharge,pscharge,supcharg,tcharge,offered,layear,ppostcode_full,mrcdate,declaration,ethnic,national,prevten,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,reservist,startertenancy,tenancylength,tenancy,rsnvac,unittype_gn,beds,waityear,reasonpref,chr,cap,reasonother,housingneeds_f,housingneeds_g,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,property_owner_organisation,property_manager_organisation,purchaser_code,reason,majorrepairs,hbrentshortfall,property_relet,incref,unitletas,builtype,voiddate,lettype,nocharge,household_charge,referral,tshortfall,chcharge,ppcodenk,ethnic_group,has_benefits,refused,housingneeds,wchchrg,newprop,relat3,relat4,relat5,relat6,relat7,relat8,lar,irproduct,joint,sheltered,major_repairs_date_value_check,void_date_value_check,housingneeds_type,housingneeds_other,unittype_sh,scheme_code,scheme_service_name,scheme_sensitive,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate
-{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,,2 October 2021,,,,,,,,,,,,,,,,,,,,,Westminster,SE1 1TE,No,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,0,,,,,,,0,0,,,,,,,,,,,,,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}
+id,status,created_at,updated_at,created_by_name,is_dpo,owning_organisation_name,managing_organisation_name,collection_start_year,renewal,startdate,irproduct_other,tenancycode,propcode,age1,sex1,ecstat1,relat2,age2,sex2,ecstat2,armedforces,leftreg,illness,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_h,prevloc_label,illness_type_1,illness_type_2,la_label,postcode_full,wchair,preg_occ,cbl,earnings,incfreq,benefits,hb,period,brent,scharge,pscharge,supcharg,tcharge,offered,layear,ppostcode_full,mrcdate,declaration,ethnic,national,prevten,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,reservist,startertenancy,tenancylength,tenancy,rsnvac,unittype_gn,beds,waityear,reasonpref,chr,cap,reasonother,housingneeds_f,housingneeds_g,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,property_owner_organisation,property_manager_organisation,purchaser_code,reason,majorrepairs,hbrentshortfall,property_relet,incref,unitletas,builtype,voiddate,lettype,nocharge,household_charge,referral,tshortfall,chcharge,ppcodenk,ethnic_group,has_benefits,refused,housingneeds,wchchrg,newprop,relat3,relat4,relat5,relat6,relat7,relat8,lar,irproduct,joint,sheltered,major_repairs_date_value_check,void_date_value_check,housingneeds_type,housingneeds_other,uprn,uprn_known,uprn_confirmed,address_line1,address_line2,town_or_city,county,unittype_sh,scheme_code,scheme_service_name,scheme_sensitive,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate
+{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,,2 October 2021,,,,,,,,,,,,,,,,,,,,,Westminster,SE1 1TE,No,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,0,,,,,,,0,0,,,,,,,,,,,,,,,,,,,,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}

spec/helpers/question_view_helper_spec.rb

@@ -81,5 +81,10 @@ RSpec.describe QuestionViewHelper do
         expect(question_view_helper).to eq(legend_options_hash)
       end
     end
+
+    context "when viewing a question with a plain label" do
+      xit "returns an options hash with nil size" do
+      end
+    end
   end
 end

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

@@ -0,0 +1,37 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Address, 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[address_line1 address_line2 town_or_city county postcode_full])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("address")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to eq("What is the property's address?")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to be_nil
+  end
+
+  xit "has correct routed_to" do
+    expect(page.routed_to?).to be_nil
+  end
+end

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

@@ -0,0 +1,37 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::UprnConfirmation, 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[uprn_confirmed])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("uprn_confirmation")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to eq("We found an address that might be this property")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to be_nil
+  end
+
+  xit "has correct routed_to" do
+    expect(page.routed_to?).to be_nil
+  end
+end

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

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::UprnKnown, 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[uprn_known])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("uprn_known")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to be_nil
+  end
+
+  it "has the correct description" do
+    expect(page.description).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to be_nil
+  end
+end

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

@@ -0,0 +1,45 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Uprn, 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[uprn])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("uprn")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to be_nil
+  end
+
+  it "has the correct description" do
+    expect(page.description).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to be_nil
+  end
+
+  it "has correct skip_text" do
+    expect(page.skip_text).to eq("Enter address instead")
+  end
+
+  xit "has correct routed_to?" do
+    expect(page.routed_to?).to be_nil
+  end
+
+  xit "has correct skip_href" do
+    expect(page.skip_href).to be_nil
+  end
+end

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

@@ -0,0 +1,45 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::AddressLine1, 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("address_line1")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Address line 1")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Address")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("text")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to be_nil
+  end
+
+  it "has the correct inferred check answers value" do
+    expect(question.inferred_check_answers_value).to be_nil
+  end
+
+  it "has the correct check_answers_card_number" do
+    expect(question.check_answers_card_number).to be_nil
+  end
+end

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

@@ -0,0 +1,49 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::AddressLine2, 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("address_line2")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Address line 2 (optional)")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to be_nil
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("text")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to be_nil
+  end
+
+  it "has the correct inferred check answers value" do
+    expect(question.inferred_check_answers_value).to be_nil
+  end
+
+  it "has the correct check_answers_card_number" do
+    expect(question.check_answers_card_number).to be_nil
+  end
+
+  it "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers?).to eq(true)
+  end
+end

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

@@ -0,0 +1,49 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::County, 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("county")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("County (optional)")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to be_nil
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("text")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to be_nil
+  end
+
+  it "has the correct inferred check answers value" do
+    expect(question.inferred_check_answers_value).to be_nil
+  end
+
+  it "has the correct check_answers_card_number" do
+    expect(question.check_answers_card_number).to be_nil
+  end
+
+  it "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers?).to eq(true)
+  end
+end

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

@@ -0,0 +1,62 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::PostcodeForFullAddress, 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("postcode_full")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Postcode")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to be_nil
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("text")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to be_nil
+  end
+
+  it "has the correct width" do
+    expect(question.width).to eq(5)
+  end
+
+  it "has the correct inferred_answers" do
+    expect(question.inferred_answers).to eq({
+      "la" => {
+        "is_la_inferred" => true,
+      },
+    })
+  end
+
+  it "has the correct inferred_check_answers_value" do
+    expect(question.inferred_check_answers_value).to eq([{
+      "condition" => {
+        "pcodenk" => 1,
+      },
+      "value" => "Not known",
+    }])
+  end
+
+  it "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers?).to eq(true)
+  end
+end

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

@@ -0,0 +1,49 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::TownOrCity, 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("town_or_city")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Town or city")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to be_nil
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("text")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to be_nil
+  end
+
+  it "has the correct inferred check answers value" do
+    expect(question.inferred_check_answers_value).to be_nil
+  end
+
+  it "has the correct check_answers_card_number" do
+    expect(question.check_answers_card_number).to be_nil
+  end
+
+  it "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers?).to eq(true)
+  end
+end

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

@@ -0,0 +1,68 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::UprnConfirmation, 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("uprn_confirmed")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Is this the property address?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Is this the right address?")
+  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" do
+    expect(question.hint_text).to be_nil
+  end
+
+  it "has the correct unanswered_error_message" do
+    expect(question.unanswered_error_message).to eq("You must answer is this the right address?")
+  end
+
+  describe "notification_banner" do
+    context "when address is not present" do
+      it "returns nil" do
+        log = create(:sales_log)
+
+        expect(question.notification_banner(log)).to be_nil
+      end
+    end
+
+    context "when address is present" do
+      it "returns formatted value" do
+        log = create(:sales_log, address_line1: "1, Test Street", town_or_city: "Test Town", county: "Test County", postcode_full: "AA1 1AA", uprn: "1234")
+
+        expect(question.notification_banner(log)).to eq(
+          {
+            heading: "1, Test Street\nAA1 1AA\nTest Town\nTest County",
+            title: "UPRN: 1234",
+          },
+        )
+      end
+    end
+  end
+
+  xit "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers).to eq("UPRN must be 12 digits or less")
+  end
+end

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

@@ -0,0 +1,59 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::UprnKnown, 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("uprn_known")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Do you know the sale UPRN?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("UPRN known?")
+  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({
+      "0" => { "value" => "No" },
+      "1" => { "value" => "Yes" },
+    })
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to be_nil
+  end
+
+  it "has the correct unanswered_error_message" do
+    expect(question.unanswered_error_message).to eq("You must answer UPRN known?")
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to eq(
+      "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and sectors UK-wide. For example 10010457355.<br><br>
+    You can continue without the UPRN, but it means we will need you to enter the address of the property.",
+    )
+  end
+
+  it "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers).to be_nil
+  end
+end

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

@@ -0,0 +1,65 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Uprn, 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("uprn")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("What is the property's UPRN")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("UPRN")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("text")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to eq("The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and sectors UK-wide. For example 10010457355.")
+  end
+
+  it "has the correct unanswered_error_message" do
+    expect(question.unanswered_error_message).to eq("UPRN must be 12 digits or less")
+  end
+
+  describe "get_extra_check_answer_value" do
+    context "when address is not present" do
+      it "returns nil" do
+        log = create(:sales_log)
+
+        expect(question.get_extra_check_answer_value(log)).to be_nil
+      end
+    end
+
+    context "when address is present" do
+      it "returns formatted value" do
+        log = create(:sales_log, address_line1: "1, Test Street", town_or_city: "Test Town", county: "Test County", postcode_full: "AA1 1AA")
+
+        expect(question.get_extra_check_answer_value(log)).to eq(
+          "\n\n1, Test Street\nTest Town\nTest County\nAA1 1AA",
+        )
+      end
+    end
+  end
+
+  xit "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers).to eq("UPRN must be 12 digits or less")
+  end
+end

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

@@ -11,8 +11,14 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do
     expect(property_information.section).to eq(section)
   end
 
+  describe "pages" do
+    let(:section) { instance_double(Form::Sales::Sections::Household, form: instance_double(Form, start_date:)) }
+
+    context "when 2022" do
+      let(:start_date) { Time.utc(2022, 2, 8) }
+
       it "has correct pages" do
-    expect(property_information.pages.map(&:id)).to eq(
+        expect(property_information.pages.compact.map(&:id)).to eq(
           %w[
             property_number_of_bedrooms
             about_price_bedrooms_value_check
@@ -26,6 +32,31 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do
           ],
         )
       end
+    end
+
+    context "when 2023" do
+      let(:start_date) { Time.utc(2023, 2, 8) }
+
+      it "has correct pages" do
+        expect(property_information.pages.map(&:id)).to eq(
+          %w[
+            uprn_known
+            uprn
+            uprn_confirmation
+            address
+            property_local_authority
+            property_number_of_bedrooms
+            about_price_bedrooms_value_check
+            property_unit_type
+            monthly_charges_property_type_value_check
+            property_building_type
+            about_price_la_value_check
+            property_wheelchair_accessible
+          ],
+        )
+      end
+    end
+  end
 
   it "has the correct id" do
     expect(property_information.id).to eq("property_information")

spec/models/sales_log_spec.rb

@@ -1,6 +1,7 @@
 require "rails_helper"
 require "shared/shared_examples_for_derived_fields"
 
+# rubocop:disable RSpec/AnyInstance
 RSpec.describe SalesLog, type: :model do
   let(:owning_organisation) { create(:organisation) }
   let(:created_by_user) { create(:user) }
@@ -507,4 +508,52 @@ RSpec.describe SalesLog, type: :model do
       expect(completed_sales_log.field_formatted_as_currency("savings")).to eq("£400,000,000.00")
     end
   end
+
+  describe "#process_uprn_change!" do
+    context "when UPRN set to a value" do
+      let(:sales_log) { create(:sales_log, uprn: "123456789", uprn_confirmed: 1) }
+
+      it "updates sales log fields" do
+        sales_log.uprn = "1111111"
+
+        allow_any_instance_of(UprnClient).to receive(:call)
+        allow_any_instance_of(UprnClient).to receive(:result).and_return({
+          "UPRN" => "UPRN",
+          "UDPRN" => "UDPRN",
+          "ADDRESS" => "full address",
+          "SUB_BUILDING_NAME" => "0",
+          "BUILDING_NAME" => "building name",
+          "THOROUGHFARE_NAME" => "thoroughfare",
+          "POST_TOWN" => "posttown",
+          "POSTCODE" => "postcode",
+        })
+
+        expect { sales_log.process_uprn_change! }.to change(sales_log, :address_line1).from(nil).to("0, Building Name, Thoroughfare")
+        .and change(sales_log, :town_or_city).from(nil).to("Posttown")
+        .and change(sales_log, :postcode_full).from(nil).to("POSTCODE")
+        .and change(sales_log, :uprn_confirmed).from(1).to(nil)
+      end
+    end
+
+    context "when UPRN nil" do
+      let(:sales_log) { create(:sales_log, uprn: nil) }
+
+      it "does not update sales log" do
+        expect { sales_log.process_uprn_change! }.not_to change(sales_log, :attributes)
+      end
+    end
+
+    context "when service errors" do
+      let(:sales_log) { create(:sales_log, uprn: "123456789", uprn_confirmed: 1) }
+      let(:error_message) { "error" }
+
+      it "adds error to sales log" do
+        allow_any_instance_of(UprnClient).to receive(:call)
+        allow_any_instance_of(UprnClient).to receive(:error).and_return(error_message)
+
+        expect { sales_log.process_uprn_change! }.to change { sales_log.errors[:uprn] }.from([]).to([error_message])
+      end
+    end
+  end
 end
+# rubocop:enable RSpec/AnyInstance

spec/services/csv/lettings_log_csv_service_spec.rb

@@ -201,6 +201,13 @@ RSpec.describe Csv::LettingsLogCsvService do
                                    vacdays
                                    unresolved
                                    updated_by_id
+                                   uprn
+                                   uprn_known
+                                   uprn_confirmed
+                                   address_line1
+                                   address_line2
+                                   town_or_city
+                                   county
                                    unittype_sh
                                    scheme_code
                                    scheme_service_name
@@ -222,7 +229,9 @@ RSpec.describe Csv::LettingsLogCsvService do
                                    location_mobility_type
                                    location_admin_district
                                    location_startdate]
+
       csv = CSV.parse(described_class.new(user, export_type: "labels").to_csv)
+
       expect(csv.first).to eq(expected_csv_attributes)
     end
   end