From 6ccb5854d4b1ea757076e3e8465ad92fc466a1f5 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Mon, 25 Mar 2024 16:16:39 +0000
Subject: [PATCH] Add question number to success message (#2344)

---
 app/controllers/form_controller.rb    |  6 +++++-
 spec/requests/form_controller_spec.rb | 10 ++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index 117a4ac19..2bf7ce966 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -13,7 +13,11 @@ class FormController < ApplicationController
       mandatory_questions_with_no_response = mandatory_questions_with_no_response(responses_for_page)
 
       if mandatory_questions_with_no_response.empty? && @log.update(responses_for_page.merge(updated_by: current_user))
-        flash[:notice] = "You have successfully updated #{@page.questions.map(&:check_answer_label).reject { |label| label.to_s.empty? }.first&.downcase}" if previous_interruption_screen_page_id.present?
+        if previous_interruption_screen_page_id.present?
+          updated_question = @page.questions.reject { |question| question.check_answer_label.blank? }.first
+          updated_question_string = [updated_question&.question_number_string, updated_question&.check_answer_label.to_s.downcase].compact.join(": ")
+          flash[:notice] = "You have successfully updated #{updated_question_string}"
+        end
         redirect_to(successful_redirect_path)
       else
         mandatory_questions_with_no_response.map do |question|
diff --git a/spec/requests/form_controller_spec.rb b/spec/requests/form_controller_spec.rb
index c06facd94..ca558ddc4 100644
--- a/spec/requests/form_controller_spec.rb
+++ b/spec/requests/form_controller_spec.rb
@@ -760,25 +760,27 @@ RSpec.describe FormController, type: :request do
             {
               id: lettings_log.id,
               lettings_log: {
-                page: page_id,
+                page: "lead_tenant_age",
                 age1: 20,
-                interruption_page_id: "retirement_value_check",
+                interruption_page_id: "age_lead_tenant_over_retirement_value_check",
               },
             }
           end
 
           before do
+            lettings_log.update!(startdate: Time.zone.local(2023, 4, 1))
             post "/lettings-logs/#{lettings_log.id}/lead-tenant-age?referrer=interruption_screen", params:
           end
 
           it "redirects back to the soft validation page" do
-            expect(response).to redirect_to("/lettings-logs/#{lettings_log.id}/retirement-value-check")
+            expect(response).to redirect_to("/lettings-logs/#{lettings_log.id}/age-lead-tenant-over-retirement-value-check")
           end
 
           it "displays a success banner" do
             follow_redirect!
             follow_redirect!
-            expect(response.body).to include("You have successfully updated lead tenant’s age")
+
+            expect(response.body).to include("You have successfully updated Q32: lead tenant’s age")
           end
         end