Merge pull request #319 from kmcwebdev/development

Add date range filter to getAllReimbursementRequest endpoint
kmcwebdev · Oct 9, 2023 · f9bb0b2 · f9bb0b2
2 parents e90e161 + dfa9412
commit f9bb0b2
Show file tree

Hide file tree

Showing 2 changed files with 11 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
@@ -103,6 +103,9 @@ const GetAllReimbursementRequestSchema = z
       (val) => (val === 'true' ? true : false),
       z.boolean().default(false),
     ),
+    // TODO: Add message and description for this
+    from: z.string().datetime(),
+    to: z.string().datetime(),
   })
   .partial()
   .refine(

diff --git a/src/finance/services/reimbursement.get-all.service.ts b/src/finance/services/reimbursement.get-all.service.ts
@@ -232,6 +232,14 @@ export class ReimbursementGetAllService {
       );
     }
 
+    if (filter?.from && filter?.to) {
+      const { from, to } = filter;
+
+      query = query.where(
+        sql`DATE(finance_reimbursement_requests.created_at) BETWEEN ${from} AND ${to}`,
+      );
+    }
+
     return await query
       .orderBy('finance_reimbursement_requests.created_at', 'desc')
       .limit(default_page_limit || filter?.page_limit)