Merge branch 'main' into CLDC-3740-Replace-you-didnt-answer-with-link

# Conflicts:
#	app/helpers/merge_requests_helper.rb

app/controllers/merge_requests_controller.rb

@@ -116,6 +116,7 @@ private
   def merge_request_params
     merge_params = params.fetch(:merge_request, {}).permit(
       :requesting_organisation_id,
+      :has_helpdesk_ticket,
       :helpdesk_ticket,
       :status,
       :absorbing_organisation_id,
@@ -124,6 +125,7 @@ private
     )
 
     merge_params[:requesting_organisation_id] = current_user.organisation.id
+    merge_params[:helpdesk_ticket] = nil if merge_params[:has_helpdesk_ticket] == "false"
 
     merge_params
   end
@@ -151,6 +153,14 @@ private
       if merge_request_params[:existing_absorbing_organisation].nil?
         @merge_request.errors.add(:existing_absorbing_organisation, :blank)
       end
+    when "helpdesk_ticket"
+      @merge_request.has_helpdesk_ticket = merge_request_params[:has_helpdesk_ticket]
+      @merge_request.helpdesk_ticket = merge_request_params[:helpdesk_ticket]
+      if merge_request_params[:has_helpdesk_ticket].blank?
+        @merge_request.errors.add(:has_helpdesk_ticket, :blank)
+      elsif merge_request_params[:has_helpdesk_ticket] == "true" && merge_request_params[:helpdesk_ticket].blank?
+        @merge_request.errors.add(:helpdesk_ticket, :blank)
+      end
     end
   end
 

app/helpers/merge_requests_helper.rb

@@ -25,7 +25,7 @@ module MergeRequestsHelper
   def request_details(merge_request)
     [
       { label: "Requester", value: display_value_or_placeholder(merge_request.requester&.name) },
-      { label: "Helpdesk ticket", value: merge_request.helpdesk_ticket.present? ? link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://mhclgdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer") : display_value_or_placeholder(nil, enter_value_link("helpdesk_ticket", merge_request)), action: merge_request_action(merge_request, "helpdesk_ticket") },
+      { label: "Helpdesk ticket", value: helpdesk_ticket_value(merge_request), action: merge_request_action(merge_request, "helpdesk_ticket") },
       { label: "Status", value: status_tag(merge_request.status) },
     ]
   end
@@ -297,4 +297,14 @@ module MergeRequestsHelper
   def begin_merge_disabled?(merge_request)
     merge_request.status != "ready_to_merge" || merge_request.merge_date.future?
   end
+
+  def helpdesk_ticket_value(merge_request)
+    if merge_request.helpdesk_ticket.present?
+      link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://mhclgdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer")
+    elsif merge_request.has_helpdesk_ticket == false
+      "Not reported by a helpdesk ticket"
+    else
+      display_value_or_placeholder(nil, enter_value_link("helpdesk_ticket", merge_request))
+    end
+  end
 end

app/helpers/tag_helper.rb

@@ -30,8 +30,7 @@ module TagHelper
   }.freeze
 
   COLOUR = {
-    not_started: "grey",
-    cannot_start_yet: "grey",
+    not_started: "light-blue",
     in_progress: "blue",
     completed: "green",
     active: "green",
@@ -58,6 +57,8 @@ module TagHelper
   }.freeze
 
   def status_tag(status, classes = [])
+    return nil if COLOUR[status.to_sym].nil?
+
     govuk_tag(
       classes:,
       colour: COLOUR[status.to_sym],
@@ -65,6 +66,10 @@ module TagHelper
     )
   end
 
+  def status_text(status)
+    TEXT[status.to_sym]
+  end
+
   def status_tag_from_resource(resource, classes = [])
     status = resource.status
     status = :active if resource.deactivates_in_a_long_time?

app/helpers/tasklist_helper.rb

@@ -41,12 +41,19 @@ module TasklistHelper
   def subsection_link(subsection, log, current_user)
     if subsection.status(log) != :cannot_start_yet
       next_page_path = next_page_or_check_answers(subsection, log, current_user).to_s
-      govuk_link_to(subsection.label, next_page_path.dasherize, aria: { describedby: subsection.id.dasherize })
+      govuk_link_to(subsection.label, next_page_path.dasherize, class: "govuk-task-list__link", aria: { describedby: subsection.id.dasherize })
     else
       subsection.label
     end
   end
 
+  def subsection_href(subsection, log, current_user)
+    if subsection.status(log) != :cannot_start_yet
+      next_page_path = next_page_or_check_answers(subsection, log, current_user).to_s
+      next_page_path.dasherize
+    end
+  end
+
   def review_log_text(log)
     if log.collection_period_open?
       path = log.sales? ? review_sales_log_path(id: log, sales_log: true) : review_lettings_log_path(log)
@@ -59,6 +66,10 @@ module TasklistHelper
     end
   end
 
+  def tasklist_link_class(status)
+    status == :cannot_start_yet ? "" : "govuk-task-list__item--with-link"
+  end
+
 private
 
   def breadcrumb_organisation(log)

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

@@ -1,12 +1,12 @@
-class Form::Sales::Pages::Buyer1IncomeMaxValueCheck < ::Form::Page
+class Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck < ::Form::Page
   def initialize(id, hsh, subsection, check_answers_card_number:)
     super(id, hsh, subsection)
     @depends_on = [
       {
-        "income1_over_soft_max?" => true,
+        "income1_over_soft_max_for_discounted_ownership?" => true,
       },
     ]
-    @copy_key = "sales.soft_validations.income1_value_check.max"
+    @copy_key = "sales.soft_validations.income1_value_check.discounted"
     @title_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [

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

@@ -1,12 +1,12 @@
-class Form::Sales::Pages::Buyer1IncomeMinValueCheck < ::Form::Page
+class Form::Sales::Pages::Buyer1IncomeEcstatValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @depends_on = [
       {
-        "income1_under_soft_min?" => true,
+        "income1_outside_soft_range_for_ecstat?" => true,
       },
     ]
-    @copy_key = "sales.soft_validations.income1_value_check.min"
+    @copy_key = "sales.soft_validations.income1_value_check.ecstat"
     @title_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [
@@ -15,16 +15,16 @@ class Form::Sales::Pages::Buyer1IncomeMinValueCheck < ::Form::Page
           "arguments_for_key" => "income1",
           "i18n_template" => "income",
         },
-        {
-          "key" => "income_soft_min_for_ecstat",
-          "arguments_for_key" => "ecstat1",
-          "i18n_template" => "minimum",
-        },
       ],
     }
     @informative_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.informative_text",
-      "arguments" => [],
+      "arguments" => [
+        {
+          "key" => "income1_more_or_less_text",
+          "i18n_template" => "more_or_less",
+        },
+      ],
     }
   end
 

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

@@ -1,12 +1,12 @@
-class Form::Sales::Pages::Buyer2IncomeMaxValueCheck < ::Form::Page
+class Form::Sales::Pages::Buyer2IncomeDiscountedMaxValueCheck < ::Form::Page
   def initialize(id, hsh, subsection, check_answers_card_number:)
     super(id, hsh, subsection)
     @depends_on = [
       {
-        "income2_over_soft_max?" => true,
+        "income2_over_soft_max_for_discounted_ownership?" => true,
       },
     ]
-    @copy_key = "sales.soft_validations.income2_value_check.max"
+    @copy_key = "sales.soft_validations.income2_value_check.discounted"
     @title_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [

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

@@ -1,12 +1,12 @@
-class Form::Sales::Pages::Buyer2IncomeMinValueCheck < ::Form::Page
+class Form::Sales::Pages::Buyer2IncomeEcstatValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @depends_on = [
       {
-        "income2_under_soft_min?" => true,
+        "income2_outside_soft_range_for_ecstat?" => true,
       },
     ]
-    @copy_key = "sales.soft_validations.income2_value_check.min"
+    @copy_key = "sales.soft_validations.income2_value_check.ecstat"
     @title_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [
@@ -15,16 +15,16 @@ class Form::Sales::Pages::Buyer2IncomeMinValueCheck < ::Form::Page
           "arguments_for_key" => "income2",
           "i18n_template" => "income",
         },
-        {
-          "key" => "income_soft_min_for_ecstat",
-          "arguments_for_key" => "ecstat2",
-          "i18n_template" => "minimum",
-        },
       ],
     }
     @informative_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.informative_text",
-      "arguments" => [],
+      "arguments" => [
+        {
+          "key" => "income2_more_or_less_text",
+          "i18n_template" => "more_or_less",
+        },
+      ],
     }
   end
 

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

@@ -3,7 +3,7 @@ class Form::Sales::Pages::CombinedIncomeMaxValueCheck < ::Form::Page
     super(id, hsh, subsection)
     @depends_on = [
       {
-        "combined_income_over_soft_max?" => true,
+        "combined_income_over_soft_max_for_discounted_ownership?" => true,
       },
     ]
     @copy_key = "sales.soft_validations.combined_income_value_check"

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

@@ -35,7 +35,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Buyer1WorkingSituation.new(nil, nil, self),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_1_retirement_value_check", nil, self, person_index: 1),
       (Form::Sales::Pages::NotRetiredValueCheck.new("working_situation_1_not_retired_value_check", nil, self, person_index: 1) if form.start_year_2024_or_later?),
-      Form::Sales::Pages::Buyer1IncomeMinValueCheck.new("working_situation_buyer_1_income_min_value_check", nil, self),
+      Form::Sales::Pages::Buyer1IncomeEcstatValueCheck.new("working_situation_buyer_1_income_value_check", nil, self),
       Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::BuyerLiveInValueCheck.new("buyer_1_live_in_property_value_check", nil, self, person_index: 1),
       (form.start_year_2025_or_later? ? Form::Sales::Pages::Buyer2RelationshipToBuyer1YesNo.new(nil, nil, self) : Form::Sales::Pages::Buyer2RelationshipToBuyer1.new(nil, nil, self)),
@@ -51,7 +51,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_2_retirement_value_check_joint_purchase", nil, self, person_index: 2),
       (Form::Sales::Pages::NotRetiredValueCheck.new("working_situation_2_not_retired_value_check_joint_purchase", nil, self, person_index: 2) if form.start_year_2024_or_later?),
-      Form::Sales::Pages::Buyer2IncomeMinValueCheck.new("working_situation_buyer_2_income_min_value_check", nil, self),
+      Form::Sales::Pages::Buyer2IncomeEcstatValueCheck.new("working_situation_buyer_2_income_value_check", nil, self),
       Form::Sales::Pages::PersonStudentNotChildValueCheck.new("buyer_2_working_situation_student_not_child_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::BuyerLiveInValueCheck.new("buyer_2_live_in_property_value_check", nil, self, person_index: 2),

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

@@ -16,16 +16,16 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection
   def pages
     @pages ||= [
       Form::Sales::Pages::Buyer1Income.new(nil, nil, self),
-      Form::Sales::Pages::Buyer1IncomeMinValueCheck.new("buyer_1_income_min_value_check", nil, self),
-      Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("buyer_1_income_max_value_check", nil, self, check_answers_card_number: 1),
+      Form::Sales::Pages::Buyer1IncomeEcstatValueCheck.new("buyer_1_income_ecstat_value_check", nil, self),
+      Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck.new("buyer_1_income_discounted_max_value_check", nil, self, check_answers_card_number: 1),
       Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("buyer_1_combined_income_max_value_check", nil, self, check_answers_card_number: 1),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_1_income_mortgage_value_check", nil, self, 1),
       Form::Sales::Pages::Buyer1Mortgage.new(nil, nil, self),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_1_mortgage_value_check", nil, self, 1),
       Form::Sales::Pages::Buyer2Income.new(nil, nil, self),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_2_income_mortgage_value_check", nil, self, 2),
-      Form::Sales::Pages::Buyer2IncomeMinValueCheck.new("buyer_2_income_min_value_check", nil, self),
-      Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("buyer_2_income_max_value_check", nil, self, check_answers_card_number: 2),
+      Form::Sales::Pages::Buyer2IncomeEcstatValueCheck.new("buyer_2_income_ecstat_value_check", nil, self),
+      Form::Sales::Pages::Buyer2IncomeDiscountedMaxValueCheck.new("buyer_2_income_discounted_max_value_check", nil, self, check_answers_card_number: 2),
       Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("buyer_2_combined_income_max_value_check", nil, self, check_answers_card_number: 2),
       Form::Sales::Pages::Buyer2Mortgage.new(nil, nil, self),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_2_mortgage_value_check", nil, self, 2),

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

@@ -31,8 +31,8 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
         Form::Sales::Pages::UprnSelection.new(nil, nil, self),
         Form::Sales::Pages::AddressFallback.new(nil, nil, self),
         Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
-        Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
-        Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
+        Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
+        Form::Sales::Pages::Buyer2IncomeDiscountedMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
         Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil),
         Form::Sales::Pages::AboutPriceValueCheck.new("about_price_la_value_check", nil, self),
       ]
@@ -42,8 +42,8 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
         Form::Sales::Pages::UprnConfirmation.new(nil, nil, self),
         Form::Sales::Pages::Address.new(nil, nil, self),
         Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
-        Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
-        Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
+        Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
+        Form::Sales::Pages::Buyer2IncomeDiscountedMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
         Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil),
         Form::Sales::Pages::AboutPriceValueCheck.new("about_price_la_value_check", nil, self),
       ]

app/models/location.rb

@@ -144,6 +144,29 @@ class Location < ApplicationRecord
     scope.pluck("ARRAY_AGG(id)")
   }
 
+  scope :duplicate_active_sets, lambda {
+    scope = active
+    .group(*DUPLICATE_LOCATION_ATTRIBUTES)
+    .where.not(scheme_id: nil)
+    .where.not(postcode: nil)
+    .where.not(mobility_type: nil)
+    .having(
+      "COUNT(*) > 1",
+    )
+    scope.pluck("ARRAY_AGG(id)")
+  }
+
+  scope :duplicate_active_sets_within_given_schemes, lambda {
+    scope = active
+    .group(*DUPLICATE_LOCATION_ATTRIBUTES - %w[scheme_id])
+    .where.not(postcode: nil)
+    .where.not(mobility_type: nil)
+    .having(
+      "COUNT(*) > 1",
+    )
+    scope.pluck("ARRAY_AGG(id)")
+  }
+
   DUPLICATE_LOCATION_ATTRIBUTES = %w[scheme_id postcode mobility_type].freeze
   LOCAL_AUTHORITIES = LocalAuthority.all.map { |la| [la.name, la.code] }.to_h
 

app/models/scheme.rb

@@ -119,6 +119,22 @@ class Scheme < ApplicationRecord
     scope.pluck("ARRAY_AGG(id)")
   }
 
+  scope :duplicate_active_sets, lambda {
+    scope = active
+    .group(*DUPLICATE_SCHEME_ATTRIBUTES)
+    .where.not(scheme_type: nil)
+    .where.not(registered_under_care_act: nil)
+    .where.not(primary_client_group: nil)
+    .where.not(has_other_client_group: nil)
+    .where.not(secondary_client_group: nil).or(where(has_other_client_group: 0))
+    .where.not(support_type: nil)
+    .where.not(intended_stay: nil)
+    .having(
+      "COUNT(*) > 1",
+    )
+    scope.pluck("ARRAY_AGG(id)")
+  }
+
   validate :validate_confirmed
   validate :validate_owning_organisation
 

app/models/validations/sales/soft_validations.rb

@@ -2,41 +2,59 @@ module Validations::Sales::SoftValidations
   include Validations::Sales::SaleInformationValidations
 
   ALLOWED_INCOME_RANGES_SALES = {
-    1 => OpenStruct.new(soft_min: 5000),
-    2 => OpenStruct.new(soft_min: 1500),
-    3 => OpenStruct.new(soft_min: 1000),
-    5 => OpenStruct.new(soft_min: 2000),
-    0 => OpenStruct.new(soft_min: 2000),
+    2024 => {
+      1 => OpenStruct.new(soft_min: 5000),
+      2 => OpenStruct.new(soft_min: 1500),
+      3 => OpenStruct.new(soft_min: 1000),
+      5 => OpenStruct.new(soft_min: 2000),
+      0 => OpenStruct.new(soft_min: 2000),
+    },
+    2025 => {
+      1 => OpenStruct.new(soft_min: 13_400, soft_max: 150_000),
+      2 => OpenStruct.new(soft_min: 2_600, soft_max: 80_000),
+      3 => OpenStruct.new(soft_min: 2_080, soft_max: 30_000),
+      4 => OpenStruct.new(soft_min: 520, soft_max: 23_400),
+      5 => OpenStruct.new(soft_min: 520, soft_max: 80_000),
+      6 => OpenStruct.new(soft_min: 520, soft_max: 50_000),
+      7 => OpenStruct.new(soft_min: 520, soft_max: 30_000),
+      8 => OpenStruct.new(soft_min: 520, soft_max: 150_000),
+      9 => OpenStruct.new(soft_min: 520, soft_max: 150_000),
+      0 => OpenStruct.new(soft_min: 520, soft_max: 150_000),
+    },
   }.freeze
 
-  def income1_under_soft_min?
-    return false unless ecstat1 && income1 && ALLOWED_INCOME_RANGES_SALES[ecstat1]
+  def income1_outside_soft_range_for_ecstat?
+    income1_under_soft_min? || income1_over_soft_max_for_ecstat?
+  end
 
-    income1 < ALLOWED_INCOME_RANGES_SALES[ecstat1][:soft_min]
+  def income1_more_or_less_text
+    income1_under_soft_min? ? "less" : "more"
   end
 
-  def income2_under_soft_min?
-    return false unless ecstat2 && income2 && ALLOWED_INCOME_RANGES_SALES[ecstat2]
+  def income2_outside_soft_range_for_ecstat?
+    income2_under_soft_min? || income2_over_soft_max_for_ecstat?
+  end
 
-    income2 < ALLOWED_INCOME_RANGES_SALES[ecstat2][:soft_min]
+  def income2_more_or_less_text
+    income2_under_soft_min? ? "less" : "more"
   end
 
-  def income1_over_soft_max?
+  def income1_over_soft_max_for_discounted_ownership?
     return unless income1 && la && discounted_ownership_sale?
 
-    income_over_soft_max?(income1)
+    income_over_discounted_sale_soft_max?(income1)
   end
 
-  def income2_over_soft_max?
+  def income2_over_soft_max_for_discounted_ownership?
     return unless income2 && la && discounted_ownership_sale?
 
-    income_over_soft_max?(income2)
+    income_over_discounted_sale_soft_max?(income2)
   end
 
-  def combined_income_over_soft_max?
+  def combined_income_over_soft_max_for_discounted_ownership?
     return unless income1 && income2 && la && discounted_ownership_sale?
 
-    income_over_soft_max?(income1 + income2)
+    income_over_discounted_sale_soft_max?(income1 + income2)
   end
 
   def staircase_bought_above_fifty?
@@ -192,7 +210,40 @@ private
     )
   end
 
-  def income_over_soft_max?(income)
+  def income1_under_soft_min?
+    income_under_soft_min?(income1, ecstat1)
+  end
+
+  def income2_under_soft_min?
+    income_under_soft_min?(income2, ecstat2)
+  end
+
+  def income_under_soft_min?(income, ecstat)
+    return unless income && ecstat
+
+    income_ranges = form.start_year_2025_or_later? ? ALLOWED_INCOME_RANGES_SALES[2025] : ALLOWED_INCOME_RANGES_SALES[2024]
+    return false unless income_ranges[ecstat]
+
+    income < income_ranges[ecstat][:soft_min]
+  end
+
+  def income1_over_soft_max_for_ecstat?
+    income_over_soft_max?(income1, ecstat1)
+  end
+
+  def income2_over_soft_max_for_ecstat?
+    income_over_soft_max?(income2, ecstat2)
+  end
+
+  def income_over_soft_max?(income, ecstat)
+    return unless income && ecstat && form.start_year_2025_or_later?
+
+    return false unless ALLOWED_INCOME_RANGES_SALES[2025][ecstat]
+
+    income > ALLOWED_INCOME_RANGES_SALES[2025][ecstat][:soft_max]
+  end
+
+  def income_over_discounted_sale_soft_max?(income)
     (london_property? && income > 90_000) || (property_not_in_london? && income > 80_000)
   end
 end

app/views/logs/_tasklist.html.erb

@@ -8,19 +8,21 @@
       <% if section.description %>
         <p class="govuk-body"><%= section.description.html_safe %></p>
       <% end %>
-      <ul class="app-task-list__items">
-        <% section.subsections.each do |subsection| %>
-          <% if subsection.displayed_in_tasklist?(@log) && (subsection.applicable_questions(@log).count > 0 || !subsection.enabled?(@log)) %>
-            <% subsection_status = subsection.status(@log) %>
-            <li class="app-task-list__item">
-              <span class="app-task-list__task-name" id="<%= subsection.id.dasherize %>">
-                <%= subsection_link(subsection, @log, current_user) %>
-              </span>
-              <%= status_tag(subsection_status, "app-task-list__tag") %>
-            </li>
-          <% end %>
-        <% end %>
-      </ul>
+      <%= govuk_task_list(id_prefix: "logs", classes: "app-task-list__items") do |task_list|
+            section.subsections.each do |subsection|
+              next unless subsection.displayed_in_tasklist?(@log) && (subsection.applicable_questions(@log).count.positive? || !subsection.enabled?(@log))
+
+              subsection_status = subsection.status(@log)
+              task_list.with_item(classes: "#{tasklist_link_class(subsection_status)} app-task-list__item") do |item|
+                item.with_title(text: subsection.label, href: subsection_href(subsection, @log, current_user), classes: "app-task-list__name-and-hint--my-modifier")
+                if status_tag(subsection_status, "app-task-list__tag").present?
+                  item.with_status(text: status_tag(subsection_status), classes: "app-task-list__tag")
+                else
+                  item.with_status(text: status_text(subsection_status), classes: "app-task-list__tag")
+                end
+              end
+            end
+          end %>
     </li>
   <% end %>
 </ol>

app/views/merge_requests/helpdesk_ticket.html.erb

@@ -7,14 +7,27 @@
 <%= form_with model: @merge_request, url: submit_merge_request_url(request.query_parameters["referrer"]), method: :patch do |f| %>
   <%= f.govuk_error_summary %>
 
-  <h1 class="govuk-heading-l">Which helpdesk ticket reported this merge?</h1>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds-from-desktop">
-      <p class="govuk-hint">If this merge was reported via a helpdesk ticket, provide the ticket number.<br>The ticket will be linked to the merge request for reference.</p>
-      <br>
       <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds-from-desktop">
-          <%= f.govuk_text_field :helpdesk_ticket, caption: { text: "Ticket number", class: "govuk-label govuk-label--s" }, label: { text: "For example, MSD-12345", class: "app-!-colour-muted" } %>
+          <%= f.govuk_radio_buttons_fieldset :has_helpdesk_ticket,
+            legend: { text: "Was this merge reported by a helpdesk ticket?", size: "l" } do %>
+
+            <%= f.govuk_radio_button "has_helpdesk_ticket",
+              true,
+              label: { text: "Yes" },
+              **basic_conditional_html_attributes({ "helpdesk_ticket" => [true] }, "merge_request") do %>
+              <%= f.govuk_text_field :helpdesk_ticket,
+                caption: { text: "Ticket number", class: "govuk-label govuk-label--s" },
+                label: { text: "For example, MSD-12345", class: "app-!-colour-muted" } %>
+            <% end %>
+
+            <%= f.govuk_radio_button "has_helpdesk_ticket",
+              false,
+              label: { text: "No" } %>
+          <% end %>
+
           <%= f.hidden_field :page, value: "helpdesk_ticket" %>
           <div class="govuk-button-group">
             <%= f.govuk_submit submit_merge_request_button_text(request.query_parameters["referrer"]) %>

config/locales/en.yml

@@ -188,6 +188,10 @@ en:
               blank: "You must answer absorbing organisation already active?"
             merging_organisation_id:
               part_of_another_merge: "Another merge request records %{organisation} as merging into %{absorbing_organisation} on %{merge_date}. Select another organisation or remove this organisation from the other merge request."
+            has_helpdesk_ticket:
+              blank: "You must answer was this merge reported by a helpdesk ticket?"
+            helpdesk_ticket:
+              blank: "You must answer the ticket number"
         notification:
           attributes:
             title:

config/locales/forms/2023/sales/soft_validations.en.yml

@@ -37,11 +37,11 @@ en:
             check_answer_prompt: ""
             hint_text: ""
             question_text: "Are you sure this is correct?"
-            min:
+            ecstat:
               page_header: ""
               title_text: "You told us income was %{income}."
               informative_text: "This is less than we would expect for someone in this working situation."
-            max:
+            discounted:
               page_header: ""
               title_text: "You told us the income of buyer 1 is %{income}. This seems high. Are you sure this is correct?"
 
@@ -50,11 +50,11 @@ en:
             check_answer_prompt: ""
             hint_text: ""
             question_text: "Are you sure this is correct?"
-            min:
+            ecstat:
               page_header: ""
               title_text: "You told us income was %{income}."
               informative_text: "This is less than we would expect for someone in this working situation."
-            max:
+            discounted:
               page_header: ""
               title_text: "You told us the income of buyer 2 is %{income}. This seems high. Are you sure this is correct?"
 

config/locales/forms/2024/sales/soft_validations.en.yml

@@ -35,11 +35,11 @@ en:
             check_answer_prompt: ""
             hint_text: ""
             question_text: "Are you sure this is correct?"
-            min:
+            ecstat:
               page_header: ""
               title_text: "You told us income was %{income}."
-              informative_text: "This is less than we would expect for someone in this working situation."
-            max:
+              informative_text: "This is %{more_or_less} than we would expect for someone in this working situation."
+            discounted:
               page_header: ""
               title_text: "You told us the income of buyer 1 is %{income}. This seems high. Are you sure this is correct?"
 
@@ -48,11 +48,11 @@ en:
             check_answer_prompt: ""
             hint_text: ""
             question_text: "Are you sure this is correct?"
-            min:
+            ecstat:
               page_header: ""
               title_text: "You told us income was %{income}."
-              informative_text: "This is less than we would expect for someone in this working situation."
-            max:
+              informative_text: "This is %{more_or_less} than we would expect for someone in this working situation."
+            discounted:
               page_header: ""
               title_text: "You told us the income of buyer 2 is %{income}. This seems high. Are you sure this is correct?"
 

config/locales/forms/2025/sales/soft_validations.en.yml

@@ -35,26 +35,26 @@ en:
             check_answer_prompt: ""
             hint_text: ""
             question_text: "Are you sure this is correct?"
-            min:
+            ecstat:
               page_header: ""
-              title_text: "You told us income was %{income}."
-              informative_text: "This is less than we would expect for someone in this working situation."
-            max:
+              title_text: "You told us the income of buyer 1 is %{income}."
+              informative_text: "This is %{more_or_less} than we would expect for someone in this working situation."
+            discounted:
               page_header: ""
-              title_text: "You told us the income of buyer 1 is %{income}. This seems high. Are you sure this is correct?"
+              title_text: "You told us the income of buyer 1 is %{income}. This seems high for this sale type. Are you sure this is correct?"
 
           income2_value_check:
             check_answer_label: "Buyer 2 income confirmation"
             check_answer_prompt: ""
             hint_text: ""
             question_text: "Are you sure this is correct?"
-            min:
+            ecstat:
               page_header: ""
-              title_text: "You told us income was %{income}."
-              informative_text: "This is less than we would expect for someone in this working situation."
-            max:
+              title_text: "You told us the income of buyer 2 is %{income}."
+              informative_text: "This is %{more_or_less} than we would expect for someone in this working situation."
+            discounted:
               page_header: ""
-              title_text: "You told us the income of buyer 2 is %{income}. This seems high. Are you sure this is correct?"
+              title_text: "You told us the income of buyer 2 is %{income}. This seems high for this sale type. Are you sure this is correct?"
 
           combined_income_value_check:
             page_header: ""
@@ -62,7 +62,7 @@ en:
             check_answer_prompt: ""
             hint_text: ""
             question_text: "Are you sure this is correct?"
-            title_text: "You told us the combined income of this household is %{combined_income}. This seems high.  Are you sure this is correct?"
+            title_text: "You told us the combined income of this household is %{combined_income}. This seems high for this sale type.  Are you sure this is correct?"
 
           mortgage_value_check:
             page_header: ""

db/migrate/20241122154743_add_has_helpdest_ticket.rb

@@ -0,0 +1,5 @@
+class AddHasHelpdestTicket < ActiveRecord::Migration[7.0]
+  def change
+    add_column :merge_requests, :has_helpdesk_ticket, :boolean
+  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: 2024_11_18_104046) do
+ActiveRecord::Schema[7.0].define(version: 2024_11_22_154743) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -478,6 +478,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_11_18_104046) do
     t.boolean "request_merged"
     t.boolean "processing"
     t.boolean "existing_absorbing_organisation"
+    t.boolean "has_helpdesk_ticket"
   end
 
   create_table "notifications", force: :cascade do |t|

lib/tasks/count_duplicates.rake

@@ -60,4 +60,66 @@ namespace :count_duplicates do
     url = storage_service.get_presigned_url(filename, 72.hours.to_i)
     Rails.logger.info("Download URL: #{url}")
   end
+
+  desc "Count the number of duplicate active schemes per organisation"
+  task active_scheme_duplicates_per_org: :environment do
+    duplicates_csv = CSV.generate(headers: true) do |csv|
+      csv << ["Organisation id", "Number of duplicate sets", "Total duplicate schemes"]
+
+      Organisation.visible.each do |organisation|
+        if organisation.owned_schemes.duplicate_active_sets.count.positive?
+          csv << [organisation.id, organisation.owned_schemes.duplicate_active_sets.count, organisation.owned_schemes.duplicate_active_sets.sum(&:size)]
+        end
+      end
+    end
+
+    filename = "active-scheme-duplicates-#{Time.zone.now}.csv"
+    storage_service = Storage::S3Service.new(Configuration::EnvConfigurationService.new, ENV["BULK_UPLOAD_BUCKET"])
+    storage_service.write_file(filename, "#{duplicates_csv}")
+
+    url = storage_service.get_presigned_url(filename, 72.hours.to_i)
+    Rails.logger.info("Download URL: #{url}")
+  end
+
+  desc "Count the number of duplicate active locations per organisation"
+  task active_location_duplicates_per_org: :environment do
+    duplicates_csv = CSV.generate(headers: true) do |csv|
+      csv << ["Organisation id", "Duplicate sets within individual schemes", "Duplicate locations within individual schemes", "All duplicate sets", "All duplicates"]
+
+      Organisation.visible.each do |organisation|
+        duplicate_sets_within_individual_schemes = []
+
+        organisation.owned_schemes.each do |scheme|
+          duplicate_sets_within_individual_schemes += scheme.locations.duplicate_active_sets
+        end
+        duplicate_locations_within_individual_schemes = duplicate_sets_within_individual_schemes.flatten
+
+        duplicate_sets_within_duplicate_schemes = []
+        if organisation.owned_schemes.duplicate_active_sets.count.positive?
+          organisation.owned_schemes.duplicate_active_sets.each do |duplicate_set|
+            duplicate_sets_within_duplicate_schemes += Location.where(scheme_id: duplicate_set).duplicate_active_sets_within_given_schemes
+          end
+          duplicate_locations_within_duplicate_schemes_ids = duplicate_sets_within_duplicate_schemes.flatten
+
+          duplicate_sets_within_individual_schemes_without_intersecting_sets = duplicate_sets_within_individual_schemes.reject { |set| set.any? { |id| duplicate_sets_within_duplicate_schemes.any? { |duplicate_set| duplicate_set.include?(id) } } }
+          all_duplicate_sets_count = (duplicate_sets_within_individual_schemes_without_intersecting_sets + duplicate_sets_within_duplicate_schemes).count
+          all_duplicate_locations_count = (duplicate_locations_within_duplicate_schemes_ids + duplicate_locations_within_individual_schemes).uniq.count
+        else
+          all_duplicate_sets_count = duplicate_sets_within_individual_schemes.count
+          all_duplicate_locations_count = duplicate_locations_within_individual_schemes.count
+        end
+
+        if all_duplicate_locations_count.positive?
+          csv << [organisation.id, duplicate_sets_within_individual_schemes.count, duplicate_locations_within_individual_schemes.count, all_duplicate_sets_count, all_duplicate_locations_count]
+        end
+      end
+    end
+
+    filename = "active-location-duplicates-#{Time.zone.now}.csv"
+    storage_service = Storage::S3Service.new(Configuration::EnvConfigurationService.new, ENV["BULK_UPLOAD_BUCKET"])
+    storage_service.write_file(filename, "#{duplicates_csv}")
+
+    url = storage_service.get_presigned_url(filename, 72.hours.to_i)
+    Rails.logger.info("Download URL: #{url}")
+  end
 end

spec/factories/merge_request.rb

@@ -2,6 +2,7 @@ FactoryBot.define do
   factory :merge_request do
     status { "incomplete" }
     merge_date { nil }
+    has_helpdesk_ticket { true }
     helpdesk_ticket { "MSD-99999" }
     association :requesting_organisation, factory: :organisation
   end

spec/factories/scheme.rb

@@ -44,5 +44,10 @@ FactoryBot.define do
     trait :created_now do
       created_at { Time.zone.now }
     end
+    trait :with_location do
+      after(:create) do |scheme|
+        create(:location, scheme:)
+      end
+    end
   end
 end

spec/helpers/tag_helper_spec.rb

@@ -10,8 +10,8 @@ RSpec.describe TagHelper do
     end
 
     it "returns tag with correct status text and colour and custom class" do
-      expect(status_tag("not_started", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--grey app-tag--small\">Not started</strong>")
-      expect(status_tag("cannot_start_yet", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--grey app-tag--small\">Cannot start yet</strong>")
+      expect(status_tag("not_started", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--light-blue app-tag--small\">Not started</strong>")
+      expect(status_tag("cannot_start_yet", "app-tag--small")).to eq(nil)
       expect(status_tag("in_progress", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--blue app-tag--small\">In progress</strong>")
       expect(status_tag("completed", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--green app-tag--small\">Completed</strong>")
       expect(status_tag("active", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--green app-tag--small\">Active</strong>")

spec/lib/tasks/count_duplicates_spec.rb

@@ -108,4 +108,114 @@ RSpec.describe "count_duplicates" do
       end
     end
   end
+
+  describe "count_duplicates:active_scheme_duplicates_per_org", type: :task do
+    subject(:task) { Rake::Task["count_duplicates:active_scheme_duplicates_per_org"] }
+
+    let(:storage_service) { instance_double(Storage::S3Service) }
+    let(:test_url) { "test_url" }
+
+    before do
+      Rake.application.rake_require("tasks/count_duplicates")
+      Rake::Task.define_task(:environment)
+      task.reenable
+    end
+
+    context "when the rake task is run" do
+      context "and there are no duplicate schemes" do
+        before do
+          create(:organisation)
+        end
+
+        it "creates a csv with headers only" do
+          expect(storage_service).to receive(:write_file).with(/scheme-duplicates-.*\.csv/, "\uFEFFOrganisation id,Number of duplicate sets,Total duplicate schemes\n")
+          expect(Rails.logger).to receive(:info).with("Download URL: #{test_url}")
+          task.invoke
+        end
+      end
+
+      context "and there are duplicate schemes" do
+        let(:organisation) { create(:organisation) }
+        let(:organisation2) { create(:organisation) }
+
+        before do
+          create_list(:scheme, 2, :duplicate, :with_location, owning_organisation: organisation)
+          create_list(:scheme, 3, :duplicate, :with_location, primary_client_group: "I", owning_organisation: organisation)
+          create_list(:scheme, 5, :duplicate, :with_location, owning_organisation: organisation2)
+          deactivated_schemes = create_list(:scheme, 2, :duplicate, owning_organisation: organisation)
+          deactivated_schemes.each do |scheme|
+            create(:scheme_deactivation_period, deactivation_date: Time.zone.yesterday, reactivation_date: nil, scheme:)
+          end
+        end
+
+        it "creates a csv with correct duplicate numbers" do
+          expect(storage_service).to receive(:write_file).with(/scheme-duplicates-.*\.csv/, "\uFEFFOrganisation id,Number of duplicate sets,Total duplicate schemes\n#{organisation.id},2,5\n#{organisation2.id},1,5\n")
+          expect(Rails.logger).to receive(:info).with("Download URL: #{test_url}")
+          task.invoke
+        end
+      end
+    end
+  end
+
+  describe "count_duplicates:active_location_duplicates_per_org", type: :task do
+    subject(:task) { Rake::Task["count_duplicates:active_location_duplicates_per_org"] }
+
+    let(:storage_service) { instance_double(Storage::S3Service) }
+    let(:test_url) { "test_url" }
+
+    before do
+      Rake.application.rake_require("tasks/count_duplicates")
+      Rake::Task.define_task(:environment)
+      task.reenable
+    end
+
+    context "when the rake task is run" do
+      context "and there are no duplicate locations" do
+        before do
+          create(:organisation)
+        end
+
+        it "creates a csv with headers only" do
+          expect(storage_service).to receive(:write_file).with(/location-duplicates-.*\.csv/, "\uFEFFOrganisation id,Duplicate sets within individual schemes,Duplicate locations within individual schemes,All duplicate sets,All duplicates\n")
+          expect(Rails.logger).to receive(:info).with("Download URL: #{test_url}")
+          task.invoke
+        end
+      end
+
+      context "and there are duplicate locations" do
+        let(:organisation) { create(:organisation) }
+        let(:scheme_a) { create(:scheme, :duplicate, owning_organisation: organisation) }
+        let(:scheme_b) { create(:scheme, :duplicate, owning_organisation: organisation) }
+        let(:scheme_c) { create(:scheme, owning_organisation: organisation) }
+        let(:organisation2) { create(:organisation) }
+        let(:scheme2) { create(:scheme, owning_organisation: organisation2) }
+        let(:scheme3) { create(:scheme, owning_organisation: organisation2) }
+
+        before do
+          create_list(:location, 2, postcode: "A1 1AB", mobility_type: "M", scheme: scheme_a) # Location A
+          create_list(:location, 1, postcode: "A1 1AB", mobility_type: "A", scheme: scheme_a) # Location B
+
+          create_list(:location, 1, postcode: "A1 1AB", mobility_type: "M", scheme: scheme_b) # Location A
+          create_list(:location, 1, postcode: "A1 1AB", mobility_type: "A", scheme: scheme_b) # Location B
+          create_list(:location, 2, postcode: "A1 1AB", mobility_type: "N", scheme: scheme_b) # Location C
+
+          create_list(:location, 2, postcode: "A1 1AB", mobility_type: "A", scheme: scheme_c) # Location B
+
+          create_list(:location, 5, postcode: "A1 1AB", mobility_type: "M", scheme: scheme2)
+          create_list(:location, 2, postcode: "A1 1AB", mobility_type: "M", scheme: scheme3)
+
+          deactivated_locations = create_list(:location, 1, postcode: "A1 1AB", mobility_type: "M", scheme: scheme_b)
+          deactivated_locations.each do |location|
+            create(:location_deactivation_period, deactivation_date: Time.zone.yesterday, reactivation_date: nil, location:)
+          end
+        end
+
+        it "creates a csv with correct duplicate numbers" do
+          expect(storage_service).to receive(:write_file).with(/location-duplicates-.*\.csv/, "\uFEFFOrganisation id,Duplicate sets within individual schemes,Duplicate locations within individual schemes,All duplicate sets,All duplicates\n#{organisation.id},3,6,4,9\n#{organisation2.id},2,7,2,7\n")
+          expect(Rails.logger).to receive(:info).with("Download URL: #{test_url}")
+          task.invoke
+        end
+      end
+    end
+  end
 end

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

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Pages::Buyer1IncomeMaxValueCheck, type: :model do
+RSpec.describe Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck, type: :model do
   subject(:page) { described_class.new(page_id, page_definition, subsection, check_answers_card_number: 1) }
 
   let(:page_id) { "prefix_buyer_1_income_max_value_check" }
@@ -23,7 +23,7 @@ RSpec.describe Form::Sales::Pages::Buyer1IncomeMaxValueCheck, type: :model do
   it "has correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "income1_over_soft_max?" => true,
+        "income1_over_soft_max_for_discounted_ownership?" => true,
       },
     ])
   end

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

@@ -1,9 +1,9 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Pages::Buyer1IncomeMinValueCheck, type: :model do
+RSpec.describe Form::Sales::Pages::Buyer1IncomeEcstatValueCheck, type: :model do
   subject(:page) { described_class.new(page_id, page_definition, subsection) }
 
-  let(:page_id) { "prefix_buyer_1_income_min_value_check" }
+  let(:page_id) { "prefix_buyer_1_income_ecstat_value_check" }
   let(:page_definition) { nil }
   let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
   let(:subsection) { instance_double(Form::Subsection, form:) }
@@ -17,13 +17,13 @@ RSpec.describe Form::Sales::Pages::Buyer1IncomeMinValueCheck, type: :model do
   end
 
   it "has the correct id" do
-    expect(page.id).to eq("prefix_buyer_1_income_min_value_check")
+    expect(page.id).to eq("prefix_buyer_1_income_ecstat_value_check")
   end
 
   it "has correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "income1_under_soft_min?" => true,
+        "income1_outside_soft_range_for_ecstat?" => true,
       },
     ])
   end

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

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Pages::Buyer2IncomeMaxValueCheck, type: :model do
+RSpec.describe Form::Sales::Pages::Buyer2IncomeDiscountedMaxValueCheck, type: :model do
   subject(:page) { described_class.new(page_id, page_definition, subsection, check_answers_card_number: 2) }
 
   let(:page_id) { "prefix_buyer_2_income_max_value_check" }
@@ -23,7 +23,7 @@ RSpec.describe Form::Sales::Pages::Buyer2IncomeMaxValueCheck, type: :model do
   it "has correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "income2_over_soft_max?" => true,
+        "income2_over_soft_max_for_discounted_ownership?" => true,
       },
     ])
   end

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

@@ -1,9 +1,9 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Pages::Buyer2IncomeMinValueCheck, type: :model do
+RSpec.describe Form::Sales::Pages::Buyer2IncomeEcstatValueCheck, type: :model do
   subject(:page) { described_class.new(page_id, page_definition, subsection) }
 
-  let(:page_id) { "prefix_buyer_2_income_min_value_check" }
+  let(:page_id) { "prefix_buyer_2_income_ecstat_value_check" }
   let(:page_definition) { nil }
   let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
   let(:subsection) { instance_double(Form::Subsection, form:) }
@@ -17,13 +17,13 @@ RSpec.describe Form::Sales::Pages::Buyer2IncomeMinValueCheck, type: :model do
   end
 
   it "has the correct id" do
-    expect(page.id).to eq("prefix_buyer_2_income_min_value_check")
+    expect(page.id).to eq("prefix_buyer_2_income_ecstat_value_check")
   end
 
   it "has correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "income2_under_soft_min?" => true,
+        "income2_outside_soft_range_for_ecstat?" => true,
       },
     ])
   end

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

@@ -23,7 +23,7 @@ RSpec.describe Form::Sales::Pages::CombinedIncomeMaxValueCheck, type: :model do
   it "has correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "combined_income_over_soft_max?" => true,
+        "combined_income_over_soft_max_for_discounted_ownership?" => true,
       },
     ])
   end

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

@@ -16,116 +16,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
     expect(household_characteristics.section).to eq(section)
   end
 
-  it "has the correct id" do
-    expect(household_characteristics.id).to eq("household_characteristics")
-  end
-
-  it "has the correct label" do
-    expect(household_characteristics.label).to eq("Household characteristics")
-  end
-
-  context "with 2022/23 form" do
-    before do
-      allow(form).to receive(:start_date).and_return(Time.zone.local(2022, 4, 1))
-      allow(form).to receive(:start_year_2024_or_later?).and_return(false)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(false)
-    end
-
-    it "has correct pages" do
-      expect(household_characteristics.pages.map(&:id)).to eq(
-        %w[
-          buyer_interview_joint_purchase
-          buyer_interview
-          privacy_notice_joint_purchase
-          privacy_notice
-          buyer_1_age
-          age_1_retirement_value_check
-          age_1_old_persons_shared_ownership_joint_purchase_value_check
-          age_1_old_persons_shared_ownership_value_check
-          buyer_1_gender_identity
-          buyer_1_ethnic_group
-          buyer_1_ethnic_background_black
-          buyer_1_ethnic_background_asian
-          buyer_1_ethnic_background_arab
-          buyer_1_ethnic_background_mixed
-          buyer_1_ethnic_background_white
-          buyer_1_nationality
-          buyer_1_working_situation
-          working_situation_1_retirement_value_check
-          working_situation_buyer_1_income_min_value_check
-          buyer_1_live_in_property
-          buyer_1_live_in_property_value_check
-          buyer_2_relationship_to_buyer_1
-          buyer_2_relationship_student_not_child_value_check
-          buyer_2_age
-          age_2_old_persons_shared_ownership_joint_purchase_value_check
-          age_2_old_persons_shared_ownership_value_check
-          age_2_buyer_retirement_value_check
-          buyer_2_age_student_not_child_value_check
-          buyer_2_gender_identity
-          buyer_2_working_situation
-          working_situation_2_retirement_value_check_joint_purchase
-          working_situation_buyer_2_income_min_value_check
-          buyer_2_working_situation_student_not_child_value_check
-          buyer_2_live_in_property
-          buyer_2_live_in_property_value_check
-          number_of_others_in_property
-          number_of_others_in_property_joint_purchase
-          person_2_known
-          person_2_relationship_to_buyer_1
-          relationship_2_student_not_child_value_check
-          person_2_age
-          age_2_retirement_value_check
-          age_2_student_not_child_value_check
-          person_2_gender_identity
-          person_2_working_situation
-          working_situation_2_retirement_value_check
-          working_situation_2_student_not_child_value_check
-          person_3_known
-          person_3_relationship_to_buyer_1
-          relationship_3_student_not_child_value_check
-          person_3_age
-          age_3_retirement_value_check
-          age_3_student_not_child_value_check
-          person_3_gender_identity
-          person_3_working_situation
-          working_situation_3_retirement_value_check
-          working_situation_3_student_not_child_value_check
-          person_4_known
-          person_4_relationship_to_buyer_1
-          relationship_4_student_not_child_value_check
-          person_4_age
-          age_4_retirement_value_check
-          age_4_student_not_child_value_check
-          person_4_gender_identity
-          person_4_working_situation
-          working_situation_4_retirement_value_check
-          working_situation_4_student_not_child_value_check
-          person_5_known
-          person_5_relationship_to_buyer_1
-          relationship_5_student_not_child_value_check
-          person_5_age
-          age_5_retirement_value_check
-          age_5_student_not_child_value_check
-          person_5_gender_identity
-          person_5_working_situation
-          working_situation_5_retirement_value_check
-          working_situation_5_student_not_child_value_check
-          person_6_known
-          person_6_relationship_to_buyer_1
-          relationship_6_student_not_child_value_check
-          person_6_age
-          age_6_retirement_value_check
-          age_6_student_not_child_value_check
-          person_6_gender_identity
-          person_6_working_situation
-          working_situation_6_retirement_value_check
-          working_situation_6_student_not_child_value_check
-        ],
-      )
-    end
-  end
-
   context "with 2023/24 form" do
     before do
       allow(form).to receive(:start_date).and_return(Time.zone.local(2023, 4, 1))
@@ -154,7 +44,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           buyer_1_nationality
           buyer_1_working_situation
           working_situation_1_retirement_value_check
-          working_situation_buyer_1_income_min_value_check
+          working_situation_buyer_1_income_value_check
           buyer_1_live_in_property
           buyer_1_live_in_property_value_check
           buyer_2_relationship_to_buyer_1
@@ -174,7 +64,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           buyer_2_nationality
           buyer_2_working_situation
           working_situation_2_retirement_value_check_joint_purchase
-          working_situation_buyer_2_income_min_value_check
+          working_situation_buyer_2_income_value_check
           buyer_2_working_situation_student_not_child_value_check
           buyer_2_live_in_property
           buyer_2_live_in_property_value_check
@@ -281,7 +171,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           buyer_1_working_situation
           working_situation_1_retirement_value_check
           working_situation_1_not_retired_value_check
-          working_situation_buyer_1_income_min_value_check
+          working_situation_buyer_1_income_value_check
           buyer_1_live_in_property
           buyer_1_live_in_property_value_check
           buyer_2_relationship_to_buyer_1
@@ -303,7 +193,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           buyer_2_working_situation
           working_situation_2_retirement_value_check_joint_purchase
           working_situation_2_not_retired_value_check_joint_purchase
-          working_situation_buyer_2_income_min_value_check
+          working_situation_buyer_2_income_value_check
           buyer_2_working_situation_student_not_child_value_check
           buyer_2_live_in_property
           buyer_2_live_in_property_value_check
@@ -396,10 +286,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
       allow(form).to receive(:start_year_2025_or_later?).and_return(true)
     end
 
-    it "has correct depends on" do
-      expect(household_characteristics.depends_on).to eq([{ "setup_completed?" => true }])
-    end
-
     it "has correct pages" do
       expect(household_characteristics.pages.map(&:id)).to eq(
         %w[
@@ -419,7 +305,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           buyer_1_working_situation
           working_situation_1_retirement_value_check
           working_situation_1_not_retired_value_check
-          working_situation_buyer_1_income_min_value_check
+          working_situation_buyer_1_income_value_check
           buyer_1_live_in_property
           buyer_1_live_in_property_value_check
           buyer_2_relationship_to_buyer_1
@@ -441,7 +327,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
           buyer_2_working_situation
           working_situation_2_retirement_value_check_joint_purchase
           working_situation_2_not_retired_value_check_joint_purchase
-          working_situation_buyer_2_income_min_value_check
+          working_situation_buyer_2_income_value_check
           buyer_2_working_situation_student_not_child_value_check
           buyer_2_live_in_property
           buyer_2_live_in_property_value_check
@@ -525,5 +411,9 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
         ],
       )
     end
+
+    it "has correct depends on" do
+      expect(household_characteristics.depends_on).to eq([{ "setup_completed?" => true }])
+    end
   end
 end

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

@@ -5,7 +5,8 @@ RSpec.describe Form::Sales::Subsections::IncomeBenefitsAndSavings, type: :model
 
   let(:subsection_id) { nil }
   let(:subsection_definition) { nil }
-  let(:section) { instance_double(Form::Sales::Sections::Household) }
+  let(:section) { instance_double(Form::Sales::Sections::Household, form:) }
+  let(:form) { instance_double(Form, start_date: Time.utc(2024, 4, 1), start_year_2025_or_later?: false) }
 
   it "has correct section" do
     expect(subsection.section).to eq(section)
@@ -19,88 +20,80 @@ RSpec.describe Form::Sales::Subsections::IncomeBenefitsAndSavings, type: :model
     expect(subsection.label).to eq("Income, benefits and savings")
   end
 
-  describe "pages" do
-    let(:section) { instance_double(Form::Sales::Sections::Household, form: instance_double(Form, start_date:, start_year_2025_or_later?: false)) }
+  context "when before 2025" do
+    let(:form) { instance_double(Form, start_date: Time.utc(2024, 4, 1), start_year_2025_or_later?: false) }
 
-    context "when 2022" do
-      let(:start_date) { Time.utc(2022, 2, 8) }
-
-      it "has correct pages" do
-        expect(subsection.pages.compact.map(&:id)).to eq(
-          %w[
-            buyer_1_income
-            buyer_1_income_min_value_check
-            buyer_1_income_max_value_check
-            buyer_1_combined_income_max_value_check
-            buyer_1_income_mortgage_value_check
-            buyer_1_mortgage
-            buyer_1_mortgage_value_check
-            buyer_2_income
-            buyer_2_income_mortgage_value_check
-            buyer_2_income_min_value_check
-            buyer_2_income_max_value_check
-            buyer_2_combined_income_max_value_check
-            buyer_2_mortgage
-            buyer_2_mortgage_value_check
-            housing_benefits_joint_purchase
-            housing_benefits_not_joint_purchase
-            savings_joint_purchase
-            savings
-            savings_joint_purchase_value_check
-            savings_value_check
-            savings_deposit_joint_purchase_value_check
-            savings_deposit_value_check
-            previous_ownership_joint_purchase
-            previous_ownership_not_joint_purchase
-          ],
-        )
-      end
+    it "has correct pages" do
+      expect(subsection.pages.map(&:id)).to eq(
+        %w[
+          buyer_1_income
+          buyer_1_income_ecstat_value_check
+          buyer_1_income_discounted_max_value_check
+          buyer_1_combined_income_max_value_check
+          buyer_1_income_mortgage_value_check
+          buyer_1_mortgage
+          buyer_1_mortgage_value_check
+          buyer_2_income
+          buyer_2_income_mortgage_value_check
+          buyer_2_income_ecstat_value_check
+          buyer_2_income_discounted_max_value_check
+          buyer_2_combined_income_max_value_check
+          buyer_2_mortgage
+          buyer_2_mortgage_value_check
+          housing_benefits_joint_purchase
+          housing_benefits_not_joint_purchase
+          savings_joint_purchase
+          savings
+          savings_joint_purchase_value_check
+          savings_value_check
+          savings_deposit_joint_purchase_value_check
+          savings_deposit_value_check
+          previous_ownership_joint_purchase
+          previous_ownership_not_joint_purchase
+          previous_shared
+        ],
+      )
     end
 
-    context "when 2023" do
-      let(:start_date) { Time.utc(2023, 2, 8) }
-
-      it "has correct pages" do
-        expect(subsection.pages.map(&:id)).to eq(
-          %w[
-            buyer_1_income
-            buyer_1_income_min_value_check
-            buyer_1_income_max_value_check
-            buyer_1_combined_income_max_value_check
-            buyer_1_income_mortgage_value_check
-            buyer_1_mortgage
-            buyer_1_mortgage_value_check
-            buyer_2_income
-            buyer_2_income_mortgage_value_check
-            buyer_2_income_min_value_check
-            buyer_2_income_max_value_check
-            buyer_2_combined_income_max_value_check
-            buyer_2_mortgage
-            buyer_2_mortgage_value_check
-            housing_benefits_joint_purchase
-            housing_benefits_not_joint_purchase
-            savings_joint_purchase
-            savings
-            savings_joint_purchase_value_check
-            savings_value_check
-            savings_deposit_joint_purchase_value_check
-            savings_deposit_value_check
-            previous_ownership_joint_purchase
-            previous_ownership_not_joint_purchase
-            previous_shared
-          ],
-        )
-      end
-
-      it "has correct depends on" do
-        expect(subsection.depends_on).to eq([{ "setup_completed?" => true }])
-      end
+    it "has correct depends on" do
+      expect(subsection.depends_on).to eq([{ "setup_completed?" => true }])
     end
   end
 
   context "when 2025" do
-    let(:start_date) { Time.utc(2025, 2, 8) }
-    let(:section) { instance_double(Form::Sales::Sections::Household, form: instance_double(Form, start_date:, start_year_2025_or_later?: true)) }
+    let(:form) { instance_double(Form, start_date: Time.utc(2025, 4, 1), start_year_2025_or_later?: true) }
+
+    it "has correct pages" do
+      expect(subsection.pages.map(&:id)).to eq(
+        %w[
+          buyer_1_income
+          buyer_1_income_ecstat_value_check
+          buyer_1_income_discounted_max_value_check
+          buyer_1_combined_income_max_value_check
+          buyer_1_income_mortgage_value_check
+          buyer_1_mortgage
+          buyer_1_mortgage_value_check
+          buyer_2_income
+          buyer_2_income_mortgage_value_check
+          buyer_2_income_ecstat_value_check
+          buyer_2_income_discounted_max_value_check
+          buyer_2_combined_income_max_value_check
+          buyer_2_mortgage
+          buyer_2_mortgage_value_check
+          housing_benefits_joint_purchase
+          housing_benefits_not_joint_purchase
+          savings_joint_purchase
+          savings
+          savings_joint_purchase_value_check
+          savings_value_check
+          savings_deposit_joint_purchase_value_check
+          savings_deposit_value_check
+          previous_ownership_joint_purchase
+          previous_ownership_not_joint_purchase
+          previous_shared
+        ],
+      )
+    end
 
     it "has correct depends on" do
       expect(subsection.depends_on).to eq([{ "setup_completed?" => true, "is_staircase?" => false }])

spec/models/validations/sales/soft_validations_spec.rb

@@ -3,85 +3,222 @@ require "rails_helper"
 RSpec.describe Validations::Sales::SoftValidations do
   let(:record) { build(:sales_log) }
 
-  describe "income1 min validations" do
-    context "when validating soft min" do
-      it "returns false if no income1 is given" do
+  describe "income validations" do
+    context "when validating soft range based on ecstat" do
+      it "does not trigger for income1 if no income1 is given" do
         record.income1 = nil
-
-        expect(record).not_to be_income1_under_soft_min
+        expect(record).not_to be_income1_outside_soft_range_for_ecstat
       end
 
-      it "returns false if no ecstat1 is given" do
+      it "does not trigger for low income1 if no ecstat1 is given" do
+        record.income1 = 50
         record.ecstat1 = nil
+        expect(record).not_to be_income1_outside_soft_range_for_ecstat
+      end
 
-        expect(record).not_to be_income1_under_soft_min
+      it "does not trigger for income2 if no income2 is given" do
+        record.income2 = nil
+        expect(record).not_to be_income2_outside_soft_range_for_ecstat
       end
 
-      [
-        {
-          income1: 4500,
-          ecstat1: 1,
-        },
-        {
-          income1: 1400,
-          ecstat1: 2,
-        },
-        {
-          income1: 999,
-          ecstat1: 3,
-        },
-        {
-          income1: 1899,
-          ecstat1: 5,
-        },
-        {
-          income1: 1888,
-          ecstat1: 0,
-        },
-      ].each do |test_case|
-        it "returns true if income1 is below soft min for ecstat1 #{test_case[:ecstat1]}" do
-          record.income1 = test_case[:income1]
-          record.ecstat1 = test_case[:ecstat1]
-          expect(record)
-            .to be_income1_under_soft_min
+      it "does not trigger for low income2 if no ecstat2 is given" do
+        record.income2 = 50
+        record.ecstat2 = nil
+        expect(record).not_to be_income2_outside_soft_range_for_ecstat
+      end
+
+      context "when log year is before 2025" do
+        let(:record) { build(:sales_log, saledate: Time.zone.local(2024, 12, 25)) }
+
+        it "does not trigger for low income1 if ecstat1 has no soft min" do
+          record.income1 = 50
+          record.ecstat1 = 4
+          expect(record).not_to be_income1_outside_soft_range_for_ecstat
+        end
+
+        it "returns true if income1 is below soft min for ecstat1" do
+          record.income1 = 4500
+          record.ecstat1 = 1
+          expect(record).to be_income1_outside_soft_range_for_ecstat
+        end
+
+        it "returns false if income1 is >= soft min for ecstat1" do
+          record.income1 = 1500
+          record.ecstat1 = 2
+          expect(record).not_to be_income1_outside_soft_range_for_ecstat
+        end
+
+        it "does not trigger for income2 if ecstat2 has no soft min" do
+          record.income2 = 50
+          record.ecstat2 = 8
+          expect(record).not_to be_income2_outside_soft_range_for_ecstat
+        end
+
+        it "returns true if income2 is below soft min for ecstat2" do
+          record.income2 = 999
+          record.ecstat2 = 3
+          expect(record).to be_income2_outside_soft_range_for_ecstat
+        end
+
+        it "returns false if income2 is >= soft min for ecstat2" do
+          record.income2 = 2500
+          record.ecstat2 = 5
+          expect(record).not_to be_income2_outside_soft_range_for_ecstat
+        end
+
+        it "does not trigger for being over maxima" do
+          record.ecstat1 = 1
+          record.income1 = 200_000
+          record.ecstat2 = 2
+          record.income2 = 100_000
+          expect(record).not_to be_income1_outside_soft_range_for_ecstat
+          expect(record).not_to be_income2_outside_soft_range_for_ecstat
         end
       end
 
-      [
-        {
-          income1: 5001,
-          ecstat1: 1,
-        },
-        {
-          income1: 1600,
-          ecstat1: 2,
-        },
-        {
-          income1: 1004,
-          ecstat1: 3,
-        },
-        {
-          income1: 2899,
-          ecstat1: 4,
-        },
-        {
-          income1: 2899,
-          ecstat1: 5,
-        },
-        {
-          income1: 5,
-          ecstat1: 6,
-        },
-        {
-          income1: 10_888,
-          ecstat1: 0,
-        },
-      ].each do |test_case|
-        it "returns false if income1 is over soft min for ecstat1 #{test_case[:ecstat1]}" do
-          record.income1 = test_case[:income1]
-          record.ecstat1 = test_case[:ecstat1]
-          expect(record)
-            .not_to be_income1_under_soft_min
+      context "when log year is 2025" do
+        let(:record) { build(:sales_log, saledate: Time.zone.local(2025, 12, 25)) }
+
+        it "returns true if income1 is below soft min for ecstat1" do
+          record.income1 = 13_399
+          record.ecstat1 = 1
+          expect(record).to be_income1_outside_soft_range_for_ecstat
+        end
+
+        it "returns false if income1 is >= soft min for ecstat1" do
+          record.income1 = 2600
+          record.ecstat1 = 2
+          expect(record).not_to be_income1_outside_soft_range_for_ecstat
+        end
+
+        it "returns true if income2 is below soft min for ecstat2" do
+          record.income2 = 2079
+          record.ecstat2 = 3
+          expect(record).to be_income2_outside_soft_range_for_ecstat
+        end
+
+        it "returns false if income2 is >= soft min for ecstat2" do
+          record.income2 = 520
+          record.ecstat2 = 5
+          expect(record).not_to be_income2_outside_soft_range_for_ecstat
+        end
+
+        it "returns true if income1 is above soft max for ecstat1" do
+          record.income1 = 80_001
+          record.ecstat1 = 2
+          expect(record).to be_income1_outside_soft_range_for_ecstat
+        end
+
+        it "returns false if income1 is <= soft max for ecstat1" do
+          record.income1 = 80_000
+          record.ecstat1 = 2
+          expect(record).not_to be_income1_outside_soft_range_for_ecstat
+        end
+
+        it "returns true if income2 is above soft max for ecstat2" do
+          record.income2 = 50_001
+          record.ecstat2 = 6
+          expect(record).to be_income2_outside_soft_range_for_ecstat
+        end
+
+        it "returns false if income2 is <= soft max for ecstat2" do
+          record.income2 = 50_000
+          record.ecstat2 = 6
+          expect(record).not_to be_income2_outside_soft_range_for_ecstat
+        end
+      end
+    end
+
+    context "when validating soft max for discounted ownership" do
+      it "does not trigger if la is not set" do
+        record.la = nil
+        record.income1 = 100_000
+        record.income2 = 95_000
+        record.ownershipsch = 2
+        expect(record).not_to be_income1_over_soft_max_for_discounted_ownership
+        expect(record).not_to be_income2_over_soft_max_for_discounted_ownership
+        expect(record).not_to be_combined_income_over_soft_max_for_discounted_ownership
+      end
+
+      it "does not trigger if sale is not discounted ownership" do
+        record.la = "E09000001"
+        record.income1 = 100_000
+        record.income2 = 95_000
+        record.ownershipsch = 1
+        expect(record).not_to be_income1_over_soft_max_for_discounted_ownership
+        expect(record).not_to be_income2_over_soft_max_for_discounted_ownership
+        expect(record).not_to be_combined_income_over_soft_max_for_discounted_ownership
+      end
+
+      context "when property is in London for a discounted ownership sale" do
+        let(:record) { build(:sales_log, ownershipsch: 2, la: "E09000001") }
+
+        it "returns true for income1 if income1 > London threshold" do
+          record.income1 = 90_001
+          expect(record).to be_income1_over_soft_max_for_discounted_ownership
+        end
+
+        it "returns false for income1 if income1 <= London threshold" do
+          record.income1 = 90_000
+          expect(record).not_to be_income1_over_soft_max_for_discounted_ownership
+        end
+
+        it "returns true for income2 if income2 > London threshold" do
+          record.income2 = 100_000
+          expect(record).to be_income2_over_soft_max_for_discounted_ownership
+        end
+
+        it "returns false for income2 if income2 <= London threshold" do
+          record.income2 = 30_000
+          expect(record).not_to be_income2_over_soft_max_for_discounted_ownership
+        end
+
+        it "returns true for combined income if > London threshold" do
+          record.income1 = 61_000
+          record.income2 = 30_000
+          expect(record).to be_combined_income_over_soft_max_for_discounted_ownership
+        end
+
+        it "returns false for combined income if <= London threshold" do
+          record.income1 = 40_000
+          record.income2 = 20_000
+          expect(record).not_to be_combined_income_over_soft_max_for_discounted_ownership
+        end
+      end
+
+      context "when property is not in London for a discounted ownership sale" do
+        let(:record) { build(:sales_log, ownershipsch: 2, la: "E08000001") }
+
+        it "returns true for income1 if income1 > non-London threshold" do
+          record.income1 = 80_001
+          expect(record).to be_income1_over_soft_max_for_discounted_ownership
+        end
+
+        it "returns false for income1 if income1 <= non-London threshold" do
+          record.income1 = 80_000
+          expect(record).not_to be_income1_over_soft_max_for_discounted_ownership
+        end
+
+        it "returns true for income2 if income2 > non-London threshold" do
+          record.income2 = 85_000
+          expect(record).to be_income2_over_soft_max_for_discounted_ownership
+        end
+
+        it "returns false for income2 if income2 <= non-London threshold" do
+          record.income2 = 30_000
+          expect(record).not_to be_income2_over_soft_max_for_discounted_ownership
+        end
+
+        it "returns true for combined income if > non-London threshold" do
+          record.income1 = 61_000
+          record.income2 = 20_000
+          expect(record).to be_combined_income_over_soft_max_for_discounted_ownership
+        end
+
+        it "returns false for combined income if <= non-London threshold" do
+          record.income1 = 40_000
+          record.income2 = 20_000
+          expect(record).not_to be_combined_income_over_soft_max_for_discounted_ownership
         end
       end
     end

spec/requests/merge_requests_controller_spec.rb

@@ -260,7 +260,7 @@ RSpec.describe MergeRequestsController, type: :request do
         end
 
         it "shows the correct content" do
-          expect(page).to have_content("Which helpdesk ticket reported this merge?")
+          expect(page).to have_content("Was this merge reported by a helpdesk ticket?")
           expect(page).to have_link("Back", href: existing_absorbing_organisation_merge_request_path(merge_request))
           expect(page).to have_button("Save and continue")
         end
@@ -476,6 +476,82 @@ RSpec.describe MergeRequestsController, type: :request do
           end
         end
       end
+
+      describe "from helpdesk_ticket page" do
+        context "when not answering the question" do
+          let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: other_organisation) }
+          let(:params) do
+            { merge_request: { page: "helpdesk_ticket" } }
+          end
+          let(:request) do
+            patch "/merge-request/#{merge_request.id}", headers:, params:
+          end
+
+          it "renders the error" do
+            request
+
+            expect(response).to have_http_status(:unprocessable_entity)
+            expect(page).to have_content("You must answer was this merge reported by a helpdesk ticket?")
+          end
+
+          it "does not update the request" do
+            expect { request }.not_to(change { merge_request.reload.attributes })
+          end
+        end
+
+        context "when has_helpdesk_ticket is true but no ticket is given" do
+          let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: other_organisation) }
+          let(:params) do
+            { merge_request: { page: "helpdesk_ticket", has_helpdesk_ticket: true } }
+          end
+          let(:request) do
+            patch "/merge-request/#{merge_request.id}", headers:, params:
+          end
+
+          it "renders the error" do
+            request
+
+            expect(response).to have_http_status(:unprocessable_entity)
+            expect(page).to have_content("You must answer the ticket number")
+          end
+
+          it "does not update the request" do
+            expect { request }.not_to(change { merge_request.reload.attributes })
+          end
+        end
+
+        context "when has_helpdesk_ticket is false" do
+          let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: other_organisation, helpdesk_ticket: "123") }
+          let(:params) do
+            { merge_request: { page: "helpdesk_ticket", has_helpdesk_ticket: false } }
+          end
+          let(:request) do
+            patch "/merge-request/#{merge_request.id}", headers:, params:
+          end
+
+          it "updates has_helpdesk_ticket and clears helpdesk_ticket" do
+            request
+            expect(merge_request.reload.has_helpdesk_ticket).to eq(false)
+            expect(merge_request.helpdesk_ticket).to eq(nil)
+          end
+        end
+
+        context "when has_helpdesk_ticket is true and ticket is given" do
+          let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: other_organisation) }
+          let(:params) do
+            { merge_request: { page: "helpdesk_ticket", has_helpdesk_ticket: true, helpdesk_ticket: "321" } }
+          end
+          let(:request) do
+            patch "/merge-request/#{merge_request.id}", headers:, params:
+          end
+
+          it "updates has_helpdesk_ticket and clears helpdesk_ticket" do
+            request
+            expect(merge_request.reload.has_helpdesk_ticket).to eq(true)
+            expect(merge_request.helpdesk_ticket).to eq("321")
+          end
+        end
+      end
     end
 
     describe "#merge_start_confirmation" do

spec/services/documentation_generator_spec.rb

@@ -127,11 +127,11 @@ describe DocumentationGenerator do
 
     context "when the service is run for sales" do
       let(:log_type) { "sales" }
-      let(:all_validation_methods) { ["income2_under_soft_min?"] }
+      let(:all_validation_methods) { ["income2_outside_soft_range_for_ecstat?"] }
 
       it "creates new validation documentation records" do
         expect { described_class.new.describe_soft_validations(client, all_validation_methods, all_helper_methods, log_type) }.to change(LogValidation, :count)
-        expect(LogValidation.where(validation_name: "income2_under_soft_min?").count).to be_positive
+        expect(LogValidation.where(validation_name: "income2_outside_soft_range_for_ecstat?").count).to be_positive
         any_validation = LogValidation.first
         expect(any_validation.description).to eq("Validates the format.")
         expect(any_validation.field).not_to be_empty