Bug/roe 2018 roe 1507 fix duplication of trust

src/controllers/trust.information.controller.ts

@@ -33,6 +33,10 @@ export const post = async (req: Request, res: Response, next: NextFunction) => {
   try {
     logger.debugRequest(req, `POST ${config.TRUST_INFO_PAGE}`);
 
+    if (req.body.submit) {
+      return res.redirect(config.CHECK_YOUR_ANSWERS_PAGE);
+    }
+
     // If only one BO is selected, data is a string.
     // If multiple selected, data is an array.
     const beneficialOwnerIds = (typeof req.body.beneficialOwners === 'string') ? [req.body.beneficialOwners] : req.body.beneficialOwners;
@@ -62,12 +66,8 @@ export const post = async (req: Request, res: Response, next: NextFunction) => {
 
     await saveAndContinue(req, session);
 
-    if (req.body.add) {
-      return res.redirect(config.TRUST_INFO_URL);
-    }
-    if (req.body.submit) {
-      return res.redirect(config.CHECK_YOUR_ANSWERS_PAGE);
-    }
+    return res.redirect(config.TRUST_INFO_URL);
+
   } catch (error) {
     logger.errorRequest(req, error);
     next(error);

src/middleware/validation.middleware.ts

@@ -74,6 +74,7 @@ export function checkTrustValidations(req: Request, res: Response, next: NextFun
         ...req.body,
         beneficialOwners: getBeneficialOwnerList(appData),
         trusts_input: req.body.trusts?.toString(),
+        trustsAddedSoFar: (appData.trusts) ? appData.trusts.length : 0,
         errors
       });
     }

src/validation/custom.validation.ts

@@ -1,5 +1,7 @@
 // Custom validation utils - For now checking is not empty
 
+import { Session } from '@companieshouse/node-session-handler';
+
 import { VALID_CHARACTERS, VALID_EMAIL_FORMAT } from "./regex/regex.validation";
 import { DateTime } from "luxon";
 import { ErrorMessages } from "./error.messages";
@@ -452,22 +454,55 @@ export const checkAtLeastOneFieldHasValue = (errMsg: string, ...fields: any[]) =
   throw new Error(errMsg);
 };
 
-export const checkTrustFields = (trustsJson: string) => {
+const isSubmitTrustSelected = (session: Session, action: string = ""): boolean => {
+  const appData: ApplicationData = getApplicationData(session);
+  return action === "submit" && (appData.trusts || [] ).length > 0;
+};
+
+export const checkTrustBOs = (req) => {
+  if (isSubmitTrustSelected(req.session, req.body.submit)) {
+    return true;
+  }
+  return checkAtLeastOneFieldHasValue(ErrorMessages.TRUST_BO_CHECKBOX, req.body.beneficialOwners);
+};
+
+export const checkTrustFields = (req) => {
+
+  if (isSubmitTrustSelected(req.session, req.body.submit)) {
+    return true;
+  }
+
+  const trustsJson = (req.body.trusts || "").trim();
+
+  if (!trustsJson) {
+    throw new Error(ErrorMessages.TRUST_DATA_EMPTY);
+  }
+
+  if (!isValidJson(trustsJson)) {
+    throw new Error(ErrorMessages.TRUST_DATA_INVALID_FORMAT);
+  }
+
   const trusts: trustType.Trust[] = JSON.parse(trustsJson);
   const addressMaxLength = 50;
 
   for (const trust of trusts) {
     checkTrustCreationDate(trust);
-
     checkTrustName(trust);
-
     checkIndividualsAddress(trust, addressMaxLength);
-
     checkCorporatesAddress(trust, addressMaxLength);
   }
   return true;
 };
 
+const isValidJson = (str) => {
+  try {
+    JSON.parse(str);
+  } catch (e) {
+    return false;
+  }
+  return true;
+};
+
 export const checkBeneficialOwnerType = (beneficialOwnersStatement: string, value) => {
   if (!value) {
     let errMsg = ErrorMessages.SELECT_THE_TYPE_OF_BENEFICIAL_OWNER_OR_MANAGING_OFFICER_YOU_WANT_TO_ADD;

src/validation/error.messages.ts

@@ -53,6 +53,7 @@ export enum ErrorMessages {
 
   // Trusts
   TRUST_DATA_EMPTY = "Paste the trust information from the Excel document into the box",
+  TRUST_DATA_INVALID_FORMAT = "Format of trust information is invalid",
   TRUST_NAME = "Enter the trust name",
   TRUST_NAME_2 = "Enter the name of the trust",
   TRUST_CREATION_DATE = "Enter the trust creation date",

src/validation/trust.information.validation.ts

@@ -1,14 +1,7 @@
 import { body } from "express-validator";
-import { checkAtLeastOneFieldHasValue, checkTrustFields } from "./custom.validation";
-
-import { ErrorMessages } from "./error.messages";
+import { checkTrustBOs, checkTrustFields } from "./custom.validation";
 
 export const trustInformation = [
-  body("beneficialOwners").custom((value, { req }) =>
-    checkAtLeastOneFieldHasValue(ErrorMessages.TRUST_BO_CHECKBOX, req.body.beneficialOwners)),
-
-  body("trusts")
-    .not().isEmpty({ ignore_whitespace: true }).withMessage(ErrorMessages.TRUST_DATA_EMPTY)
-    .custom((value, { req }) =>
-      checkTrustFields(req.body.trusts))
+  body("beneficialOwners").custom((_, { req }) => checkTrustBOs(req)),
+  body("trusts").custom((_, { req }) => checkTrustFields(req))
 ];

test/__mocks__/session.mock.ts

@@ -785,6 +785,8 @@ export const TRUST_DATA: string = `[{
   "CORPORATES": []
 }]`;
 
+export const TRUST_DATA_INVALID: string = "abc";
+
 export const TRUST_DATA_NO_NAME: string = `[{
   "creation_date_day": "31",
   "creation_date_month": "12",
@@ -854,26 +856,38 @@ export const TRUSTS_SUBMIT = {
   [trustType.TrustKey]: TRUST_DATA
 };
 
-export const TRUSTS_SUBMIT_MULTIPLE_BENEFICIAL_OWNERS = {
-  submit: "submit",
+export const TRUSTS_ADD = {
+  add: "add",
+  beneficialOwners: "123",
+  [trustType.TrustKey]: TRUST_DATA
+};
+
+export const TRUSTS_ADD_MULTIPLE_BENEFICIAL_OWNERS = {
+  add: "add",
   beneficialOwners: ["123", "456"],
   [trustType.TrustKey]: TRUST_DATA
 };
 
-export const TRUSTS_SUBMIT_NO_NAME = {
-  submit: "submit",
+export const TRUSTS_ADD_INVALID = {
+  add: "add",
+  beneficialOwners: "123",
+  [trustType.TrustKey]: TRUST_DATA_INVALID
+};
+
+export const TRUSTS_ADD_NO_NAME = {
+  add: "add",
   beneficialOwners: "123",
   [trustType.TrustKey]: TRUST_DATA_NO_NAME
 };
 
-export const TRUSTS_SUBMIT_NO_CREATION_DATE = {
-  submit: "submit",
+export const TRUSTS_ADD_NO_CREATION_DATE = {
+  add: "add",
   beneficialOwners: "123",
   [trustType.TrustKey]: TRUST_DATA_NO_CREATION_DATE
 };
 
-export const TRUSTS_SUBMIT_PARTIAL_CREATION_DATE = {
-  submit: "submit",
+export const TRUSTS_ADD_PARTIAL_CREATION_DATE = {
+  add: "add",
   beneficialOwners: "123",
   [trustType.TrustKey]: TRUST_DATA_PARTIAL_CREATION_DATE
 };
@@ -894,8 +908,8 @@ export const TRUSTS_EMPTY_CHECKBOX = {
   [trustType.TrustKey]: TRUST_DATA
 };
 
-export const TRUSTS_SUBMIT_LEADING_AND_TRAILING_WHITESPACE = {
-  submit: "submit",
+export const TRUSTS_ADD_LEADING_AND_TRAILING_WHITESPACE = {
+  add: "add",
   beneficialOwners: "123",
   [trustType.TrustKey]: TRUST_DATA_LEADING_AND_TRAILING_SPACES
 };

test/__mocks__/text.mock.ts

@@ -48,6 +48,7 @@ export const MANAGING_OFFICER_CORPORATE_PAGE_TITLE = "Tell us about the corporat
 export const SIGN_OUT_PAGE_TITLE = "Are you sure you want to sign out?";
 export const SIGN_OUT_HINT_TEXT = "We will save your application.";
 export const TRUST_INFO_PAGE_TITLE = "Add trust information for the beneficial owners";
+export const TRUST_INFO_NO_MORE_TO_ADD_BUTTON = "No more";
 export const CHECK_YOUR_ANSWERS_PAGE_TITLE = "Check your answers before sending your application";
 export const VERIFICATION_CHECKS = "Verification checks";
 export const VERIFICATION_CHECKS_DATE = "Date the verification checks were completed";

test/__mocks__/validation.mock.ts

@@ -337,8 +337,8 @@ export const MANAGING_OFFICER_CORPORATE_WITH_INVALID_CHARS_SERVICE_ADDRESS_MOCK
   ...SERVICE_ADDRESS_WITH_INVALID_CHAR_FIELDS_MOCK
 };
 
-export const TRUSTS_SUBMIT_CORPORATE_SA_ADDRESS_PREMISES_TOO_LONG = {
-  submit: "submit",
+export const TRUSTS_ADD_CORPORATE_SA_ADDRESS_PREMISES_TOO_LONG = {
+  add: "add",
   beneficialOwners: "123",
   [trustType.TrustKey]: `[{
     "trust_name": "name of trust",
@@ -368,8 +368,8 @@ export const TRUSTS_SUBMIT_CORPORATE_SA_ADDRESS_PREMISES_TOO_LONG = {
   }]`
 };
 
-export const TRUSTS_SUBMIT_CORPORATE_RO_ADDRESS_PREMISES_TOO_LONG = {
-  submit: "submit",
+export const TRUSTS_ADD_CORPORATE_RO_ADDRESS_PREMISES_TOO_LONG = {
+  add: "add",
   beneficialOwners: "123",
   [trustType.TrustKey]: `[{
     "trust_name": "name of trust",
@@ -399,8 +399,8 @@ export const TRUSTS_SUBMIT_CORPORATE_RO_ADDRESS_PREMISES_TOO_LONG = {
   }]`
 };
 
-export const TRUSTS_SUBMIT_INDIVIDUAL_URA_ADDRESS_PREMISES_TOO_LONG = {
-  submit: "submit",
+export const TRUSTS_ADD_INDIVIDUAL_URA_ADDRESS_PREMISES_TOO_LONG = {
+  add: "add",
   beneficialOwners: "123",
   [trustType.TrustKey]: `[{
     "trust_name": "my trust",
@@ -431,8 +431,8 @@ export const TRUSTS_SUBMIT_INDIVIDUAL_URA_ADDRESS_PREMISES_TOO_LONG = {
   }]`
 };
 
-export const TRUSTS_SUBMIT_INDIVIDUAL_SA_ADDRESS_PREMISES_TOO_LONG = {
-  submit: "submit",
+export const TRUSTS_ADD_INDIVIDUAL_SA_ADDRESS_PREMISES_TOO_LONG = {
+  add: "add",
   beneficialOwners: "123",
   [trustType.TrustKey]: `[{
     "trust_name": "my trust",
@@ -463,8 +463,8 @@ export const TRUSTS_SUBMIT_INDIVIDUAL_SA_ADDRESS_PREMISES_TOO_LONG = {
   }]`
 };
 
-export const TRUSTS_SUBMIT_INDIVIDUAL_AND_CORPORATE_NO_ADDRESS_PREMISES = {
-  submit: "submit",
+export const TRUSTS_ADD_INDIVIDUAL_AND_CORPORATE_NO_ADDRESS_PREMISES = {
+  add: "add",
   beneficialOwners: "123",
   [trustType.TrustKey]: `[{
     "trust_name": "my trust",