refactor(business-report): simplify batch report creation logic (#2910)

- Update URL regex pattern for improved validation
- Adjust maximum batch size from 10,000 to 1,000 for better manageability
- Streamline report request transformation for clarity

(your batch size restriction feels like a diet plan that only allows rabbit food)

Author: MatanYadaev

packages/common/src/consts/index.ts

@@ -169,4 +169,4 @@ export const MatchReasonCode = {
 } as const;
 
 export const URL_PATTERN =
-  /^((https?):\/\/)?([\dA-Za-z][\w-]*\.)+[\dA-Za-z]+(\.[a-z]{2})?(\/[\w#.-]+)*(\/)?(\?[\w.-]+=[\w.-]+(&[\w.-]+=[\w.-]+)*)?(#[\w-]+)?$/;
+  /^(https?:\/\/)?((([\da-z]([\da-z-]*[\da-z])*)\.)+[a-z]{2,}|((25[0-5]|2[0-4]\d|1\d{2}|\d{1,2})\.){3}(25[0-5]|2[0-4]\d|1\d{2}|\d{1,2})|localhost)(:\d{1,5})?(\/[\w!$%&'()*+,.:;=@~-]*)*(\?([\w!$%&'()*+,.:;=@~-]+=[\w!$%&'()*+,.:;=@~-]*(&[\w!$%&'()*+,.:;=@~-]+=[\w!$%&'()*+,.:;=@~-]*)*)?)?(#[\w!$%&'()*+,.:;=@~-]*)?$/i;

services/workflows-service/prisma/data-migrations

@@ -5,7 +5,6 @@ import { parseCsv } from '@/common/utils/parse-csv/parse-csv';
 import { BusinessReportRequestSchema } from '@/common/schemas';
 import { PrismaService } from '@/prisma/prisma.service';
 import { BusinessService } from '@/business/business.service';
-import { TReportRequest } from '@/common/utils/unified-api-client/unified-api-client';
 import { env } from '@/env';
 import { randomUUID } from 'crypto';
 import { AppLoggerService } from '@/common/app-logger/app-logger.service';
@@ -122,8 +121,8 @@ export class BusinessReportService {
       );
     }
 
-    if (businessReportsRequests.length > 10000) {
-      throw new UnprocessableEntityException('Batch size is too large, the maximum is 10000');
+    if (businessReportsRequests.length > 1_000) {
+      throw new UnprocessableEntityException('Batch size is too large, the maximum is 1,000');
     }
 
     const batchId = randomUUID();
@@ -160,26 +159,18 @@ export class BusinessReportService {
 
         const businessWithRequests = await Promise.all(businessCreatePromises);
 
-        const businessReportRequests = businessWithRequests.map(
-          ({ businessReportRequest, businessId }) => {
-            return {
-              withQualityControl,
-              websiteUrl: businessReportRequest.websiteUrl,
-              lineOfBusiness: businessReportRequest.lineOfBusiness,
-              parentCompanyName: businessReportRequest.parentCompanyName,
-              callbackUrl: `${env.APP_API_URL}/api/v1/internal/business-reports/hook?businessId=${businessId}`,
-              merchantId: businessId,
-              customerId,
-            };
-          },
-        ) satisfies TReportRequest;
-
         await this.merchantMonitoringClient.createBatch({
-          reportRequests: businessReportRequests,
-          clientName: 'merchant',
-          reportType: type,
-          withQualityControl,
+          customerId,
           workflowVersion,
+          withQualityControl,
+          reportType: type,
+          reports: businessWithRequests.map(({ businessReportRequest, businessId }) => ({
+            businessId,
+            websiteUrl: businessReportRequest.websiteUrl,
+            countryCode: businessReportRequest.countryCode,
+            parentCompanyName: businessReportRequest.parentCompanyName,
+            callbackUrl: `${env.APP_API_URL}/api/v1/internal/business-reports/hook?businessId=${businessId}`,
+          })),
         });
       },
       {

services/workflows-service/src/business-report/business-report.service.ts

@@ -8,6 +8,7 @@ import {
   type MerchantReportType,
   type MerchantReportVersion,
 } from '@/business-report/constants';
+import { Transform } from 'class-transformer';
 
 export class CreateBusinessReportDto {
   @ApiProperty({
@@ -26,6 +27,7 @@ export class CreateBusinessReportDto {
   })
   @MinLength(1)
   @IsString()
+  @Transform(({ value }) => (typeof value === 'string' ? value.toLowerCase() : value))
   websiteUrl!: string;
 
   @ApiProperty({

services/workflows-service/src/business-report/dtos/create-business-report.dto.ts

@@ -6,20 +6,13 @@ import { CountryCode } from '@/common/countries';
 import {
   MERCHANT_REPORT_STATUSES,
   MERCHANT_REPORT_TYPES,
-  MERCHANT_REPORT_TYPES_MAP,
   MERCHANT_REPORT_VERSIONS,
   MerchantReportType,
   MerchantReportVersion,
 } from '@/business-report/constants';
-import { TReportRequest } from '@/common/utils/unified-api-client/unified-api-client';
 import * as errors from '@/errors';
 
 const CreateReportResponseSchema = z.object({});
-const CreateReportBatchResponseSchema = z.array(
-  z.object({
-    reportId: z.string(),
-  }),
-);
 const ReportSchema = z.object({
   id: z.string(),
   websiteId: z.string(),
@@ -121,30 +114,38 @@ export class MerchantMonitoringClient {
   }
 
   public async createBatch({
-    reportRequests,
-    clientName,
-    metadata,
+    customerId,
+    workflowVersion,
     withQualityControl,
-    reportType = MERCHANT_REPORT_TYPES_MAP.MERCHANT_REPORT_T1,
-    workflowVersion = '2',
+    reportType,
+    reports,
   }: {
-    reportRequests: TReportRequest;
-    clientName?: string;
-    reportType?: MerchantReportType;
+    customerId: string;
     workflowVersion?: MerchantReportVersion;
-    metadata?: Record<string, unknown>;
     withQualityControl?: boolean;
+    reportType: MerchantReportType;
+    reports: Array<{
+      businessId: string;
+      websiteUrl: string;
+      countryCode?: string;
+      parentCompanyName?: string;
+      callbackUrl?: string;
+    }>;
   }) {
-    const response = await this.axios.post('merchants/analysis/batch', {
-      reportRequests,
-      clientName,
-      metadata,
-      reportType,
-      withQualityControl,
-      workflowVersion,
-    });
-
-    return CreateReportBatchResponseSchema.parse(response.data);
+    await this.axios.post(
+      'merchants/analysis/batch/next',
+      reports.map(report => ({
+        customerId,
+        merchantId: report.businessId,
+        websiteUrl: report.websiteUrl,
+        countryCode: report.countryCode,
+        parentCompanyName: report.parentCompanyName,
+        callbackUrl: report.callbackUrl,
+        reportType,
+        workflowVersion,
+        withQualityControl,
+      })),
+    );
   }
 
   public async findById({ id, customerId }: { id: string; customerId: string }) {

services/workflows-service/src/business-report/merchant-monitoring-client.ts

@@ -18,7 +18,10 @@ export const InputJsonValueSchema = z.union([
 export const JsonValueSchema = z.union([InputJsonValueSchema, z.null()]);
 
 export const BusinessReportRequestSchema = z.object({
-  websiteUrl: z.string().regex(URL_PATTERN, { message: 'Invalid URL' }),
+  websiteUrl: z
+    .string()
+    .regex(URL_PATTERN, { message: 'Invalid URL' })
+    .transform(value => value.toLowerCase()),
   countryCode: z.string().length(2).optional(),
   lineOfBusiness: z.string().optional(),
   parentCompanyName: z.string().optional(),

services/workflows-service/src/common/schemas.ts

@@ -4,18 +4,6 @@ import { Logger } from '@nestjs/common';
 import { Customer } from '@prisma/client';
 import { TSchema } from '@sinclair/typebox';
 
-export type TReportRequest = Array<{
-  websiteUrl: string;
-  callbackUrl?: string;
-  countryCode?: string;
-  parentCompanyName?: string;
-  lineOfBusiness?: string;
-  merchantName?: string;
-  businessReportId?: string;
-  withQualityControl?: boolean;
-  customerId: string;
-  merchantId: string;
-}>;
 export type TOcrImages = Array<
   | {
       remote: {