Merge branch 'dev' into sb

ballerine-io · Oct 13, 2024 · 47688f2 · 47688f2
2 parents e49806f + 0f65ddb
commit 47688f2
Showing 1 changed file with 14 additions and 1 deletion.
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
@@ -20,7 +20,7 @@ import {
   ListBusinessReportsDto,
   ListBusinessReportsSchema,
 } from '@/business-report/list-business-reports.dto';
-import { Business, BusinessReportStatus, Prisma } from '@prisma/client';
+import { Business, BusinessReportStatus, BusinessReportType, Prisma } from '@prisma/client';
 import { ZodValidationPipe } from '@/common/pipes/zod.pipe';
 import { CreateBusinessReportDto } from '@/business-report/dto/create-business-report.dto';
 import {
@@ -239,6 +239,19 @@ export class BusinessReportControllerInternal {
       where: {
         businessId,
         batchId,
+        OR: [
+          {
+            type: {
+              not: {
+                equals: BusinessReportType.ONGOING_MERCHANT_REPORT_T1,
+              },
+            },
+          },
+          {
+            type: BusinessReportType.ONGOING_MERCHANT_REPORT_T1,
+            status: BusinessReportStatus.completed,
+          },
+        ],
         ...(type ? { type } : {}),
         ...(search
           ? {