PM-1099 - PR feedback: more error handling

Author: vas3a

src/api/repository/paymentMethod.repo.ts

@@ -7,12 +7,12 @@ export class PaymentMethodRepository {
   constructor(private readonly prisma: PrismaService) {}
 
   /**
-   * Check user has verified payment method
+   * Get the user's connected payment method (if there is one)
    *
    * @param userId user id
    * @param tx transaction
    */
-  async hasVerifiedPaymentMethod(
+  async getConnectedPaymentMethod(
     userId: string,
   ): Promise<user_payment_methods | null> {
     const connectedUserPaymentMethod =

src/api/wallet/wallet.service.ts

@@ -39,8 +39,9 @@ export class WalletService {
       const winnings = await this.getWinningsTotalsByWinnerID(userId);
 
       const hasActiveTaxForm = await this.taxFormRepo.hasActiveTaxForm(userId);
-      const hasVerifiedPaymentMethod =
-        await this.paymentMethodRepo.hasVerifiedPaymentMethod(userId);
+      const hasVerifiedPaymentMethod = Boolean(
+        await this.paymentMethodRepo.getConnectedPaymentMethod(userId),
+      );
 
       const winningTotals: WalletDetailDto = {
         account: {
@@ -62,10 +63,10 @@ export class WalletService {
           ],
         },
         withdrawalMethod: {
-          isSetupComplete: Boolean(hasVerifiedPaymentMethod),
+          isSetupComplete: hasVerifiedPaymentMethod,
         },
         taxForm: {
-          isSetupComplete: Boolean(hasActiveTaxForm),
+          isSetupComplete: hasActiveTaxForm,
         },
       };
 

src/api/webhooks/trolley/handlers/payment.handler.ts

@@ -35,6 +35,7 @@ export class PaymentHandler {
       this.logger.error(
         `No valid winning IDs found in the externalId: ${payload.externalId}`,
       );
+      throw new Error('No valid winning IDs found in the externalId!');
     }
 
     if (payload.status !== PaymentProcessedEventStatus.PROCESSED) {

src/api/winnings/winnings.service.ts

@@ -74,7 +74,7 @@ export class WinningsService {
         body.winnerId,
       );
       const hasPaymentMethod =
-        await this.paymentMethodRepo.hasVerifiedPaymentMethod(body.winnerId);
+        await this.paymentMethodRepo.getConnectedPaymentMethod(body.winnerId);
 
       for (const detail of body.details || []) {
         const paymentModel = {

src/api/withdrawal/dto/withdraw.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { ArrayNotEmpty, IsArray, IsNotEmpty, IsString } from 'class-validator';
+import { ArrayNotEmpty, IsArray, IsNotEmpty, IsUUID } from 'class-validator';
 
 export class WithdrawRequestDto {
   @ApiProperty({
@@ -8,7 +8,7 @@ export class WithdrawRequestDto {
   })
   @IsArray()
   @ArrayNotEmpty()
-  @IsString({ each: true })
+  @IsUUID('4',{ each: true })
   @IsNotEmpty({ each: true })
-  paymentIds: string[];
+  winningsIds: string[];
 }

src/api/withdrawal/withdrawal.controller.ts

@@ -54,7 +54,7 @@ export class WithdrawalController {
       await this.withdrawalService.withdraw(
         user.id,
         user.handle,
-        body.paymentIds,
+        body.winningsIds,
       );
       result.status = ResponseStatusType.SUCCESS;
       return result;

src/api/withdrawal/withdrawal.service.ts

@@ -100,10 +100,10 @@ export class WithdrawalService {
       );
     }
 
-    const hasVerifiedPaymentMethod =
-      await this.paymentMethodRepo.hasVerifiedPaymentMethod(userId);
+    const connectedPaymentMethod =
+      await this.paymentMethodRepo.getConnectedPaymentMethod(userId);
 
-    if (!hasVerifiedPaymentMethod) {
+    if (!connectedPaymentMethod) {
       throw new Error(
         'Please add a payment method before making a withdrawal.',
       );
@@ -154,7 +154,7 @@ export class WithdrawalService {
             user_id: userId,
             total_net_amount: totalAmount,
             status: payment_status.PROCESSING,
-            payment_method_id: hasVerifiedPaymentMethod.payment_method_id,
+            payment_method_id: connectedPaymentMethod.payment_method_id,
             payee_id: recipient.trolley_id,
             external_transaction_id: paymentBatch.id,
             payment_release_associations: {
@@ -166,26 +166,29 @@ export class WithdrawalService {
             },
           },
         });
+
+        try {
+          // generate quote
+          await this.trolleyService.client.batch.generateQuote(paymentBatch.id);
+
+          // trigger trolley payment (batch) process
+          await this.trolleyService.client.batch.startProcessing(
+            paymentBatch.id,
+          );
+        } catch (error) {
+          this.logger.error(
+            `Failed to process trolley payment batch: ${error.message}`,
+          );
+          throw new Error('Failed to process trolley payment batch!');
+        }
+
         this.logger.log(
           `Payment release created successfully. ID: ${paymentRelease.payment_release_id}`,
         );
       } catch (error) {
         this.logger.error(`Failed to create payment release: ${error.message}`);
         throw new Error('Failed to create db entry for payment release!');
       }
-
-      try {
-        // generate quote
-        await this.trolleyService.client.batch.generateQuote(paymentBatch.id);
-
-        // trigger trolley payment (batch) process
-        await this.trolleyService.client.batch.startProcessing(paymentBatch.id);
-      } catch (error) {
-        this.logger.error(
-          `Failed to process trolley payment batch: ${error.message}`,
-        );
-        throw new Error('Failed to process trolley payment batch!');
-      }
     });
   }
 }