From 430a93886d200fe1b44b266f624730e8f1ec4926 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 20 Nov 2024 09:26:37 +0000
Subject: [PATCH] Remove redundant validation and method

---
 app/models/sales_log.rb                                |  4 ----
 .../validations/sales/sale_information_validations.rb  |  5 -----
 .../locales/validations/sales/sale_information.en.yml  |  2 --
 .../sales/sale_information_validations_spec.rb         | 10 ----------
 4 files changed, 21 deletions(-)

diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index 51e75fa73..361aab6f6 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -561,8 +561,4 @@ class SalesLog < Log
   def is_firststair?
     firststair == 1
   end
-
-  def is_not_firststair?
-    firststair != 1
-  end
 end
diff --git a/app/models/validations/sales/sale_information_validations.rb b/app/models/validations/sales/sale_information_validations.rb
index a18af43fa..1ce9bf0ca 100644
--- a/app/models/validations/sales/sale_information_validations.rb
+++ b/app/models/validations/sales/sale_information_validations.rb
@@ -363,11 +363,6 @@ module Validations::Sales::SaleInformationValidations
       record.errors.add :numstair, I18n.t("validations.sales.sale_information.numstair.must_be_greater_than_one")
       record.errors.add :firststair, I18n.t("validations.sales.sale_information.firststair.cannot_be_no")
     end
-
-    if record.firststair == 1 && record.numstair > 1
-      record.errors.add :numstair, I18n.t("validations.sales.sale_information.numstair.must_be_one")
-      record.errors.add :firststair, I18n.t("validations.sales.sale_information.firststair.cannot_be_yes")
-    end
   end
 
   def over_tolerance?(expected, actual, tolerance, strict: false)
diff --git a/config/locales/validations/sales/sale_information.en.yml b/config/locales/validations/sales/sale_information.en.yml
index 8d0755b10..55b9cfede 100644
--- a/config/locales/validations/sales/sale_information.en.yml
+++ b/config/locales/validations/sales/sale_information.en.yml
@@ -127,7 +127,5 @@ en:
           value_over_discounted_max: "The percentage discount multiplied by the purchase price is %{discount_value}. This figure should not be more than £102,400 for properties outside of London."
         numstair:
           must_be_greater_than_one: "The number of staircasing transactions must be greater than 1 when this is not the first staircasing transaction."
-          must_be_one: "The number of staircasing transactions must be 1 when this is the first staircasing transaction."
         firststair:
           cannot_be_no: "The answer to 'Is this the first staircasing transaction?' cannot be 'no' if the number of staircasing transactions is 1."
-          cannot_be_yes: "The answer to 'Is this the first staircasing transaction?' cannot be 'yes' if the number of staircasing transactions is greater than 1."
diff --git a/spec/models/validations/sales/sale_information_validations_spec.rb b/spec/models/validations/sales/sale_information_validations_spec.rb
index 29c32bdad..e7b1d53d5 100644
--- a/spec/models/validations/sales/sale_information_validations_spec.rb
+++ b/spec/models/validations/sales/sale_information_validations_spec.rb
@@ -1444,16 +1444,6 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
           expect(record.errors).to be_empty
         end
       end
-
-      context "and numstair is greater than 1" do
-        let(:numstair) { 2 }
-        let(:firststair) { 1 }
-
-        it "adds an error" do
-          expect(record.errors[:numstair]).to include(I18n.t("validations.sales.sale_information.numstair.must_be_one"))
-          expect(record.errors[:firststair]).to include(I18n.t("validations.sales.sale_information.firststair.cannot_be_yes"))
-        end
-      end
     end
   end
 end