From b60ebf78ccd0d15ff29b9b314a69065d9dd62a40 Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Fri, 30 Dec 2022 10:22:53 -0500
Subject: [PATCH] refactoring

---
 handlers/api-get/milestoneICS.js | 109 +++++++++++++++---------------
 handlers/api-get/milestoneICS.ts | 112 +++++++++++++++----------------
 2 files changed, 109 insertions(+), 112 deletions(-)

diff --git a/handlers/api-get/milestoneICS.js b/handlers/api-get/milestoneICS.js
index 71ff5d6f..311a8f26 100644
--- a/handlers/api-get/milestoneICS.js
+++ b/handlers/api-get/milestoneICS.js
@@ -24,22 +24,20 @@ function buildEventSummary(milestone) {
         (milestone.workOrderMilestoneTypeId
             ? milestone.workOrderMilestoneType
             : milestone.workOrderMilestoneDescription).trim();
-    if (milestone.workOrderLotOccupancies.length > 0) {
-        let occupantCount = 0;
-        for (const lotOccupancy of milestone.workOrderLotOccupancies) {
-            for (const occupant of lotOccupancy.lotOccupancyOccupants) {
-                occupantCount += 1;
-                if (occupantCount === 1) {
-                    if (summary !== "") {
-                        summary += ": ";
-                    }
-                    summary += occupant.occupantName;
+    let occupantCount = 0;
+    for (const lotOccupancy of milestone.workOrderLotOccupancies) {
+        for (const occupant of lotOccupancy.lotOccupancyOccupants) {
+            occupantCount += 1;
+            if (occupantCount === 1) {
+                if (summary !== "") {
+                    summary += ": ";
                 }
+                summary += occupant.occupantName;
             }
         }
-        if (occupantCount > 1) {
-            summary += " plus " + (occupantCount - 1);
-        }
+    }
+    if (occupantCount > 1) {
+        summary += " plus " + (occupantCount - 1);
     }
     return summary;
 }
@@ -47,33 +45,32 @@ function buildEventDescriptionHTML_occupancies(request, milestone) {
     let descriptionHTML = "";
     if (milestone.workOrderLotOccupancies.length > 0) {
         const urlRoot = getUrlRoot(request);
-        descriptionHTML =
-            "<h2>Related " +
-                escapeHTML(configFunctions.getProperty("aliases.occupancies")) +
-                "</h2>" +
-                '<table border="1"><thead><tr>' +
-                ("<th>" + escapeHTML(configFunctions.getProperty("aliases.occupancy")) + " Type</th>") +
-                ("<th>" + escapeHTML(configFunctions.getProperty("aliases.lot")) + "</th>") +
-                "<th>Start Date</th>" +
-                "<th>End Date</th>" +
-                ("<th>" + escapeHTML(configFunctions.getProperty("aliases.occupants")) + "</th>") +
-                "</tr></thead>" +
-                "<tbody>";
+        descriptionHTML = `<h2>
+            Related ${escapeHTML(configFunctions.getProperty("aliases.occupancies"))}
+            </h2>
+            <table border="1">
+            <thead><tr>
+            <th>${escapeHTML(configFunctions.getProperty("aliases.occupancy"))} Type</th>
+            <th>${escapeHTML(configFunctions.getProperty("aliases.lot"))}</th>
+            <th>Start Date</th>
+            <th>End Date</th>
+            <th>${escapeHTML(configFunctions.getProperty("aliases.occupants"))}</th>
+            </tr></thead>
+            <tbody>`;
         for (const occupancy of milestone.workOrderLotOccupancies) {
             descriptionHTML +=
-                "<tr>" +
-                    ("<td>" +
-                        '<a href="' +
-                        urlRoot +
-                        "/lotOccupancies/" +
-                        occupancy.lotOccupancyId +
-                        '">' +
-                        escapeHTML(occupancy.occupancyType) +
-                        "</a></td>") +
-                    ("<td>" +
-                        (occupancy.lotName ? escapeHTML(occupancy.lotName) : "(Not Set)") +
-                        "</td>") +
-                    ("<td>" + occupancy.occupancyStartDateString + "</td>") +
+                `<tr>
+                <td>
+                    <a href="${urlRoot}/lotOccupancies/${occupancy.lotOccupancyId}">
+                    ${escapeHTML(occupancy.occupancyType)}
+                    </a>
+                </td>
+                <td>
+                    ${occupancy.lotName ? escapeHTML(occupancy.lotName) : "(Not Set)"}
+                </td>
+                <td>
+                    ${occupancy.occupancyStartDateString}
+                </td>` +
                     "<td>" +
                     (occupancy.occupancyEndDate ? occupancy.occupancyEndDateString : "(No End Date)") +
                     "</td>" +
@@ -85,7 +82,7 @@ function buildEventDescriptionHTML_occupancies(request, milestone) {
                         escapeHTML(occupant.occupantName) +
                         "<br />";
             }
-            descriptionHTML += "</td>" + "</tr>";
+            descriptionHTML += "</td></tr>";
         }
         descriptionHTML += "</tbody></table>";
     }
@@ -100,9 +97,15 @@ function buildEventDescriptionHTML_lots(request, milestone) {
                 escapeHTML(configFunctions.getProperty("aliases.lots")) +
                 "</h2>" +
                 '<table border="1"><thead><tr>' +
-                ("<th>" + escapeHTML(configFunctions.getProperty("aliases.lot")) + " Type</th>") +
-                ("<th>" + escapeHTML(configFunctions.getProperty("aliases.map")) + "</th>") +
-                ("<th>" + escapeHTML(configFunctions.getProperty("aliases.lot")) + " Type" + "</th>") +
+                `<th>
+                ${escapeHTML(configFunctions.getProperty("aliases.lot"))} Type
+            </th>
+            <th>
+                ${escapeHTML(configFunctions.getProperty("aliases.map"))}
+            </th>
+            <th>
+                ${escapeHTML(configFunctions.getProperty("aliases.lot"))} Type
+            </th>` +
                 "<th>Status</th>" +
                 "</tr></thead>" +
                 "<tbody>";
@@ -117,9 +120,9 @@ function buildEventDescriptionHTML_lots(request, milestone) {
                         '">' +
                         escapeHTML(lot.lotName) +
                         "</a></td>") +
-                    ("<td>" + escapeHTML(lot.mapName) + "</td>") +
-                    ("<td>" + escapeHTML(lot.lotType) + "</td>") +
-                    ("<td>" + escapeHTML(lot.lotStatus) + "</td>") +
+                    `<td>${escapeHTML(lot.mapName)}</td>` +
+                    `<td>${escapeHTML(lot.lotType)}</td>` +
+                    `<td>${escapeHTML(lot.lotStatus)}</td>` +
                     "</tr>";
         }
         descriptionHTML += "</tbody></table>";
@@ -148,15 +151,11 @@ function buildEventDescriptionHTML_prints(request, milestone) {
 }
 function buildEventDescriptionHTML(request, milestone) {
     const workOrderUrl = getWorkOrderUrl(request, milestone);
-    let descriptionHTML = "<h1>Milestone Description</h1>" +
-        "<p>" +
-        escapeHTML(milestone.workOrderMilestoneDescription) +
-        "</p>" +
-        "<h2>Work Order #" +
-        milestone.workOrderNumber +
-        "</h2>" +
-        ("<p>" + escapeHTML(milestone.workOrderDescription) + "</p>") +
-        ("<p>" + workOrderUrl + "</p>");
+    let descriptionHTML = `<h1>Milestone Description</h1>
+        <p>${escapeHTML(milestone.workOrderMilestoneDescription)}</p>
+        <h2>Work Order #${milestone.workOrderNumber}</h2>
+        <p>${escapeHTML(milestone.workOrderDescription)}</p>
+        <p>${workOrderUrl}</p>`;
     descriptionHTML += buildEventDescriptionHTML_occupancies(request, milestone);
     descriptionHTML += buildEventDescriptionHTML_lots(request, milestone);
     descriptionHTML += buildEventDescriptionHTML_prints(request, milestone);
@@ -202,7 +201,7 @@ export const handler = (request, response) => {
         url: urlRoot + "/workOrders"
     });
     if (request.query.workOrderId && workOrderMilestones.length > 0) {
-        calendar.name("Work Order #" + workOrderMilestones[0].workOrderNumber);
+        calendar.name(`Work Order #${workOrderMilestones[0].workOrderNumber}`);
         calendar.url(urlRoot + "/workOrders/" + workOrderMilestones[0].workOrderId);
     }
     calendar.prodId({
diff --git a/handlers/api-get/milestoneICS.ts b/handlers/api-get/milestoneICS.ts
index 08faf237..b1574406 100644
--- a/handlers/api-get/milestoneICS.ts
+++ b/handlers/api-get/milestoneICS.ts
@@ -46,26 +46,24 @@ function buildEventSummary(milestone: recordTypes.WorkOrderMilestone): string {
             : milestone.workOrderMilestoneDescription
         ).trim();
 
-    if (milestone.workOrderLotOccupancies.length > 0) {
-        let occupantCount = 0;
+    let occupantCount = 0;
 
-        for (const lotOccupancy of milestone.workOrderLotOccupancies) {
-            for (const occupant of lotOccupancy.lotOccupancyOccupants) {
-                occupantCount += 1;
+    for (const lotOccupancy of milestone.workOrderLotOccupancies) {
+        for (const occupant of lotOccupancy.lotOccupancyOccupants) {
+            occupantCount += 1;
 
-                if (occupantCount === 1) {
-                    if (summary !== "") {
-                        summary += ": ";
-                    }
-
-                    summary += occupant.occupantName;
+            if (occupantCount === 1) {
+                if (summary !== "") {
+                    summary += ": ";
                 }
+
+                summary += occupant.occupantName;
             }
         }
+    }
 
-        if (occupantCount > 1) {
-            summary += " plus " + (occupantCount - 1);
-        }
+    if (occupantCount > 1) {
+        summary += " plus " + (occupantCount - 1);
     }
 
     return summary;
@@ -80,34 +78,33 @@ function buildEventDescriptionHTML_occupancies(
     if (milestone.workOrderLotOccupancies.length > 0) {
         const urlRoot = getUrlRoot(request);
 
-        descriptionHTML =
-            "<h2>Related " +
-            escapeHTML(configFunctions.getProperty("aliases.occupancies")) +
-            "</h2>" +
-            '<table border="1"><thead><tr>' +
-            ("<th>" + escapeHTML(configFunctions.getProperty("aliases.occupancy")) + " Type</th>") +
-            ("<th>" + escapeHTML(configFunctions.getProperty("aliases.lot")) + "</th>") +
-            "<th>Start Date</th>" +
-            "<th>End Date</th>" +
-            ("<th>" + escapeHTML(configFunctions.getProperty("aliases.occupants")) + "</th>") +
-            "</tr></thead>" +
-            "<tbody>";
+        descriptionHTML = `<h2>
+            Related ${escapeHTML(configFunctions.getProperty("aliases.occupancies"))}
+            </h2>
+            <table border="1">
+            <thead><tr>
+            <th>${escapeHTML(configFunctions.getProperty("aliases.occupancy"))} Type</th>
+            <th>${escapeHTML(configFunctions.getProperty("aliases.lot"))}</th>
+            <th>Start Date</th>
+            <th>End Date</th>
+            <th>${escapeHTML(configFunctions.getProperty("aliases.occupants"))}</th>
+            </tr></thead>
+            <tbody>`;
 
         for (const occupancy of milestone.workOrderLotOccupancies) {
             descriptionHTML +=
-                "<tr>" +
-                ("<td>" +
-                    '<a href="' +
-                    urlRoot +
-                    "/lotOccupancies/" +
-                    occupancy.lotOccupancyId +
-                    '">' +
-                    escapeHTML(occupancy.occupancyType) +
-                    "</a></td>") +
-                ("<td>" +
-                    (occupancy.lotName ? escapeHTML(occupancy.lotName) : "(Not Set)") +
-                    "</td>") +
-                ("<td>" + occupancy.occupancyStartDateString + "</td>") +
+                `<tr>
+                <td>
+                    <a href="${urlRoot}/lotOccupancies/${occupancy.lotOccupancyId}">
+                    ${escapeHTML(occupancy.occupancyType)}
+                    </a>
+                </td>
+                <td>
+                    ${occupancy.lotName ? escapeHTML(occupancy.lotName) : "(Not Set)"}
+                </td>
+                <td>
+                    ${occupancy.occupancyStartDateString}
+                </td>` +
                 "<td>" +
                 (occupancy.occupancyEndDate ? occupancy.occupancyEndDateString : "(No End Date)") +
                 "</td>" +
@@ -121,7 +118,7 @@ function buildEventDescriptionHTML_occupancies(
                     "<br />";
             }
 
-            descriptionHTML += "</td>" + "</tr>";
+            descriptionHTML += "</td></tr>";
         }
 
         descriptionHTML += "</tbody></table>";
@@ -144,9 +141,15 @@ function buildEventDescriptionHTML_lots(
             escapeHTML(configFunctions.getProperty("aliases.lots")) +
             "</h2>" +
             '<table border="1"><thead><tr>' +
-            ("<th>" + escapeHTML(configFunctions.getProperty("aliases.lot")) + " Type</th>") +
-            ("<th>" + escapeHTML(configFunctions.getProperty("aliases.map")) + "</th>") +
-            ("<th>" + escapeHTML(configFunctions.getProperty("aliases.lot")) + " Type" + "</th>") +
+            `<th>
+                ${escapeHTML(configFunctions.getProperty("aliases.lot"))} Type
+            </th>
+            <th>
+                ${escapeHTML(configFunctions.getProperty("aliases.map"))}
+            </th>
+            <th>
+                ${escapeHTML(configFunctions.getProperty("aliases.lot"))} Type
+            </th>` +
             "<th>Status</th>" +
             "</tr></thead>" +
             "<tbody>";
@@ -162,9 +165,9 @@ function buildEventDescriptionHTML_lots(
                     '">' +
                     escapeHTML(lot.lotName) +
                     "</a></td>") +
-                ("<td>" + escapeHTML(lot.mapName) + "</td>") +
-                ("<td>" + escapeHTML(lot.lotType) + "</td>") +
-                ("<td>" + escapeHTML(lot.lotStatus) + "</td>") +
+                `<td>${escapeHTML(lot.mapName)}</td>` +
+                `<td>${escapeHTML(lot.lotType)}</td>` +
+                `<td>${escapeHTML(lot.lotStatus)}</td>` +
                 "</tr>";
         }
 
@@ -210,16 +213,11 @@ function buildEventDescriptionHTML(
 ): string {
     const workOrderUrl = getWorkOrderUrl(request, milestone);
 
-    let descriptionHTML =
-        "<h1>Milestone Description</h1>" +
-        "<p>" +
-        escapeHTML(milestone.workOrderMilestoneDescription) +
-        "</p>" +
-        "<h2>Work Order #" +
-        milestone.workOrderNumber +
-        "</h2>" +
-        ("<p>" + escapeHTML(milestone.workOrderDescription) + "</p>") +
-        ("<p>" + workOrderUrl + "</p>");
+    let descriptionHTML = `<h1>Milestone Description</h1>
+        <p>${escapeHTML(milestone.workOrderMilestoneDescription)}</p>
+        <h2>Work Order #${milestone.workOrderNumber}</h2>
+        <p>${escapeHTML(milestone.workOrderDescription)}</p>
+        <p>${workOrderUrl}</p>`;
 
     descriptionHTML += buildEventDescriptionHTML_occupancies(request, milestone);
     descriptionHTML += buildEventDescriptionHTML_lots(request, milestone);
@@ -286,7 +284,7 @@ export const handler: RequestHandler = (request, response) => {
     });
 
     if (request.query.workOrderId && workOrderMilestones.length > 0) {
-        calendar.name("Work Order #" + workOrderMilestones[0].workOrderNumber);
+        calendar.name(`Work Order #${workOrderMilestones[0].workOrderNumber}`);
         calendar.url(urlRoot + "/workOrders/" + workOrderMilestones[0].workOrderId);
     }