Review updates

beyondessential · Aug 28, 2024 · ca25267 · ca25267
1 parent 7991e0d
commit ca25267
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/packages/datatrak-web-server/src/routes/TaskMetricsRoute.ts b/packages/datatrak-web-server/src/routes/TaskMetricsRoute.ts
@@ -36,9 +36,9 @@ export class TaskMetricsRoute extends Route<TaskMetricsRequest> {
     const overdueTasks = await models.task.count(
       {
         ...baseQuery,
-        [QUERY_CONJUNCTIONS.RAW]: {
-          sql: `due_date <= ?`,
-          parameters: [new Date().getTime()],
+        due_date: {
+          comparator: '<=',
+          comparisonValue: new Date().getTime(),
         },
       },
       baseJoin,
@@ -48,8 +48,9 @@ export class TaskMetricsRoute extends Route<TaskMetricsRequest> {
       // @ts-ignore
       {
         ...baseQuery,
+        status: TaskStatus.completed,
         [QUERY_CONJUNCTIONS.RAW]: {
-          sql: `(status = 'completed' AND repeat_schedule IS NULL)`,
+          sql: `repeat_schedule IS NULL`,
         },
       },
       {