From b687e15126af1584013b4bfc00c0e92faf7aa19f Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Mon, 27 Mar 2023 13:55:34 -0400
Subject: [PATCH] avoid unnecessary query

---
 helpers/lotOccupancyDB/getWorkOrders.js | 13 ++++++++-----
 helpers/lotOccupancyDB/getWorkOrders.ts | 21 ++++++++++++---------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/helpers/lotOccupancyDB/getWorkOrders.js b/helpers/lotOccupancyDB/getWorkOrders.js
index caccd19d..10fe30d5 100644
--- a/helpers/lotOccupancyDB/getWorkOrders.js
+++ b/helpers/lotOccupancyDB/getWorkOrders.js
@@ -115,11 +115,14 @@ export async function getWorkOrders(filters, options, connectedDatabase) {
                 workOrder.workOrderLotOccupancies = lotOccupancies.lotOccupancies;
             }
             if (options.includeMilestones ?? false) {
-                workOrder.workOrderMilestones = await getWorkOrderMilestones({
-                    workOrderId: workOrder.workOrderId
-                }, {
-                    orderBy: 'date'
-                }, database);
+                workOrder.workOrderMilestones =
+                    workOrder.workOrderMilestoneCount === 0
+                        ? []
+                        : await getWorkOrderMilestones({
+                            workOrderId: workOrder.workOrderId
+                        }, {
+                            orderBy: 'date'
+                        }, database);
             }
         }
     }
diff --git a/helpers/lotOccupancyDB/getWorkOrders.ts b/helpers/lotOccupancyDB/getWorkOrders.ts
index b1b8a71f..a4b7d63b 100644
--- a/helpers/lotOccupancyDB/getWorkOrders.ts
+++ b/helpers/lotOccupancyDB/getWorkOrders.ts
@@ -191,15 +191,18 @@ export async function getWorkOrders(
       }
 
       if (options.includeMilestones ?? false) {
-        workOrder.workOrderMilestones = await getWorkOrderMilestones(
-          {
-            workOrderId: workOrder.workOrderId
-          },
-          {
-            orderBy: 'date'
-          },
-          database
-        )
+        workOrder.workOrderMilestones =
+          workOrder.workOrderMilestoneCount === 0
+            ? []
+            : await getWorkOrderMilestones(
+                {
+                  workOrderId: workOrder.workOrderId
+                },
+                {
+                  orderBy: 'date'
+                },
+                database
+              )
       }
     }
   }