Merge pull request #185 from topcoder-platform/PM-4981

Pm 4981 Add payment approver for engagements

Author: himaniraghav3

.circleci/config.yml

@@ -76,6 +76,7 @@ workflows:
                               - dev
                               - engagements
                               - PM-4789_payment-migrations
+                              - PM-4981
             - 'build-prod':
                   context: org-global
                   filters:

src/api/admin/admin.service.spec.ts

@@ -151,6 +151,48 @@ describe('AdminService', () => {
     );
   });
 
+  it('returns paymentApproverHandle for engagement payments from audit trail', async () => {
+    prisma.winnings.findFirst.mockResolvedValue({
+      winning_id: 'winning-1',
+      category: 'ENGAGEMENT_PAYMENT',
+      created_by: '654321',
+      external_id: 'assignment-1',
+      attributes: {},
+    });
+    topcoderEngagementsService.getAssignmentContextById.mockResolvedValue({
+      assignmentId: 'assignment-1',
+      engagementId: 'engagement-1',
+      engagementTitle: 'May 19 pvt eng',
+      projectId: '100575',
+      projectName: 'Ai Reviewer Wf testing',
+      ratePerHour: '2.99',
+      standardHoursPerWeek: 11,
+      startDate: '2026-05-23T12:00:00.000Z',
+      durationMonths: 2,
+    });
+    prisma.audit.findMany.mockResolvedValue([
+      {
+        id: 'audit-1',
+        winnings_id: 'winning-1',
+        user_id: '654321',
+        action: 'status updated from ON_HOLD_ADMIN to OWED',
+        note: null,
+        created_at: new Date(),
+      },
+    ]);
+
+    const result = await service.getWinningPaymentDetails(
+      'winning-1',
+      '123456',
+      ['Payment Admin'],
+    );
+
+    expect(result.data?.engagementDetails?.paymentApproverHandle).toBe(
+      'payment-manager',
+    );
+    expect(result.data?.engagementDetails?.assignmentId).toBe('assignment-1');
+  });
+
   it('returns work-log and engagement details for engagement payments', async () => {
     prisma.winnings.findFirst.mockResolvedValue({
       winning_id: 'winning-1',

src/api/admin/admin.service.ts

@@ -1176,6 +1176,38 @@ export class AdminService {
     return result;
   }
 
+  /**
+   * Resolves the payment approver handle from the audit entry that moved the
+   * winning from `ON_HOLD_ADMIN` to `OWED`.
+   */
+  private async resolvePaymentApproverHandleFromAudit(
+    winningsId: string,
+  ): Promise<string | undefined> {
+    try {
+      const audits = await this.prisma.audit.findMany({
+        where: { winnings_id: winningsId },
+        orderBy: { created_at: 'desc' },
+        take: 200,
+      });
+      const approverAudit = audits.find(
+        (audit) =>
+          typeof audit.action === 'string' &&
+          audit.action.includes('ON_HOLD_ADMIN') &&
+          audit.action.includes('OWED') &&
+          audit.action.indexOf('ON_HOLD_ADMIN') < audit.action.indexOf('OWED'),
+      );
+
+      if (!approverAudit?.user_id) {
+        return undefined;
+      }
+
+      return this.getPaymentCreatorHandle(String(approverAudit.user_id));
+    } catch {
+      // approver is optional — ignore failures
+      return undefined;
+    }
+  }
+
   private async buildTaskDetails(
     winningsId: string,
     externalId: string | undefined,
@@ -1209,27 +1241,8 @@ export class AdminService {
       }
     }
 
-    try {
-      const audits = await this.prisma.audit.findMany({
-        where: { winnings_id: winningsId },
-        orderBy: { created_at: 'desc' },
-        take: 200,
-      });
-      const approverAudit = audits.find(
-        (a) =>
-          typeof a.action === 'string' &&
-          a.action.includes('ON_HOLD_ADMIN') &&
-          a.action.includes('OWED') &&
-          a.action.indexOf('ON_HOLD_ADMIN') < a.action.indexOf('OWED'),
-      );
-      if (approverAudit?.user_id) {
-        const userId = String(approverAudit.user_id);
-        const handle = await this.getPaymentCreatorHandle(userId);
-        taskDetails.paymentApproverHandle = handle ?? undefined;
-      }
-    } catch {
-      // approver is optional — ignore failures
-    }
+    taskDetails.paymentApproverHandle =
+      await this.resolvePaymentApproverHandleFromAudit(winningsId);
 
     return taskDetails;
   }
@@ -1283,13 +1296,15 @@ export class AdminService {
       return result;
     }
 
+    const paymentApproverHandle =
+      await this.resolvePaymentApproverHandleFromAudit(winningsId);
+
     if (assignmentLookupId) {
       try {
         const assignmentContext =
           await this.topcoderEngagementsService.getAssignmentContextById(
             assignmentLookupId,
           );
-
         result.data.engagementDetails = {
           assignmentId: assignmentContext.assignmentId,
           engagementId: assignmentContext.engagementId,
@@ -1304,6 +1319,7 @@ export class AdminService {
           standardHoursPerWeek:
             assignmentContext.standardHoursPerWeek ?? undefined,
           otherRemarks: assignmentContext.otherRemarks ?? undefined,
+          paymentApproverHandle,
         };
 
         return result;
@@ -1328,11 +1344,14 @@ export class AdminService {
         assignmentId,
       );
 
-      result.data.engagementDetails = this.buildEngagementDetailsFromEngagement(
-        engagement,
-        assignment,
-        assignmentId,
-      );
+      result.data.engagementDetails = {
+        ...this.buildEngagementDetailsFromEngagement(
+          engagement,
+          assignment,
+          assignmentId,
+        ),
+        paymentApproverHandle,
+      };
     } catch (error) {
       this.logger.warn(
         `Failed to enrich winning ${winningsId} with engagement details`,

src/api/admin/dto/payment-details.dto.ts

@@ -60,6 +60,13 @@ export class PaymentEngagementDetailsDto {
     example: 'Complete onboarding within the first week.',
   })
   otherRemarks?: string;
+
+  @ApiPropertyOptional({
+    description:
+      'The Topcoder handle of the wallet-admin user who approved this payment',
+    example: 'payment_approver_handle',
+  })
+  paymentApproverHandle?: string;
 }
 
 export class PaymentWorkLogDto {