Merge branch 'dev' into bal-1950

ballerine-io · May 1, 2024 · 65b597f · 65b597f
2 parents 8e18b93 + 6386367
commit 65b597f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/services/workflows-service/src/errors.ts b/services/workflows-service/src/errors.ts
@@ -84,12 +84,31 @@ export class ValidationError extends common.BadRequestException {
   }
 
   static fromClassValidator(error: ClassValidatorValidationError[]) {
-    const childrens = error[0]?.children ? error[0].children : [];
+    const flattenedErrors = flattenValidationErrors(error);
     return new ValidationError(
-      [...error, ...childrens].map(({ property, constraints = {} }) => ({
+      flattenedErrors.map(({ property, constraints = {}, value }, index) => ({
         message: `${Object.values(constraints).join(', ')}.`,
+        value: index !== 0 ? value : {},
         path: property,
       })),
     );
   }
 }
+
+function flattenValidationErrors(
+  errors: ClassValidatorValidationError[],
+): ClassValidatorValidationError[] {
+  const flattenedErrors: ClassValidatorValidationError[] = [];
+
+  for (const error of errors) {
+    flattenedErrors.push(error);
+
+    if (error.children) {
+      for (const child of error.children) {
+        flattenedErrors.push(...flattenValidationErrors([child]));
+      }
+    }
+  }
+
+  return flattenedErrors;
+}
diff --git a/services/workflows-service/src/transaction/dtos/transaction-create.dto.ts b/services/workflows-service/src/transaction/dtos/transaction-create.dto.ts
@@ -34,7 +34,9 @@ export const AltPaymentBrandNames = {
   SCB_PAYNOW: 'scb_paynow',
   ['China UnionPay']: 'china unionpay',
   ['American Express']: 'american express',
-
+  ['ALIPAYHOST']: 'alipayhost',
+  ['WECHAT']: 'wechathost',
+  ['GRABPAY']: 'grabpay',
   ...PaymentBrandName,
 } as const;
 
@@ -166,9 +168,9 @@ export class TransactionCreateAltDto {
 
   @ApiProperty({ required: true })
   @Transform(({ value }) => value.toLowerCase())
-  @IsEnum(AltPaymentBrandNames)
+  @IsString()
   @IsNotEmpty()
-  tx_product!: AltPaymentBrandNames;
+  tx_product!: string;
 
   @ApiProperty({ required: false })
   @IsString()

diff --git a/services/workflows-service/src/transaction/transaction.mapper.ts b/services/workflows-service/src/transaction/transaction.mapper.ts
@@ -204,6 +204,12 @@ export class TransactionEntityMapper {
           return 'china_union_pay';
         case 'american express':
           return 'american_express';
+        case 'alipayhost':
+          return 'alipay_host';
+        case 'wechathost':
+          return 'wechat_host';
+        case 'grabpay':
+          return 'grab_pay';
         default:
           return undefined;
       }