@gov-cy/govcy-express-services 1.3.0-alpha.3 → 1.3.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-express-services",
-  "version": "1.3.0-alpha.3",
+  "version": "1.3.0-alpha.5",
   "description": "An Express-based system that dynamically renders services using @gov-cy/govcy-frontend-renderer and posts data to a submission API.",
   "author": "DMRID - DSF Team",
   "license": "MIT",

package/src/middleware/govcyReviewPostHandler.mjs

@@ -23,11 +23,19 @@ export function govcyReviewPostHandler() {
             // ✅ Load service and check if it exists
             const service = req.serviceData;
             let validationErrors = {};
-
+            // to be used for sending email
+            let updateMyDetailsData = null;
+            
             // Loop through all pages in the service
             for (const page of service.pages) {
                 //get page url
                 const pageUrl = page.pageData.url;
+                
+                // to be used for sending email 
+                // get updateMyDetails data if not found before
+                if (!updateMyDetailsData) {
+                    updateMyDetailsData = dataLayer.getPageUpdateMyDetails(req.session, siteId, pageUrl);
+                }
 
                 // ----- Conditional logic comes here
                 // ✅ Skip validation if page is conditionally excluded
@@ -165,9 +173,22 @@ export function govcyReviewPostHandler() {
                     // Generate the email body
                     let emailBody = generateSubmitEmail(service, submissionData.printFriendlyData, referenceNo, req);
                     logger.debug("Email generated:", emailBody);
+
+                    let emailAddress = "";
+                    // if Update my details not provided the use user email
+                    if (!updateMyDetailsData || !updateMyDetailsData.email) {
+                        emailAddress = dataLayer.getUser(req.session).email;
+                    } else {
+                        emailAddress = updateMyDetailsData.email;
+                    }
+
                     // Send the email
-                    sendEmail(service.site.title[service.site.lang], emailBody, [dataLayer.getUser(req.session).email], "eMail").catch(err => {
-                        logger.error("Email sending failed (async):", err);
+                    sendEmail(
+                        service.site.title[service.site.lang], 
+                        emailBody, 
+                        [emailAddress], 
+                        "eMail").catch(err => {
+                            logger.error("Email sending failed (async):", err);
                     });
                     // --- End of email sending
 

package/src/middleware/govcyUpdateMyDetails.mjs

@@ -162,6 +162,9 @@ export async function govcyUpdateMyDetailsHandler(req, res, next, page, serviceC
             }
         }
 
+        // Deep copy pageTemplate to avoid modifying the original
+        const pageTemplateCopy = JSON.parse(JSON.stringify(pageTemplate));
+
         // if the page variant is 1 or 2 which means it has a form
         if (pageVariant === 1 || pageVariant === 2) {
             // Handle form data
@@ -181,7 +184,7 @@ export async function govcyUpdateMyDetailsHandler(req, res, next, page, serviceC
 
 
             populateFormData(
-                pageTemplate.sections[0].elements[0].params.elements,
+                pageTemplateCopy.sections[0].elements[0].params.elements,
                 theData,
                 validationErrors,
                 req.session,
@@ -194,18 +197,18 @@ export async function govcyUpdateMyDetailsHandler(req, res, next, page, serviceC
 
             // if there are validation errors, add an error summary
             if (validationErrors?.errorSummary?.length > 0) {
-                pageTemplate.sections[0].elements[0].params.elements.unshift(govcyResources.errorSummary(validationErrors.errorSummary));
+                pageTemplateCopy.sections[0].elements[0].params.elements.unshift(govcyResources.errorSummary(validationErrors.errorSummary));
             }
         }
 
         // Add topElements if provided
         if (Array.isArray(umdConfig.topElements)) {
-            pageTemplate.sections[0].elements[0].params.elements.unshift(...umdConfig.topElements);
+            pageTemplateCopy.sections[0].elements[0].params.elements.unshift(...umdConfig.topElements);
         }
 
         //if hasBackLink == true add section beforeMain with backlink element
         if (umdConfig?.hasBackLink == true) {
-            pageTemplate.sections.unshift({
+            pageTemplateCopy.sections.unshift({
                 name: "beforeMain",
                 elements: [
                     {
@@ -226,7 +229,7 @@ export async function govcyUpdateMyDetailsHandler(req, res, next, page, serviceC
                     mainLayout: page?.pageData?.mainLayout || "two-third"
                 }
             },
-            pageTemplate: pageTemplate
+            pageTemplate: pageTemplateCopy
         };
 
         logger.debug("Processed `govcyUpdateMyDetailsHandler` page data:", req.processedPage, req);
@@ -442,12 +445,14 @@ export function govcyUpdateMyDetailsPostHandler() {
                 // --------------- Page variant 1:Manual form for non-eligible users
                 //⤴️ Store validated form data in session
                 dataLayer.storePageData(req.session, siteId, pageUrl, formData);
+                dataLayer.storePageUpdateMyDetails(req.session, siteId, pageUrl, formData);
             } else if (pageVariant === 2) {
                 // --------------- Page variant 2: Confirmation radio for eligible users with data
                 const userChoice = req.body?.useTheseDetails?.trim().toLowerCase();
                 if (userChoice === "yes") {
                     //⤴️ Store validated form data in session
                     dataLayer.storePageData(req.session, siteId, pageUrl, userDetails);
+                    dataLayer.storePageUpdateMyDetails(req.session, siteId, pageUrl, userDetails);
                 } else if (userChoice === "no") {
                     // construct the return url to go to `:siteId/:pageUrl` + `?route=` + `review`
                     const returnUrl = `${req.protocol}://${req.get("host")}${govcyResources.constructPageUrl(siteId, page.pageData.url, (req.query.route === "review" ? "review" : ""))}`;

package/src/utils/govcyDataLayer.mjs

@@ -248,6 +248,34 @@ export function getSiteEligibilityResult(store, siteId, endpointKey, maxAgeMs =
     return entry.result;
 }
 
+/**
+ * Stores the update my details data for contact purposes, outside the scope of formData
+ * 
+ * For example `store.siteData[siteId].inputData[pageUrl]["updateMyDetails"] = value`
+ * 
+ * @param {object} store The session store 
+ * @param {string} siteId The site id
+ * @param {string} pageUrl The page url 
+ * @param {object} userData The user's update my details data 
+ */
+export function storePageUpdateMyDetails(store, siteId, pageUrl, userData) {
+    // Ensure session structure is initialized
+    initializeSiteData(store, siteId, pageUrl);
+
+    store.siteData[siteId].inputData[pageUrl]["updateMyDetails"] = userData;
+}
+
+/**
+ * Get the update my details data for contact purposes, outside the scope of formData 
+ * @param {object} store The session store 
+ * @param {string} siteId The site id
+ * @param {string} pageUrl The page url 
+ * @returns The user's update my details data 
+ */
+export function getPageUpdateMyDetails(store, siteId, pageUrl) {
+    return store?.siteData?.[siteId]?.inputData?.[pageUrl]?.["updateMyDetails"] || null;
+}
+
 /**
  * Get the page validation errors from the store and clear them
  *