Fix some check errors flows

app/controllers/form_controller.rb

@@ -105,8 +105,13 @@ private
   def restore_error_field_values(previous_responses)
     return unless previous_responses
 
-    previous_responses_to_reset = previous_responses.reject do |key, _|
-      @log.form.get_question(key, @log)&.type == "date"
+    previous_responses_to_reset = previous_responses.reject do |key, value|
+      if @log.form.get_question(key, @log)&.type == "date" && @log[key]
+        year = value.split("-").first.to_i
+        year&.zero?
+      else
+        false
+      end
     end
 
     @log.assign_attributes(previous_responses_to_reset)
@@ -433,7 +438,7 @@ private
       @log.valid?
       @log.reload
       error_attributes = @log.errors.map(&:attribute)
-      @questions = @log.form.questions.select { |q| error_attributes.include?(q.id.to_sym) }
+      @questions = @log.form.questions.select { |q| error_attributes.include?(q.id.to_sym) && q.page.routed_to?(@log, current_user) }
     end
     render "form/check_errors"
   end

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

@@ -20,11 +20,13 @@ class Form::Sales::Pages::OwningOrganisation < ::Form::Page
     if current_user.organisation.holds_own_stock?
       return true if current_user.organisation.absorbed_organisations.any?(&:holds_own_stock?)
       return true if stock_owners.count >= 1
+      return false if log.owning_organisation == current_user.organisation
 
       log.update!(owning_organisation: current_user.organisation)
     else
       return false if stock_owners.count.zero?
       return true if stock_owners.count > 1
+      return false if log.owning_organisation == stock_owners.first
 
       log.update!(owning_organisation: stock_owners.first)
     end

app/models/validations/property_validations.rb

@@ -41,6 +41,8 @@ module Validations::PropertyValidations
 
   def validate_property_postcode(record)
     postcode = record.postcode_full
+    return unless postcode
+
     if record.postcode_known? && (postcode.blank? || !postcode.match(POSTCODE_REGEXP))
       error_message = I18n.t("validations.lettings.property.postcode_full.invalid")
       record.errors.add :postcode_full, :wrong_format, message: error_message

app/models/validations/sales/property_validations.rb

@@ -31,6 +31,8 @@ module Validations::Sales::PropertyValidations
 
   def validate_property_postcode(record)
     postcode = record.postcode_full
+    return unless postcode
+
     if record.postcode_known? && (postcode.blank? || !postcode.match(POSTCODE_REGEXP))
       error_message = I18n.t("validations.sales.property_information.postcode_full.invalid")
       record.errors.add :postcode_full, :wrong_format, message: error_message

spec/features/form/page_routing_spec.rb

@@ -92,7 +92,7 @@ RSpec.describe "Form Page Routing" do
         expect(find("#lettings-log-postcode-full-field-error").value).to eq("FAKE_POSTCODE")
       end
 
-      it "does not reset the displayed date" do
+      it "does not reset the displayed date if it's an invalid date" do
         lettings_log.update!(startdate: "2021/10/13")
         visit("/lettings-logs/#{id}/tenancy-start-date")
         fill_in("lettings_log[startdate(1i)]", with: "202")
@@ -106,6 +106,20 @@ RSpec.describe "Form Page Routing" do
         expect(find_field("lettings_log[startdate(1i)]").value).to eq("2021")
       end
 
+      it "displays the entered date if it's in a valid format" do
+        lettings_log.update!(startdate: "2021/10/13")
+        visit("/lettings-logs/#{id}/tenancy-start-date")
+        fill_in("lettings_log[startdate(1i)]", with: "202")
+        fill_in("lettings_log[startdate(2i)]", with: "12")
+        fill_in("lettings_log[startdate(3i)]", with: "1")
+        click_button("Save and continue")
+
+        expect(page).to have_current_path("/lettings-logs/#{id}/tenancy-start-date")
+        expect(find_field("lettings_log[startdate(3i)]").value).to eq("1")
+        expect(find_field("lettings_log[startdate(2i)]").value).to eq("12")
+        expect(find_field("lettings_log[startdate(1i)]").value).to eq("202")
+      end
+
       it "does not reset the displayed date if it's empty" do
         lettings_log.update!(startdate: nil)
         visit("/lettings-logs/#{id}/tenancy-start-date")

spec/requests/check_errors_controller_spec.rb

@@ -84,7 +84,7 @@ RSpec.describe CheckErrorsController, type: :request do
         end
 
         it "displays correct clear and change links" do
-          expect(page.all(:button, value: "Clear").count).to eq(2)
+          expect(page.all(:button, value: "Clear").count).to eq(1)
           expect(page).to have_link("Change", count: 1)
           expect(page).to have_button("Clear all")
         end