From b121aef70f49b7862a4c60393d1c9fd7d5a8d615 Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Wed, 22 Feb 2023 14:52:31 -0500
Subject: [PATCH] check more object properties

---
 handlers/api-get/milestoneICS.js | 13 ++++++++-----
 handlers/api-get/milestoneICS.ts | 27 +++++++++++++++++----------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/handlers/api-get/milestoneICS.js b/handlers/api-get/milestoneICS.js
index 71aab4bd..c5f40cd8 100644
--- a/handlers/api-get/milestoneICS.js
+++ b/handlers/api-get/milestoneICS.js
@@ -22,8 +22,8 @@ function getWorkOrderUrl(request, milestone) {
 function buildEventSummary(milestone) {
     let summary = (milestone.workOrderMilestoneCompletionDate ? '✔ ' : '') +
         ((milestone.workOrderMilestoneTypeId ?? -1) === -1
-            ? (milestone.workOrderMilestoneDescription ?? '')
-            : (milestone.workOrderMilestoneType ?? '')).trim();
+            ? milestone.workOrderMilestoneDescription ?? ''
+            : milestone.workOrderMilestoneType ?? '').trim();
     let occupantCount = 0;
     for (const lotOccupancy of milestone.workOrderLotOccupancies) {
         for (const occupant of lotOccupancy.lotOccupancyOccupants) {
@@ -32,7 +32,10 @@ function buildEventSummary(milestone) {
                 if (summary !== '') {
                     summary += ': ';
                 }
-                summary += (occupant.occupantName ?? '') + ' ' + (occupant.occupantFamilyName ?? '');
+                summary +=
+                    (occupant.occupantName ?? '') +
+                        ' ' +
+                        (occupant.occupantFamilyName ?? '');
             }
         }
     }
@@ -260,13 +263,13 @@ export async function handler(request, response) {
                 for (const occupant of lotOccupancy.lotOccupancyOccupants) {
                     if (organizerSet) {
                         calendarEvent.createAttendee({
-                            name: occupant.occupantName + ' ' + occupant.occupantFamilyName,
+                            name: `${occupant.occupantName ?? ''} ${occupant.occupantFamilyName ?? ''}`,
                             email: configFunctions.getProperty('settings.workOrders.calendarEmailAddress')
                         });
                     }
                     else {
                         calendarEvent.organizer({
-                            name: occupant.occupantName + ' ' + occupant.occupantFamilyName,
+                            name: `${occupant.occupantName ?? ''} ${occupant.occupantFamilyName ?? ''}`,
                             email: configFunctions.getProperty('settings.workOrders.calendarEmailAddress')
                         });
                         organizerSet = true;
diff --git a/handlers/api-get/milestoneICS.ts b/handlers/api-get/milestoneICS.ts
index 8ef2ab47..cd2934dd 100644
--- a/handlers/api-get/milestoneICS.ts
+++ b/handlers/api-get/milestoneICS.ts
@@ -50,8 +50,8 @@ function buildEventSummary(milestone: recordTypes.WorkOrderMilestone): string {
   let summary =
     (milestone.workOrderMilestoneCompletionDate ? '✔ ' : '') +
     ((milestone.workOrderMilestoneTypeId ?? -1) === -1
-      ? (milestone.workOrderMilestoneDescription ?? '')
-      : (milestone.workOrderMilestoneType ?? '')
+      ? milestone.workOrderMilestoneDescription ?? ''
+      : milestone.workOrderMilestoneType ?? ''
     ).trim()
 
   let occupantCount = 0
@@ -65,7 +65,10 @@ function buildEventSummary(milestone: recordTypes.WorkOrderMilestone): string {
           summary += ': '
         }
 
-        summary += (occupant.occupantName ?? '') + ' ' + (occupant.occupantFamilyName ?? '')
+        summary +=
+          (occupant.occupantName ?? '') +
+          ' ' +
+          (occupant.occupantFamilyName ?? '')
       }
     }
   }
@@ -355,12 +358,12 @@ export async function handler(
     // Create event
     const eventData: ICalEventData = {
       start: milestoneDate,
-      created: new Date(milestone.recordCreate_timeMillis),
-      stamp: new Date(milestone.recordCreate_timeMillis),
+      created: new Date(milestone.recordCreate_timeMillis!),
+      stamp: new Date(milestone.recordCreate_timeMillis!),
       lastModified: new Date(
         Math.max(
-          milestone.recordUpdate_timeMillis,
-          milestone.workOrderRecordUpdate_timeMillis
+          milestone.recordUpdate_timeMillis!,
+          milestone.workOrderRecordUpdate_timeMillis!
         )
       ),
       allDay: !milestone.workOrderMilestoneTime,
@@ -406,14 +409,18 @@ export async function handler(
         for (const occupant of lotOccupancy.lotOccupancyOccupants!) {
           if (organizerSet) {
             calendarEvent.createAttendee({
-              name: occupant.occupantName + ' ' + occupant.occupantFamilyName,
+              name: `${occupant.occupantName ?? ''} ${
+                occupant.occupantFamilyName ?? ''
+              }`,
               email: configFunctions.getProperty(
                 'settings.workOrders.calendarEmailAddress'
               )
             })
           } else {
             calendarEvent.organizer({
-              name: occupant.occupantName + ' ' + occupant.occupantFamilyName,
+              name: `${occupant.occupantName ?? ''} ${
+                occupant.occupantFamilyName ?? ''
+              }`,
               email: configFunctions.getProperty(
                 'settings.workOrders.calendarEmailAddress'
               )
@@ -424,7 +431,7 @@ export async function handler(
       }
     } else {
       calendarEvent.organizer({
-        name: milestone.recordCreate_userName,
+        name: milestone.recordCreate_userName!,
         email: configFunctions.getProperty(
           'settings.workOrders.calendarEmailAddress'
         )