Merge pull request #375 from kmcwebdev/development

Refactor code to group by reimbursement request ID and return counts …
kmcwebdev · Oct 15, 2023 · abca805 · abca805
2 parents 92e6a1c + 75fa5f4
commit abca805
Showing 1 changed file with 28 additions and 6 deletions.
diff --git a/src/finance/services/reimbursement.analytics.service.ts b/src/finance/services/reimbursement.analytics.service.ts
@@ -118,6 +118,9 @@ export class ReimbursementAnalyticsService {
             '=',
             PENDING_REQUEST,
           )
+          .groupBy(
+            'finance_reimbursement_approval_matrix.reimbursement_request_id',
+          )
           .executeTakeFirst();
 
         const scheduled = await trx
@@ -143,6 +146,9 @@ export class ReimbursementAnalyticsService {
             '=',
             SCHEDULED_REQUEST,
           )
+          .groupBy(
+            'finance_reimbursement_approval_matrix.reimbursement_request_id',
+          )
           .executeTakeFirst();
 
         const unscheduled = await trx
@@ -168,12 +174,17 @@ export class ReimbursementAnalyticsService {
             '=',
             UNSCHEDULED_REQUEST,
           )
+          .groupBy(
+            'finance_reimbursement_approval_matrix.reimbursement_request_id',
+          )
           .executeTakeFirst();
 
         return {
-          pendingApproval,
-          scheduled,
-          unscheduled,
+          pendingApproval: {
+            count: pendingApproval ? pendingApproval.count : 0,
+          },
+          scheduled: { count: scheduled ? scheduled.count : 0 },
+          unscheduled: { count: scheduled ? scheduled.count : 0 },
         };
       });
 
@@ -258,6 +269,9 @@ export class ReimbursementAnalyticsService {
             '=',
             PENDING_REQUEST,
           )
+          .groupBy(
+            'finance_reimbursement_approval_matrix.reimbursement_request_id',
+          )
           .executeTakeFirst();
 
         const scheduled = await trx
@@ -282,6 +296,9 @@ export class ReimbursementAnalyticsService {
             '=',
             SCHEDULED_REQUEST,
           )
+          .groupBy(
+            'finance_reimbursement_approval_matrix.reimbursement_request_id',
+          )
           .executeTakeFirst();
 
         const unscheduled = await trx
@@ -306,12 +323,17 @@ export class ReimbursementAnalyticsService {
             '=',
             UNSCHEDULED_REQUEST,
           )
+          .groupBy(
+            'finance_reimbursement_approval_matrix.reimbursement_request_id',
+          )
           .executeTakeFirst();
 
         return {
-          pendingApproval,
-          scheduled,
-          unscheduled,
+          pendingApproval: {
+            count: pendingApproval ? pendingApproval.count : 0,
+          },
+          scheduled: { count: scheduled ? scheduled.count : 0 },
+          unscheduled: { count: unscheduled ? unscheduled.count : 0 },
         };
       });