PM-1099 - more logs & make sure transaction is updated

Author: vas3a

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

@@ -27,6 +27,7 @@ export class PaymentHandler {
   ): Promise<any> {
     // TODO: remove slice-1
     const winningIds = (payload.externalId ?? '').split(',').slice(0, -1);
+    const externalTransactionId = payload.batch.id;
 
     if (!winningIds.length) {
       this.logger.error(
@@ -37,17 +38,17 @@ export class PaymentHandler {
     if (payload.status !== 'processed') {
       await this.updatePaymentStates(
         winningIds,
-        payload.id,
-        payment_status.PROCESSING,
-        'FAILED',
+        externalTransactionId,
+        payload.status.toUpperCase() as payment_status,
+        payload.status.toUpperCase(),
       );
 
       return;
     }
 
     await this.updatePaymentStates(
       winningIds,
-      payload.id,
+      externalTransactionId,
       payment_status.PAID,
       'PROCESSED',
     );

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

@@ -18,4 +18,7 @@ export interface PaymentProcessedEventData {
   targetAmount: string; // net amount
   failureMessage: string | null;
   memo: string | null;
+  batch: {
+    id: string;
+  };
 }

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

@@ -1,5 +1,5 @@
 import crypto from 'crypto';
-import { Inject, Injectable } from '@nestjs/common';
+import { Inject, Injectable, Logger } from '@nestjs/common';
 import { trolley_webhook_log, webhook_status } from '@prisma/client';
 import { PrismaService } from 'src/shared/global/prisma.service';
 import { ENV_CONFIG } from 'src/config';
@@ -20,6 +20,8 @@ if (!trolleyWhHmac) {
  */
 @Injectable()
 export class TrolleyService {
+  private readonly logger = new Logger('Webhooks/TolleyService');
+
   constructor(
     @Inject('trolleyHandlerFns')
     private readonly handlers: Map<
@@ -118,22 +120,36 @@ export class TrolleyService {
    */
   async handleEvent(headers: Request['headers'], payload: any) {
     const requestId = headers[TrolleyHeaders.id];
+    this.logger.debug(`Received webhook event with ID: ${requestId}`);
 
     try {
       await this.setEventState(requestId, webhook_status.logged, payload, {
         event_time: headers[TrolleyHeaders.created],
       });
 
       const { model, action, body } = payload;
+      this.logger.debug(`Processing event - ${requestId} - ${model}.${action}`);
+
       const handler = this.handlers.get(`${model}.${action}`);
-      // do nothing if there's no handler for the event (event was logged in db)
       if (!handler) {
+        this.logger.debug(
+          `No handler found for event - ${requestId} - ${model}.${action}. Event logged but not processed.`,
+        );
         return;
       }
 
+      this.logger.debug(
+        `Invoking handler for event - ${requestId} - ${model}.${action}`,
+      );
       await handler(body[model]);
+
+      this.logger.debug(`Successfully processed event with ID: ${requestId}`);
       await this.setEventState(requestId, webhook_status.processed);
     } catch (e) {
+      this.logger.error(
+        `Error processing event with ID: ${requestId} - ${e.message ?? e}`,
+        e.stack,
+      );
       await this.setEventState(requestId, webhook_status.error, void 0, {
         error_message: e.message ?? e,
       });

src/api/withdrawal/withdrawal.service.ts

@@ -155,6 +155,7 @@ export class WithdrawalService {
           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) => ({

src/shared/global/trolley.service.ts

@@ -75,15 +75,6 @@ export class TrolleyService {
     }
 
     try {
-      console.log(paymentBatch.id, {
-        recipient: {
-          id: recipientId,
-        },
-        sourceAmount: totalAmount.toString(),
-        memo: 'Topcoder payment',
-        externalId: `${winningsIds.join(',')}`,
-      });
-
       const payment = await this.client.payment.create(paymentBatch.id, {
         recipient: {
           id: recipientId,

src/shared/payments/payments.service.ts

@@ -120,7 +120,7 @@ export class PaymentsService {
 
       if (r.count === 0 || r.count !== winningsIds.length) {
         throw new Error(
-          'Failed to set payment processing state! Not all rows were updated! Please check the provided winnings IDs and status.',
+          'Not all rows were updated! Please check the provided winnings IDs and status.',
         );
       }
     } catch (error) {
@@ -148,7 +148,7 @@ export class PaymentsService {
 
       if (r.count === 0) {
         throw new Error(
-          'Failed to update payment release status! No rows were updated. Please check the provided externalTransaction ID and status.',
+          'No rows were updated. Please check the provided externalTransaction ID and status.',
         );
       }
     } catch (error) {