feat: small fix for the Ongoing OR condition (#2777)

ballerine-io · Oct 14, 2024 · 04bd1c6 · 04bd1c6
1 parent 58a3373
commit 04bd1c6
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/services/workflows-service/src/business-report/business-report.controller.internal.ts b/services/workflows-service/src/business-report/business-report.controller.internal.ts
@@ -235,23 +235,23 @@ export class BusinessReportControllerInternal {
     @CurrentProject() currentProjectId: TProjectId,
     @Query() { businessId, batchId, page, search, type, orderBy }: ListBusinessReportsDto,
   ) {
+    const ongoingOrCondition = [
+      {
+        type: {
+          not: {
+            equals: BusinessReportType.ONGOING_MERCHANT_REPORT_T1,
+          },
+        },
+      },
+      {
+        type: BusinessReportType.ONGOING_MERCHANT_REPORT_T1,
+        status: BusinessReportStatus.completed,
+      },
+    ];
     const args = {
       where: {
         businessId,
         batchId,
-        OR: [
-          {
-            type: {
-              not: {
-                equals: BusinessReportType.ONGOING_MERCHANT_REPORT_T1,
-              },
-            },
-          },
-          {
-            type: BusinessReportType.ONGOING_MERCHANT_REPORT_T1,
-            status: BusinessReportStatus.completed,
-          },
-        ],
         ...(type ? { type } : {}),
         ...(search
           ? {
@@ -263,9 +263,10 @@ export class BusinessReportControllerInternal {
                   },
                 },
                 { business: { website: { contains: search, mode: QueryMode.Insensitive } } },
+                ...ongoingOrCondition,
               ],
             }
-          : {}),
+          : { OR: ongoingOrCondition }),
       },
       select: {
         id: true,