Merge pull request #320 from kmcwebdev/development

Add expense type filter to getAllReimbursementRequest endpoint
kmcwebdev · Oct 9, 2023 · 82460d8 · 82460d8
2 parents f9bb0b2 + 396bdc7
commit 82460d8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/finance/common/dto/get-all-reimbursement-request.dto.ts b/src/finance/common/dto/get-all-reimbursement-request.dto.ts
@@ -104,6 +104,7 @@ const GetAllReimbursementRequestSchema = z
       z.boolean().default(false),
     ),
     // TODO: Add message and description for this
+    expense_type_ids: z.string().nonempty(),
     from: z.string().datetime(),
     to: z.string().datetime(),
   })

diff --git a/src/finance/services/reimbursement.get-all.service.ts b/src/finance/services/reimbursement.get-all.service.ts
@@ -225,6 +225,20 @@ export class ReimbursementGetAllService {
       );
     }
 
+    if (filter?.expense_type_ids) {
+      const expenseTypeIds = filter.expense_type_ids
+        .replace(/"/g, '')
+        .split(',');
+
+      // TODO: Do the check here if all items in array is a valid uuid
+
+      query = query.where(
+        'finance_reimbursement_requests.expense_type_id',
+        'in',
+        expenseTypeIds,
+      );
+    }
+
     if (filter?.text_search) {
       query = query.where(
         sql`to_tsvector('english', finance_reimbursement_requests.reference_no || ' ' || coalesce(users.full_name, '') || ' ' || users.email || ' ' ||