Merge pull request #607 from companieshouse/lp-1309-use-specific-date-of-upate-messages-lp6d

mattch1 · web-flow · commit 76d465710929 · 2025-11-25T09:36:45.000Z
LP-1309 PT Specific date of update error messages for partnership upd…
diff --git a/locales/cy/errors.json b/locales/cy/errors.json
@@ -14,6 +14,13 @@
             "confirm": {
                 "countryMissing": "WELSH - We cannot identify the country for this address. Select Change, then select the country."
             }
+        },
+
+        "dateOfUpdate": {
+            "registeredOfficeAddress": "WELSH - Date the registered office address changed must be the same as or after limited partnership’s registration date",
+            "principalPlaceOfBusinessAddress": "WELSH - Date the principal place of business changed must be the same as or after limited partnership’s registration date’",
+            "partnershipName": "WELSH - Date the partnership name changed must be the same as or after limited partnership’s registration date",
+            "term": "WELSH - Date the term changed must be the same as or after limited partnership’s registration date"
         }
     }
 }
diff --git a/locales/en/errors.json b/locales/en/errors.json
@@ -14,6 +14,13 @@
             "confirm": {
                 "countryMissing": "We cannot identify the country for this address. Select Change, then select the country."
             }
+        },
+
+        "dateOfUpdate": {
+            "registeredOfficeAddress": "Date the registered office address changed must be the same as or after limited partnership's registration date",
+            "principalPlaceOfBusinessAddress": "Date the principal place of business changed must be the same as or after limited partnership's registration date",
+            "partnershipName": "Date the partnership name changed must be the same as or after limited partnership's registration date",
+            "term": "Date the term changed must be the same as or after limited partnership's registration date"
         }
     }
 }
diff --git a/src/presentation/controller/postTransition/LimitedPartnershipController.ts b/src/presentation/controller/postTransition/LimitedPartnershipController.ts
@@ -324,6 +324,7 @@ class LimitedPartnershipController extends AbstractController {
         }
 
         if (patchResult?.errors) {
+          this.specifyErrorMessagesForDateOfUpdate(patchResult.errors, response, pageRouting);
           return response.render(template, super.makeProps(pageRouting, errorData, patchResult.errors));
         }
 
@@ -335,6 +336,13 @@ class LimitedPartnershipController extends AbstractController {
     };
   }
 
+  private specifyErrorMessagesForDateOfUpdate(errors: UIErrors, response: Response<any, Record<string, any>>, pageRouting: PageRouting) {
+    if (errors.errors.errorList[0].href === "#date_of_update") {
+      errors.errors.errorList[0].text = response.locals.i18n.errorMessages.dateOfUpdate[pageRouting?.data?.titleKey];
+      errors.errors.date_of_update.text = response.locals.i18n.errorMessages.dateOfUpdate[pageRouting?.data?.titleKey];
+    }
+  }
+
   getDateOfUpdate() {
     return async (request: Request, response: Response, next: NextFunction) => {
       try {
diff --git a/src/presentation/test/integration/postTransition/limitedPartnership/dateOfUpdate/when-did-the-name-of-the-partnership-change.test.ts b/src/presentation/test/integration/postTransition/limitedPartnership/dateOfUpdate/when-did-the-name-of-the-partnership-change.test.ts
@@ -3,10 +3,11 @@ import { LimitedPartnership } from "@companieshouse/api-sdk-node/dist/services/l
 
 import enTranslationText from "../../../../../../../locales/en/translations.json";
 import cyTranslationText from "../../../../../../../locales/cy/translations.json";
+import enErrorMessages from "../../../../../../../locales/en/errors.json";
 
 import app from "../../../app";
 import { appDevDependencies } from "../../../../../../config/dev-dependencies";
-import { getUrl, setLocalesEnabled } from "../../../../utils";
+import { getUrl, setLocalesEnabled, toEscapedHtml } from "../../../../utils";
 import { ApiErrors } from "../../../../../../domain/entities/UIErrors";
 
 import {
@@ -74,14 +75,15 @@ describe("Partnership name change date page", () => {
     });
   });
 
-  it("should replay entered data when invalid date of update is entered and a validation error occurs", async () => {
+  it("should display the specifc error message rather than the original when the date is before the incorporation date", async () => {
     const limitedPartnership = new LimitedPartnershipBuilder().withDateOfUpdate("2024-10-10").build();
 
     appDevDependencies.limitedPartnershipGateway.feedLimitedPartnerships([limitedPartnership]);
 
-    const errorMessage = "The date is invalid";
+    const originalErrorMessage = "Default";
+    const expectedErrorMessage = toEscapedHtml(enErrorMessages.errorMessages.dateOfUpdate.partnershipName);
     const apiErrors: ApiErrors = {
-      errors: { date_of_update: errorMessage }
+      errors: { date_of_update: originalErrorMessage }
     };
     appDevDependencies.limitedPartnershipGateway.feedErrors(apiErrors);
 
@@ -90,6 +92,7 @@ describe("Partnership name change date page", () => {
     });
 
     expect(res.status).toBe(200);
-    expect(res.text).toContain(errorMessage);
+    expect(res.text).not.toContain(originalErrorMessage);
+    expect(res.text).toContain(expectedErrorMessage);
   });
 });
diff --git a/src/presentation/test/integration/postTransition/limitedPartnership/dateOfUpdate/when-did-the-principal-place-of-business-address-change.test.ts b/src/presentation/test/integration/postTransition/limitedPartnership/dateOfUpdate/when-did-the-principal-place-of-business-address-change.test.ts
@@ -1,8 +1,9 @@
 import request from "supertest";
 import enTranslationText from "../../../../../../../locales/en/translations.json";
 import cyTranslationText from "../../../../../../../locales/cy/translations.json";
+import enErrorMessages from "../../../../../../../locales/en/errors.json";
 import app from "../../../app";
-import { getUrl, setLocalesEnabled } from "../../../../utils";
+import { getUrl, setLocalesEnabled, toEscapedHtml } from "../../../../utils";
 import { appDevDependencies } from "../../../../../../config/dev-dependencies";
 import LimitedPartnershipBuilder from "../../../../builder/LimitedPartnershipBuilder";
 import PostTransitionPageType from "../../../../../controller/postTransition/pageType";
@@ -50,14 +51,16 @@ describe("Partnership principal place of business address change date page", ()
       expect(res.text).toContain(`Redirecting to ${redirectUrl}`);
     });
 
-    it("should replay entered data when invalid date of update is entered and a validation error occurs", async () => {
+    it("should display the specifc error message rather than the original when the date is before the incorporation date", async () => {
       const limitedPartnership = new LimitedPartnershipBuilder().withDateOfUpdate("2024-10-10").build();
 
       appDevDependencies.limitedPartnershipGateway.feedLimitedPartnerships([limitedPartnership]);
 
-      const errorMessage = "The date is invalid";
+      const originalErrorMessage = "Default";
+      const expectedErrorMessage = toEscapedHtml(enErrorMessages.errorMessages.dateOfUpdate.principalPlaceOfBusinessAddress);
+
       const apiErrors: ApiErrors = {
-        errors: { date_of_update: errorMessage }
+        errors: { date_of_update: originalErrorMessage }
       };
       appDevDependencies.limitedPartnershipGateway.feedErrors(apiErrors);
 
@@ -66,7 +69,8 @@ describe("Partnership principal place of business address change date page", ()
       });
 
       expect(res.status).toBe(200);
-      expect(res.text).toContain(errorMessage);
+      expect(res.text).not.toContain(originalErrorMessage);
+      expect(res.text).toContain(expectedErrorMessage);
     });
   });
 });
diff --git a/src/presentation/test/integration/postTransition/limitedPartnership/dateOfUpdate/when-did-the-registered-office-address-change.test.ts b/src/presentation/test/integration/postTransition/limitedPartnership/dateOfUpdate/when-did-the-registered-office-address-change.test.ts
@@ -1,9 +1,10 @@
 import request from "supertest";
 import enTranslationText from "../../../../../../../locales/en/translations.json";
 import cyTranslationText from "../../../../../../../locales/cy/translations.json";
+import enErrorMessages from "../../../../../../../locales/en/errors.json";
 import app from "../../../app";
 import { appDevDependencies } from "../../../../../../config/dev-dependencies";
-import { getUrl, setLocalesEnabled } from "../../../../utils";
+import { getUrl, setLocalesEnabled, toEscapedHtml } from "../../../../utils";
 import { REGISTERED_OFFICE_ADDRESS_CHANGE_CHECK_YOUR_ANSWERS_URL, WHEN_DID_THE_REGISTERED_OFFICE_ADDRESS_CHANGE_URL } from "../../../../../controller/postTransition/url";
 import CompanyProfileBuilder from "../../../../builder/CompanyProfileBuilder";
 import PostTransitionPageType from "../../../../../controller/postTransition/pageType";
@@ -57,14 +58,15 @@ describe("Registered office address change date page", () => {
     });
   });
 
-  it("should replay entered data when invalid date of update is entered and a validation error occurs", async () => {
+  it("should display the specifc error message rather than the original when the date is before the incorporation date", async () => {
     const limitedPartnership = new LimitedPartnershipBuilder().withDateOfUpdate("2024-10-10").build();
 
     appDevDependencies.limitedPartnershipGateway.feedLimitedPartnerships([limitedPartnership]);
 
-    const errorMessage = "The date is invalid";
+    const originalErrorMessage = "Default";
+    const expectedErrorMessage = toEscapedHtml(enErrorMessages.errorMessages.dateOfUpdate.registeredOfficeAddress);
     const apiErrors: ApiErrors = {
-      errors: { date_of_update: errorMessage }
+      errors: { date_of_update: originalErrorMessage }
     };
     appDevDependencies.limitedPartnershipGateway.feedErrors(apiErrors);
 
@@ -73,6 +75,7 @@ describe("Registered office address change date page", () => {
     });
 
     expect(res.status).toBe(200);
-    expect(res.text).toContain(errorMessage);
+    expect(res.text).not.toContain(originalErrorMessage);
+    expect(res.text).toContain(expectedErrorMessage);
   });
 });
diff --git a/src/presentation/test/integration/postTransition/limitedPartnership/dateOfUpdate/when-did-the-term-change.test.ts b/src/presentation/test/integration/postTransition/limitedPartnership/dateOfUpdate/when-did-the-term-change.test.ts
@@ -2,10 +2,11 @@ import request from "supertest";
 
 import enTranslationText from "../../../../../../../locales/en/translations.json";
 import cyTranslationText from "../../../../../../../locales/cy/translations.json";
+import enErrorMessages from "../../../../../../../locales/en/errors.json";
 
 import app from "../../../app";
 import { appDevDependencies } from "../../../../../../config/dev-dependencies";
-import { getUrl, setLocalesEnabled } from "../../../../utils";
+import { getUrl, setLocalesEnabled, toEscapedHtml } from "../../../../utils";
 import { ApiErrors } from "../../../../../../domain/entities/UIErrors";
 
 import {
@@ -64,14 +65,15 @@ describe("Partnership term change date page", () => {
     });
   });
 
-  it("should replay entered data when invalid date of update is entered and a validation error occurs", async () => {
+  it("should display the specifc error message rather than the original when the date is before the incorporation date", async () => {
     const limitedPartnership = new LimitedPartnershipBuilder().withDateOfUpdate("2024-10-10").build();
 
     appDevDependencies.limitedPartnershipGateway.feedLimitedPartnerships([limitedPartnership]);
 
-    const errorMessage = "The date is invalid";
+    const originalErrorMessage = "Default";
+    const expectedErrorMessage = toEscapedHtml(enErrorMessages.errorMessages.dateOfUpdate.term);
     const apiErrors: ApiErrors = {
-      errors: { date_of_update: errorMessage }
+      errors: { date_of_update: originalErrorMessage }
     };
     appDevDependencies.limitedPartnershipGateway.feedErrors(apiErrors);
 
@@ -80,6 +82,7 @@ describe("Partnership term change date page", () => {
     });
 
     expect(res.status).toBe(200);
-    expect(res.text).toContain(errorMessage);
+    expect(res.text).not.toContain(originalErrorMessage);
+    expect(res.text).toContain(expectedErrorMessage);
   });
 });
diff --git a/src/views/date-of-update.njk b/src/views/date-of-update.njk
@@ -31,7 +31,7 @@
         {{ govukDateInput({
           id: "date_of_update",
           namePrefix: "date_of_update",
-          errorMessage: props.errors.date_of_update if props.errors,
+          errorMessage: props.errors.date_of_update if props.errors.date_of_update,
           fieldset: {
             legend: {
               text: pageTitle,

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,13 @@`
`14`	`14`	`"confirm": {`
`15`	`15`	`"countryMissing": "WELSH - We cannot identify the country for this address. Select Change, then select the country."`
`16`	`16`	`}`
	`17`	`+ },`
	`18`	`+`
	`19`	`+ "dateOfUpdate": {`
	`20`	`+ "registeredOfficeAddress": "WELSH - Date the registered office address changed must be the same as or after limited partnership’s registration date",`
	`21`	`+ "principalPlaceOfBusinessAddress": "WELSH - Date the principal place of business changed must be the same as or after limited partnership’s registration date’",`
	`22`	`+ "partnershipName": "WELSH - Date the partnership name changed must be the same as or after limited partnership’s registration date",`
	`23`	`+ "term": "WELSH - Date the term changed must be the same as or after limited partnership’s registration date"`
`17`	`24`	`}`
`18`	`25`	`}`
`19`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,7 @@ class LimitedPartnershipController extends AbstractController {`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`if (patchResult?.errors) {`
	`327`	`+ this.specifyErrorMessagesForDateOfUpdate(patchResult.errors, response, pageRouting);`
`327`	`328`	`return response.render(template, super.makeProps(pageRouting, errorData, patchResult.errors));`
`328`	`329`	`}`
`329`	`330`
`@@ -335,6 +336,13 @@ class LimitedPartnershipController extends AbstractController {`
`335`	`336`	`};`
`336`	`337`	`}`
`337`	`338`
	`339`	`+ private specifyErrorMessagesForDateOfUpdate(errors: UIErrors, response: Response<any, Record<string, any>>, pageRouting: PageRouting) {`
	`340`	`+ if (errors.errors.errorList[0].href === "#date_of_update") {`
	`341`	`+ errors.errors.errorList[0].text = response.locals.i18n.errorMessages.dateOfUpdate[pageRouting?.data?.titleKey];`
	`342`	`+ errors.errors.date_of_update.text = response.locals.i18n.errorMessages.dateOfUpdate[pageRouting?.data?.titleKey];`
	`343`	`+ }`
	`344`	`+ }`
	`345`	`+`
`338`	`346`	`getDateOfUpdate() {`
`339`	`347`	`return async (request: Request, response: Response, next: NextFunction) => {`
`340`	`348`	`try {`