feat: add CsvItemDto for validation

Author: yunchipang

src/modules/wallet/__tests__/wallet.controller.spec.ts

@@ -201,7 +201,15 @@ describe('WalletController', () => {
       batchCreateWalletDto = {
         sender_wallet: 'sender_wallet_name',
         token_transfer_amount_default: 100,
-        wallet_id: 'parent_wallet_id',
+        wallet_id: 'sender_wallet_id',
+        csvJson: [
+          {
+            wallet_name: 'wallet1',
+            token_transfer_amount_overwrite: 50,
+          },
+          { wallet_name: 'wallet2' },
+        ],
+        filePath: testFilePath,
       };
 
       // Ensure the uploads directory exists and create the mock file

src/modules/wallet/dto/batch-create-wallet.dto.ts

@@ -1,4 +1,13 @@
-import { IsNumber, IsOptional, IsString } from 'class-validator';
+import {
+  IsString,
+  IsArray,
+  IsOptional,
+  ValidateNested,
+  IsNumber,
+  Validate,
+} from 'class-validator';
+import { Type } from 'class-transformer';
+import { UniqueWalletNameConstraint, CsvItemDto } from './csv-item.dto';
 
 export class BatchCreateWalletDto {
   @IsString()
@@ -12,4 +21,14 @@ export class BatchCreateWalletDto {
   @IsString()
   @IsOptional()
   wallet_id: string;
+
+  @IsArray()
+  @Validate(UniqueWalletNameConstraint)
+  @ValidateNested({ each: true })
+  @Type(() => CsvItemDto)
+  csvJson: CsvItemDto[];
+
+  @IsString()
+  @IsOptional()
+  filePath: string;
 }

src/modules/wallet/dto/batch-transfer-wallet.dto.ts

@@ -6,38 +6,9 @@ import {
   IsNotEmpty,
   IsNumber,
   Validate,
-  ValidatorConstraint,
-  ValidatorConstraintInterface,
 } from 'class-validator';
-
 import { Type } from 'class-transformer';
-
-// Custom validator to check for unique `wallet_name` values in the csvJson array
-@ValidatorConstraint({ async: false })
-class UniqueWalletNameConstraint implements ValidatorConstraintInterface {
-  validate(csvJson: CsvJsonDto[]): boolean {
-    const walletNames = csvJson.map((item) => item.wallet_name);
-    return walletNames.length === new Set(walletNames).size;
-  }
-
-  defaultMessage(): string {
-    return 'Each wallet_name in csvJson must be unique.';
-  }
-}
-
-class CsvJsonDto {
-  @IsString()
-  @IsNotEmpty()
-  wallet_name: string;
-
-  @IsOptional()
-  @IsNumber()
-  token_transfer_amount_overwrite?: number;
-
-  @IsOptional()
-  @IsString()
-  extra_wallet_data_about?: string;
-}
+import { UniqueWalletNameConstraint, CsvItemDto } from './csv-item.dto';
 
 export class BatchTransferWalletDto {
   @IsString()
@@ -55,8 +26,8 @@ export class BatchTransferWalletDto {
   @IsArray()
   @Validate(UniqueWalletNameConstraint)
   @ValidateNested({ each: true })
-  @Type(() => CsvJsonDto)
-  csvJson: CsvJsonDto[];
+  @Type(() => CsvItemDto)
+  csvJson: CsvItemDto[];
 
   @IsString()
   @IsOptional()

src/modules/wallet/dto/csv-item.dto.ts

@@ -0,0 +1,37 @@
+import {
+  IsString,
+  IsOptional,
+  IsNotEmpty,
+  IsNumber,
+  ValidatorConstraint,
+  ValidatorConstraintInterface,
+} from 'class-validator';
+
+// Custom validator to check for unique `wallet_name` values in the csvJson array
+@ValidatorConstraint({ async: false })
+export class UniqueWalletNameConstraint
+  implements ValidatorConstraintInterface
+{
+  validate(csvJson: CsvItemDto[]): boolean {
+    const walletNames = csvJson.map((item) => item.wallet_name);
+    return walletNames.length === new Set(walletNames).size;
+  }
+
+  defaultMessage(): string {
+    return 'Each wallet_name in csvJson must be unique.';
+  }
+}
+
+export class CsvItemDto {
+  @IsString()
+  @IsNotEmpty()
+  wallet_name: string;
+
+  @IsOptional()
+  @IsNumber()
+  token_transfer_amount_overwrite?: number;
+
+  @IsOptional()
+  @IsString()
+  extra_wallet_data_about?: string;
+}

src/modules/wallet/wallet.controller.ts

@@ -10,6 +10,8 @@ import {
   UploadedFile,
   UploadedFiles,
   UseInterceptors,
+  UsePipes,
+  ValidationPipe,
 } from '@nestjs/common';
 import { WalletService } from './wallet.service';
 import { TrustService } from '../trust/trust.service';
@@ -87,20 +89,30 @@ export class WalletController {
 
   @Post('batch-create-wallet')
   @UseInterceptors(CsvFileUploadInterceptor())
+  @UsePipes(new ValidationPipe({ transform: true }))
   async batchCreateWallet(
     @Body() batchCreateWalletDto: BatchCreateWalletDto,
     @UploadedFile() file: Express.Multer.File,
   ) {
-    const { sender_wallet, token_transfer_amount_default, wallet_id } =
-      batchCreateWalletDto;
+    const { path } = file;
+    const csvJson = await csvtojson().fromFile(path);
+    batchCreateWalletDto.csvJson = csvJson;
+    batchCreateWalletDto.filePath = path;
 
-    const csvJson = await csvtojson().fromFile(file.path);
-    return this.walletService.batchCreateWallet(
+    const {
       sender_wallet,
       token_transfer_amount_default,
       wallet_id,
-      csvJson,
-      file.path,
+      csvJson: validatedCsvJson,
+      filePath,
+    } = batchCreateWalletDto;
+
+    return await this.walletService.batchCreateWallet(
+      sender_wallet,
+      token_transfer_amount_default,
+      wallet_id,
+      validatedCsvJson,
+      filePath,
     );
   }
 
@@ -110,16 +122,25 @@ export class WalletController {
     @Body() batchTransferWalletDto: BatchTransferWalletDto,
     @UploadedFile() file: Express.Multer.File,
   ) {
-    const { sender_wallet, token_transfer_amount_default, wallet_id } =
-      batchTransferWalletDto;
+    const { path } = file;
+    const csvJson = await csvtojson().fromFile(path);
+    batchTransferWalletDto.csvJson = csvJson;
+    batchTransferWalletDto.filePath = path;
+
+    const {
+      sender_wallet,
+      token_transfer_amount_default,
+      wallet_id,
+      csvJson: validatedCsvJson,
+      filePath,
+    } = batchTransferWalletDto;
 
-    const csvJson = await csvtojson().fromFile(file.path);
-    return this.walletService.batchTransferWallet(
+    return await this.walletService.batchTransferWallet(
       sender_wallet,
       token_transfer_amount_default,
       wallet_id,
-      csvJson,
-      file.path,
+      validatedCsvJson,
+      filePath,
     );
   }
 }