PM-1099 - pr feedback

Author: vas3a

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

@@ -1,12 +1,14 @@
 import { Injectable, Logger } from '@nestjs/common';
 import {
   PaymentProcessedEventData,
+  PaymentProcessedEventStatus,
   PaymentWebhookEvent,
 } from './payment.types';
 import { WebhookEvent } from '../../webhooks.decorators';
 import { PaymentsService } from 'src/shared/payments';
 import { payment_status } from '@prisma/client';
 import { PrismaService } from 'src/shared/global/prisma.service';
+import { JsonObject } from '@prisma/client/runtime/library';
 
 @Injectable()
 export class PaymentHandler {
@@ -35,12 +37,13 @@ export class PaymentHandler {
       );
     }
 
-    if (payload.status !== 'processed') {
+    if (payload.status !== PaymentProcessedEventStatus.PROCESSED) {
       await this.updatePaymentStates(
         winningIds,
         externalTransactionId,
         payload.status.toUpperCase() as payment_status,
         payload.status.toUpperCase(),
+        { failureMessage: payload.failureMessage },
       );
 
       return;
@@ -59,9 +62,10 @@ export class PaymentHandler {
     paymentId: string,
     processingState: payment_status,
     releaseState: string,
+    metadata?: JsonObject,
   ): Promise<void> {
-    await this.prisma.$transaction(async (tx) => {
-      try {
+    try {
+      await this.prisma.$transaction(async (tx) => {
         await this.paymentsService.updatePaymentProcessingState(
           winningIds,
           processingState,
@@ -71,13 +75,16 @@ export class PaymentHandler {
         await this.paymentsService.updatePaymentReleaseState(
           paymentId,
           releaseState,
+          tx,
+          metadata,
         );
-      } catch (error) {
-        this.logger.error(
-          `Failed to update payment statuses: ${error.message}`,
-        );
-        throw error;
-      }
-    });
+      });
+    } catch (error) {
+      this.logger.error(
+        `Failed to update payment states for paymentId: ${paymentId}, winnings: ${winningIds.join(',')}, error: ${error.message}`,
+        error.stack,
+      );
+      throw error;
+    }
   }
 }

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

@@ -4,14 +4,20 @@ export enum PaymentWebhookEvent {
   returned = 'payment.returned',
 }
 
+export enum PaymentProcessedEventStatus {
+  PROCESSED = 'processed',
+  FAILED = 'failed',
+  RETURNED = 'returned',
+}
+
 export interface PaymentProcessedEventData {
   id: string;
   recipient: {
     id: string;
     referenceId: string;
     email: string;
   };
-  status: 'processed' | 'failed' | 'returned';
+  status: PaymentProcessedEventStatus;
   externalId?: string;
   sourceAmount: string; // gross amount
   fees: string;

src/api/webhooks/trolley/trolley.service.ts

@@ -20,7 +20,7 @@ if (!trolleyWhHmac) {
  */
 @Injectable()
 export class TrolleyService {
-  private readonly logger = new Logger('Webhooks/TolleyService');
+  private readonly logger = new Logger('Webhooks/TrolleyService');
 
   constructor(
     @Inject('trolleyHandlerFns')

src/api/withdrawal/withdrawal.controller.ts

@@ -40,7 +40,7 @@ export class WithdrawalController {
   })
   @ApiResponse({
     status: 200,
-    description: 'Get wallet detail successfully.',
+    description: 'Operation successful.',
     type: ResponseDto<string>,
   })
   @HttpCode(HttpStatus.OK)

src/api/withdrawal/withdrawal.service.ts

@@ -143,37 +143,49 @@ export class WithdrawalService {
         );
       } catch (e) {
         this.logger.error(
-          `Failed to update payment processing state: ${e.message}`,
+          `Failed to update payment processing state: ${e.message} for winnings '${winningsIds.join(',')}`,
         );
         throw new Error('Failed to update payment processing state!');
       }
 
-      const paymentRelease = await tx.payment_releases.create({
-        data: {
-          user_id: userId,
-          total_net_amount: totalAmount,
-          status: payment_status.PROCESSING,
-          payment_method_id: hasVerifiedPaymentMethod.payment_method_id,
-          payee_id: recipient.trolley_id,
-          external_transaction_id: paymentBatch.id,
-          payment_release_associations: {
-            createMany: {
-              data: winnings.map((w) => ({
-                payment_id: w.paymentId,
-              })),
+      try {
+        const paymentRelease = await tx.payment_releases.create({
+          data: {
+            user_id: userId,
+            total_net_amount: totalAmount,
+            status: payment_status.PROCESSING,
+            payment_method_id: hasVerifiedPaymentMethod.payment_method_id,
+            payee_id: recipient.trolley_id,
+            external_transaction_id: paymentBatch.id,
+            payment_release_associations: {
+              createMany: {
+                data: winnings.map((w) => ({
+                  payment_id: w.paymentId,
+                })),
+              },
             },
           },
-        },
-      });
-      this.logger.log(
-        `Payment release created successfully. ID: ${paymentRelease.payment_release_id}`,
-      );
+        });
+        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!');
+      }
 
-      // generate quote
-      await this.trolleyService.client.batch.generateQuote(paymentBatch.id);
+      try {
+        // generate quote
+        await this.trolleyService.client.batch.generateQuote(paymentBatch.id);
 
-      // trigger trolley payment (batch) process
-      await this.trolleyService.client.batch.startProcessing(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!');
+      }
     });
   }
 }

src/shared/global/trolley.service.ts

@@ -1,7 +1,7 @@
 import url from 'url';
 import crypto from 'crypto';
 import trolley, { Batch } from 'trolleyhq';
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { ENV_CONFIG } from 'src/config';
 
 const TROLLEY_ACCESS_KEY = ENV_CONFIG.TROLLEY_ACCESS_KEY;
@@ -15,6 +15,8 @@ const client = trolley({
 
 @Injectable()
 export class TrolleyService {
+  private readonly logger = new Logger(`global/TrolleyService`);
+
   get client() {
     return client;
   }
@@ -68,9 +70,11 @@ export class TrolleyService {
         [],
       );
 
-      console.info(`Created payment batch with id ${paymentBatch.id}`);
+      this.logger.debug(`Created payment batch with id ${paymentBatch.id}`);
     } catch (e) {
-      console.error(`Failed to create batch payment, error '${e.message}'!`);
+      this.logger.error(
+        `Failed to create batch payment, error '${e.message}'!`,
+      );
       return;
     }
 
@@ -87,11 +91,11 @@ export class TrolleyService {
         externalId: `${winningsIds.join(',')},${Date.now()}`,
       });
 
-      console.info(`Created payment with id ${payment.id}`);
+      this.logger.debug(`Created payment with id ${payment.id}`);
 
       return paymentBatch;
     } catch (e) {
-      console.error(`Failed to create payment, error '${e.message}'!`);
+      this.logger.error(`Failed to create payment, error '${e.message}'!`);
     }
   }
 }

src/shared/payments/payments.service.ts

@@ -1,4 +1,5 @@
 import { Injectable } from '@nestjs/common';
+import { JsonObject } from '@prisma/client/runtime/library';
 import { PrismaService } from '../global/prisma.service';
 import { payment_status, Prisma } from '@prisma/client';
 import { uniq } from 'lodash';
@@ -134,6 +135,7 @@ export class PaymentsService {
     externalTransactionId: string,
     status: string,
     transaction?: Prisma.TransactionClient,
+    metadata?: JsonObject,
   ) {
     const prismaClient = transaction || this.prisma;
     try {
@@ -143,6 +145,7 @@ export class PaymentsService {
         },
         data: {
           status,
+          metadata,
         },
       });