Another fix for ongoing monitoring table (#2779)

* feat: another fix * feat: small fix
ballerine-io · Oct 14, 2024 · 9778125 · 9778125
1 parent 26da716
commit 9778125
Showing 1 changed file with 6 additions and 3 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
@@ -248,6 +248,7 @@ export class BusinessReportControllerInternal {
         status: BusinessReportStatus.completed,
       },
     ];
+
     const args = {
       where: {
         businessId,
@@ -263,10 +264,12 @@ export class BusinessReportControllerInternal {
                   },
                 },
                 { business: { website: { contains: search, mode: QueryMode.Insensitive } } },
-                ...ongoingOrCondition,
               ],
             }
-          : { OR: ongoingOrCondition }),
+          : {}),
+        AND: {
+          OR: ongoingOrCondition,
+        },
       },
       select: {
         id: true,
@@ -290,7 +293,7 @@ export class BusinessReportControllerInternal {
         | undefined,
       take: page.size,
       skip: (page.number - 1) * page.size,
-    };
+    } satisfies Parameters<typeof this.businessReportService.findMany>[0];
 
     const businessReports = await this.businessReportService.findMany(args, [currentProjectId]);