Merge pull request #321 from kmcwebdev/development

Remove filter for expense_type_id in getAllReimbursementRequest.dto.t…
kmcwebdev · Oct 9, 2023 · 3165bb1 · 3165bb1
2 parents 82460d8 + a5e338e
commit 3165bb1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 35 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
@@ -11,22 +11,6 @@ const GetAllReimbursementRequestSchema = z
       .uuid({
         message: 'reimbursement_type_id must be a valid uuid',
       }),
-    expense_type_id: z
-      .string({
-        description: 'expense_type_id',
-        invalid_type_error: 'expense_type_id must be a string',
-      })
-      .uuid({
-        message: 'expense_type_id must be a valid uuid',
-      }),
-    requestor_id: z
-      .string({
-        description: 'requestor_id',
-        invalid_type_error: 'requestor_id must be a string',
-      })
-      .uuid({
-        message: 'requestor_id must be a valid uuid',
-      }),
     request_status_id: z.array(
       z
         .string({
@@ -61,14 +45,6 @@ const GetAllReimbursementRequestSchema = z
       .positive({
         message: 'amount_max must be a positive number',
       }),
-    date_filed: z
-      .string({
-        description: 'date_filed',
-        invalid_type_error: 'date_filed must be a string',
-      })
-      .datetime({
-        message: 'date_filed must be a valid datetime',
-      }),
     text_search: z
       .string({
         description: 'text_search',
@@ -116,18 +92,17 @@ const GetAllReimbursementRequestSchema = z
       }
 
       if (input?.amount_min && !input?.amount_max) {
-        return false;
+        input.amount_max = 999_999_999;
       }
 
       if (!input?.amount_min && input?.amount_max) {
-        return false;
+        input.amount_min = 1;
       }
 
       return true;
     },
     {
       path: ['amount_min', 'amount_max'],
-      message: 'amount_min must be less than or equal to amount_max',
     },
   );
 

diff --git a/src/finance/services/reimbursement.get-all.service.ts b/src/finance/services/reimbursement.get-all.service.ts
@@ -203,14 +203,6 @@ export class ReimbursementGetAllService {
       );
     }
 
-    if (filter?.expense_type_id) {
-      query = query.where(
-        'finance_reimbursement_requests.expense_type_id',
-        '=',
-        filter.expense_type_id,
-      );
-    }
-
     if (filter?.request_status_id) {
       query = query.where(
         'finance_reimbursement_requests.request_status_id',