Address bug issue

src/main/controllers/features/sole-trader/correspodanceAddressDetailsController.ts

@@ -8,6 +8,7 @@ import { ACSPData } from "../../../model/ACSPData";
 import { Session } from "@companieshouse/node-session-handler";
 import { CORRESPONDENCE_ADDRESS, USER_DATA } from "../../../common/__utils/constants";
 import { saveDataInSession } from "../../../common/__utils/sessionHelper";
+import { CorrespondenceAddressDetailsService } from "../../../services/correspondence-address/address-details";
 
 export const get = async (req: Request, res: Response, next: NextFunction) => {
     const session: Session = req.session as any as Session;
@@ -49,24 +50,10 @@ export const post = async (req: Request, res: Response, next: NextFunction) => {
                 addresses: acspData?.addresses
             });
         } else {
-            const addressList = acspData.addresses!;
-            const selectPremise = req.body.correspondenceAddress;
-            for (const ukAddress of addressList) {
-                if (ukAddress.propertyDetails!.toUpperCase() === selectPremise.toUpperCase()) {
-                    // Save the correspondence address to session
-                    const correspondenceAddress = {
-                        propertyDetails: ukAddress.propertyDetails,
-                        line1: ukAddress.line1,
-                        line2: ukAddress.line2,
-                        town: ukAddress.town,
-                        country: ukAddress.country,
-                        postcode: ukAddress.postcode
-                    };
-                    saveDataInSession(req, CORRESPONDENCE_ADDRESS, correspondenceAddress);
 
-                }
-
-            }
+            const correspondenceAddress = req.body.correspondenceAddress;
+            const addressDetailsService = new CorrespondenceAddressDetailsService();
+            addressDetailsService.saveCorrespondenceDetailsAddress(req, acspData, correspondenceAddress);
             const nextPageUrl = addLangToUrl(BASE_URL + SOLE_TRADER_CORRESPONDENCE_ADDRESS_CONFIRM, lang);
             res.redirect(nextPageUrl);
         }

src/main/controllers/features/sole-trader/correspondenceAddressAutoLookupController.ts

@@ -1,3 +1,4 @@
+
 import { NextFunction, Request, Response } from "express";
 import { ValidationError, validationResult } from "express-validator";
 import { FormattedValidationErrors, formatValidationError } from "../../../validation/validation";
@@ -11,6 +12,7 @@ import { ACSPData } from "../../../model/ACSPData";
 import { Session } from "@companieshouse/node-session-handler";
 import { USER_DATA } from "../../../common/__utils/constants";
 import { saveDataInSession } from "../../../common/__utils/sessionHelper";
+import CorrespondenceAddressAutoLookService from "../../../services/correspondence-address/address-autolookup";
 
 export const get = async (req: Request, res: Response, next: NextFunction) => {
     const session: Session = req.session as any as Session;
@@ -56,60 +58,13 @@ export const post = async (req: Request, res: Response, next: NextFunction) => {
             const correspondencePremise = req.body.premise;
             getAddressFromPostcode(postcode).then((ukAddresses) => {
                 if (correspondencePremise !== "" && ukAddresses.find((address) => address.premise === correspondencePremise)) {
-                    let address = {
-                        premise: "",
-                        addressLine1: "",
-                        addressLine2: "",
-                        postTown: "",
-                        postalCode: "",
-                        country: ""
-                    };
-                    for (const ukAddress of ukAddresses) {
-                        if (ukAddress.premise === correspondencePremise) {
-                            address = {
-                                premise: ukAddress.premise,
-                                addressLine1: ukAddress.addressLine1,
-                                addressLine2: ukAddress.addressLine2!,
-                                postTown: ukAddress.postTown,
-                                postalCode: ukAddress.postcode,
-                                country: getCountryFromKey(ukAddress.country)
-                            };
-                        }
-                    }
-                    // Save the correspondence address to session
-                    const correspondenceAddress : Address = {
-                        propertyDetails: address.premise,
-                        line1: address.addressLine1,
-                        line2: address.addressLine2,
-                        town: address.postTown,
-                        country: address.country,
-                        postcode: address.postalCode
-                    };
-                    const userAddresses : Array<Address> = acspData?.addresses ? acspData.addresses : [];
-                    userAddresses.push(correspondenceAddress);
-                    acspData.addresses = userAddresses;
-                    saveDataInSession(req, USER_DATA, acspData);
-                    res.redirect(BASE_URL + SOLE_TRADER_CORRESPONDENCE_ADDRESS_CONFIRM);
+                    const autoLookupSessionservice = new CorrespondenceAddressAutoLookService();
+                    autoLookupSessionservice.saveCorrespondenceAddress(acspData, ukAddresses, correspondencePremise);
+                    res.redirect(addLangToUrl(BASE_URL + SOLE_TRADER_CORRESPONDENCE_ADDRESS_CONFIRM, lang));
 
                 } else {
-
-                    const addressList : Array<Address> = [];
-                    for (const ukAddress of ukAddresses) {
-                        const address = {
-                            propertyDetails: ukAddress.premise,
-                            line1: ukAddress.addressLine1,
-                            line2: ukAddress.addressLine2,
-                            town: ukAddress.postTown,
-                            country: getCountryFromKey(ukAddress.country),
-                            postcode: ukAddress.postcode,
-                            formattedAddress: ukAddress.premise + ", " + ukAddress.addressLine1 + ", " + ukAddress.postTown + ", " + getCountryFromKey(ukAddress.country) + ", " + ukAddress.postcode
-                        };
-
-                        addressList.push(address);
-
-                    }
-                    acspData.addresses = addressList;
-                    saveDataInSession(req, USER_DATA, acspData);
+                    const autoLookupListservice = new CorrespondenceAddressAutoLookService();
+                    autoLookupListservice.saveAddressListToSession(acspData, ukAddresses);
                     const nextPageUrl = addLangToUrl(BASE_URL + SOLE_TRADER_AUTO_LOOKUP_ADDRESS_LIST, lang);
                     res.redirect(nextPageUrl);
 

src/main/controllers/features/sole-trader/correspondenceAddressConfirmController.ts

@@ -10,8 +10,8 @@ export const get = async (req: Request, res: Response, next: NextFunction) => {
     const lang = selectLang(req.query.lang);
     const locales = getLocalesService();
     const session: Session = req.session as any as Session;
-    const acspData : ACSPData = session?.getExtraData(USER_DATA)!;
 
+    const acspData : ACSPData = session?.getExtraData(USER_DATA)!;
     const { firstName, lastName, addresses } = acspData;
 
     res.render(config.SOLE_TRADER_CORRESPONDENCE_ADDRESS_CONFIRM, {
@@ -22,7 +22,7 @@ export const get = async (req: Request, res: Response, next: NextFunction) => {
         currentUrl: BASE_URL + SOLE_TRADER_CORRESPONDENCE_ADDRESS_CONFIRM,
         firstName,
         lastName,
-        correspondenceAddress: addresses ? [0] : ""
+        correspondenceAddress: addresses ? addresses[0] : ""
     });
 };
 

src/main/controllers/features/sole-trader/correspondenceAddressManualController.ts

@@ -9,6 +9,7 @@ import { ACSPData } from "../../../model/ACSPData";
 import { Session } from "@companieshouse/node-session-handler";
 import { USER_DATA } from "../../../common/__utils/constants";
 import { saveDataInSession } from "../../../common/__utils/sessionHelper";
+import { CorrespondenceAddressManualService } from "../../../services/correspondence-address/address-manual";
 
 export const get = async (req: Request, res: Response, next: NextFunction) => {
     const lang = selectLang(req.query.lang);
@@ -46,21 +47,10 @@ export const post = async (req: Request, res: Response, next: NextFunction) => {
                 lastName: acspData?.lastName
             });
         } else {
-            // Save the correspondence address to session
-            const correspondenceAddress : Address = {
-                propertyDetails: req.body.addressPropertyDetails,
-                line1: req.body.addressLine1,
-                line2: req.body.addressLine2,
-                town: req.body.addressTown,
-                county: req.body.addressCounty,
-                country: req.body.addressCountry,
-                postcode: req.body.addressPostcode
-            };
-            const userAddress : Array<Address> = acspData?.addresses ? acspData.addresses : [];
-            userAddress.push(correspondenceAddress);
-            acspData.addresses = userAddress;
-            saveDataInSession(req, USER_DATA, acspData);
-            res.redirect(BASE_URL + SOLE_TRADER_CORRESPONDENCE_ADDRESS_CONFIRM);
+            const addressManualservice = new CorrespondenceAddressManualService();
+            addressManualservice.saveCorrespondenceManualAddress(req, acspData);
+            res.redirect(addLangToUrl(BASE_URL + SOLE_TRADER_CORRESPONDENCE_ADDRESS_CONFIRM, lang));
+
         }
     } catch (error) {
         next(error);

src/main/services/correspondence-address/address-autolookup.ts

@@ -0,0 +1,64 @@
+import { UKAddress } from "@companieshouse/api-sdk-node/dist/services/postcode-lookup/types";
+import { Session } from "@companieshouse/node-session-handler";
+import { Request } from "express";
+import { ADDRESS_LIST, USER_DATA } from "../../common/__utils/constants";
+import { saveDataInSession } from "../../common/__utils/sessionHelper";
+import { ACSPData } from "../../model/ACSPData";
+import { Address } from "../../model/Address";
+import { getCountryFromKey } from "../../utils/web";
+
+export class CorrespondenceAddressAutoLookService {
+    saveCorrespondenceAddress (acspData :ACSPData, ukAddresses: UKAddress[], inputPremise: string): ACSPData {
+
+        const address = {
+            premise: "",
+            propertyDetails: "",
+            line1: "",
+            line2: "",
+            town: "",
+            country: "",
+            postcode: ""
+        };
+        for (const ukAddress of ukAddresses) {
+            if (ukAddress.premise === inputPremise) {
+                const correspondenceAddress: Address = {
+                    propertyDetails: ukAddress.premise,
+                    // premise: ukAddress.premise,
+                    line1: ukAddress.addressLine1,
+                    line2: ukAddress.addressLine2!,
+                    town: ukAddress.postTown,
+                    country: getCountryFromKey(ukAddress.country),
+                    postcode: ukAddress.postcode
+                };
+
+                acspData.addresses = [correspondenceAddress];
+                break;
+            }
+        }
+        return acspData;
+    }
+
+    saveAddressListToSession (acspData: ACSPData, ukAddresses: UKAddress[]): ACSPData {
+
+        const addressList: Array<Address> = [];
+        for (const ukAddress of ukAddresses) {
+            const address = {
+                propertyDetails: ukAddress.premise,
+                line1: ukAddress.addressLine1,
+                line2: ukAddress.addressLine2,
+                town: ukAddress.postTown,
+                country: getCountryFromKey(ukAddress.country),
+                postcode: ukAddress.postcode,
+                formattedAddress: `${ukAddress.premise}, ${ukAddress.addressLine1}, ${ukAddress.postTown}, ${getCountryFromKey(ukAddress.country)}, ${ukAddress.postcode}`
+            };
+
+            addressList.push(address);
+
+        }
+        // Save the list of addresses to the session
+        acspData.addresses = addressList;
+        return acspData;
+    }
+}
+
+export default CorrespondenceAddressAutoLookService;

src/main/services/correspondence-address/address-details.ts

@@ -0,0 +1,24 @@
+import { Request } from "express";
+import { saveDataInSession } from "../../common/__utils/sessionHelper";
+import { ACSPData } from "../../model/ACSPData";
+import { CORRESPONDENCE_ADDRESS } from "../../common/__utils/constants";
+
+export class CorrespondenceAddressDetailsService {
+    saveCorrespondenceDetailsAddress (req: Request, acspData: ACSPData, selectPremise: string): void {
+        const addressList = acspData.addresses!;
+        for (const ukAddress of addressList) {
+            if (ukAddress.propertyDetails!.toUpperCase() === selectPremise.toUpperCase()) {
+                const correspondenceAddress = {
+                    propertyDetails: ukAddress.propertyDetails,
+                    line1: ukAddress.line1,
+                    line2: ukAddress.line2,
+                    town: ukAddress.town,
+                    country: ukAddress.country,
+                    postcode: ukAddress.postcode
+                };
+                saveDataInSession(req, CORRESPONDENCE_ADDRESS, correspondenceAddress);
+                break;
+            }
+        }
+    }
+}

src/main/services/correspondence-address/address-manual.ts

@@ -0,0 +1,24 @@
+import { Request } from "express";
+import { Address } from "../../model/Address";
+import { ACSPData } from "../../model/ACSPData";
+import { saveDataInSession } from "../../common/__utils/sessionHelper";
+import { USER_DATA } from "../../common/__utils/constants";
+
+export class CorrespondenceAddressManualService {
+    saveCorrespondenceManualAddress (req: Request, acspData: ACSPData): void {
+        const correspondenceAddress: Address = {
+            propertyDetails: req.body.addressPropertyDetails,
+            line1: req.body.addressLine1,
+            line2: req.body.addressLine2,
+            town: req.body.addressTown,
+            county: req.body.addressCounty,
+            country: req.body.addressCountry,
+            postcode: req.body.addressPostcode
+        };
+
+        const userAddress: Array<Address> = acspData?.addresses ? acspData.addresses : [];
+        userAddress.push(correspondenceAddress);
+        acspData.addresses = userAddress;
+        saveDataInSession(req, USER_DATA, acspData);
+    }
+}

src/main/validation/correspondenceAddressAutoLookup.ts

@@ -6,7 +6,7 @@ const addressPostcodevaild:RegExp = /^[A-Za-z0-9\s]*$/;
 
 export const correspondenceAddressAutoLookupValidator = [
 
-    body("postCode").trim().notEmpty().withMessage("correspondenceLookUpAddressNoPostCode").bail()
+    body("postCode").trim().toUpperCase().notEmpty().withMessage("correspondenceLookUpAddressNoPostCode").bail()
         .matches(addressPostcodevaild).withMessage("invalidPostcodeFormat").bail()
         .matches(addressUKPostcodeFormat).withMessage("invalidAddressPostcode").bail()
         .isLength({ min: 5, max: 50 }).withMessage("invalidAddressPostcode"),