Remove budget approver for engagements

Author: himaniraghav3

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

@@ -87,8 +87,6 @@ describe('AdminService', () => {
     getHandlesByUserIds: jest.Mock;
   };
   let topcoderChallengesService: {
-    findChallengeByProjectAndTitle: jest.Mock;
-    findChallengeIdFromProjectPhases: jest.Mock;
     getChallengeById: jest.Mock;
     getProjectById: jest.Mock;
   };
@@ -138,8 +136,6 @@ describe('AdminService', () => {
       }),
     };
     topcoderChallengesService = {
-      findChallengeByProjectAndTitle: jest.fn().mockResolvedValue(undefined),
-      findChallengeIdFromProjectPhases: jest.fn().mockResolvedValue(undefined),
       getChallengeById: jest.fn().mockResolvedValue(undefined),
       getProjectById: jest.fn().mockResolvedValue(undefined),
     };
@@ -155,178 +151,6 @@ describe('AdminService', () => {
     );
   });
 
-  it('returns engagement budgetApproverHandle from challenge approvalApprovedBy', 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',
-      challengeId: 'da8b0e8b-f56a-419b-9e4e-b8afe06375e2',
-      engagementId: 'engagement-1',
-      engagementTitle: 'Software Developer I',
-      projectId: '100575',
-      projectName: 'Ai Reviewer Wf testing',
-      ratePerHour: '15.5',
-      standardHoursPerWeek: 12,
-      startDate: '2026-04-30T12:00:00.000Z',
-      durationMonths: 1,
-    });
-    topcoderChallengesService.getChallengeById.mockResolvedValue({
-      id: 'da8b0e8b-f56a-419b-9e4e-b8afe06375e2',
-      name: 'Software Developer I',
-      projectId: 100575,
-      approvalApprovedBy: 'kartik',
-    });
-
-    const result = await service.getWinningPaymentDetails(
-      'winning-1',
-      '123456',
-      ['Payment Admin'],
-    );
-
-    expect(topcoderChallengesService.getChallengeById).toHaveBeenCalledWith(
-      'da8b0e8b-f56a-419b-9e4e-b8afe06375e2',
-    );
-    expect(
-      topcoderChallengesService.findChallengeIdFromProjectPhases,
-    ).not.toHaveBeenCalled();
-    expect(result.data?.engagementDetails?.budgetApproverHandle).toBe('kartik');
-  });
-
-  it('returns engagement budgetApproverHandle via project phase challengeGuid', 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: 'Software Developer I',
-      projectId: '100575',
-      ratePerHour: '15.5',
-      standardHoursPerWeek: 12,
-      startDate: '2026-04-30T12:00:00.000Z',
-      durationMonths: 1,
-    });
-    topcoderChallengesService.findChallengeIdFromProjectPhases.mockResolvedValue(
-      'da8b0e8b-f56a-419b-9e4e-b8afe06375e2',
-    );
-    topcoderChallengesService.getChallengeById.mockResolvedValue({
-      id: 'da8b0e8b-f56a-419b-9e4e-b8afe06375e2',
-      name: 'Software Developer I',
-      projectId: 100575,
-      approvalApprovedBy: 'kartik',
-    });
-
-    const result = await service.getWinningPaymentDetails(
-      'winning-1',
-      '123456',
-      ['Payment Admin'],
-    );
-
-    expect(
-      topcoderChallengesService.findChallengeIdFromProjectPhases,
-    ).toHaveBeenCalledWith('100575', 'Software Developer I');
-    expect(topcoderChallengesService.getChallengeById).toHaveBeenCalledWith(
-      'da8b0e8b-f56a-419b-9e4e-b8afe06375e2',
-    );
-    expect(result.data?.engagementDetails?.budgetApproverHandle).toBe('kartik');
-  });
-
-  it('returns engagement budgetApproverHandle via project and title search', 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: 'Software Developer I',
-      projectId: '100575',
-      projectName: 'Ai Reviewer Wf testing',
-      ratePerHour: '15.5',
-      standardHoursPerWeek: 12,
-      startDate: '2026-04-30T12:00:00.000Z',
-      durationMonths: 1,
-    });
-    topcoderChallengesService.findChallengeByProjectAndTitle.mockResolvedValue({
-      id: 'challenge-uuid-1',
-      name: 'Software Developer I',
-      projectId: 100575,
-      approvalApprovedBy: 'kartik',
-    });
-    topcoderChallengesService.getChallengeById.mockResolvedValue({
-      id: 'challenge-uuid-1',
-      name: 'Software Developer I',
-      projectId: 100575,
-      approvalApprovedBy: 'kartik',
-    });
-
-    const result = await service.getWinningPaymentDetails(
-      'winning-1',
-      '123456',
-      ['Payment Admin'],
-    );
-
-    expect(
-      topcoderChallengesService.findChallengeByProjectAndTitle,
-    ).toHaveBeenCalledWith('100575', 'Software Developer I');
-    expect(topcoderChallengesService.getChallengeById).toHaveBeenCalledWith(
-      'challenge-uuid-1',
-    );
-    expect(result.data?.engagementDetails?.budgetApproverHandle).toBe('kartik');
-  });
-
-  it('returns engagement budgetApproverHandle from winnings attributes challengeId', async () => {
-    prisma.winnings.findFirst.mockResolvedValue({
-      winning_id: 'winning-1',
-      category: 'ENGAGEMENT_PAYMENT',
-      created_by: '654321',
-      external_id: 'assignment-1',
-      attributes: {
-        challengeId: 'challenge-uuid-1',
-      },
-    });
-    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,
-    });
-    topcoderChallengesService.getChallengeById.mockResolvedValue({
-      id: 'challenge-uuid-1',
-      name: 'Engagement challenge',
-      projectId: 100575,
-      approvalApprovedBy: 'kartik',
-    });
-
-    const result = await service.getWinningPaymentDetails(
-      'winning-1',
-      '123456',
-      ['Payment Admin'],
-    );
-
-    expect(topcoderChallengesService.getChallengeById).toHaveBeenCalledWith(
-      'challenge-uuid-1',
-    );
-    expect(result.data?.engagementDetails?.budgetApproverHandle).toBe('kartik');
-  });
-
   it('returns paymentApproverHandle for engagement payments from audit trail', async () => {
     prisma.winnings.findFirst.mockResolvedValue({
       winning_id: 'winning-1',

src/api/admin/admin.service.ts

@@ -127,44 +127,6 @@ export class AdminService {
     return Number.isFinite(parsedValue) ? parsedValue : undefined;
   }
 
-  private getWinningChallengeId(
-    winning: Awaited<ReturnType<AdminService['getWinningById']>>,
-    assignmentContext?: { challengeId?: string | null },
-  ): string | undefined {
-    const contextChallengeId = assignmentContext?.challengeId;
-
-    if (contextChallengeId !== undefined && contextChallengeId !== null) {
-      const normalizedContextChallengeId = String(contextChallengeId).trim();
-
-      if (normalizedContextChallengeId) {
-        return normalizedContextChallengeId;
-      }
-    }
-
-    if (
-      !winning?.attributes ||
-      typeof winning.attributes !== 'object' ||
-      Array.isArray(winning.attributes)
-    ) {
-      return undefined;
-    }
-
-    const attributes = winning.attributes as Record<string, unknown>;
-    const challengeId = attributes.challengeId ?? attributes.challengeGuid;
-
-    if (typeof challengeId === 'string') {
-      const normalizedChallengeId = challengeId.trim();
-
-      return normalizedChallengeId || undefined;
-    }
-
-    if (typeof challengeId === 'number' && Number.isFinite(challengeId)) {
-      return String(challengeId);
-    }
-
-    return undefined;
-  }
-
   private getWinningAssignmentId(
     winning: Awaited<ReturnType<AdminService['getWinningById']>>,
   ): string | undefined {
@@ -1214,68 +1176,10 @@ export class AdminService {
     return result;
   }
 
-  /**
-   * Resolves the engagement budget approver from the linked challenge's
-   * `approvalApprovedBy` field (`GET /v6/challenges/{challengeId}`).
-   */
-  private async resolveEngagementBudgetApproverHandle(
-    winning: Awaited<ReturnType<AdminService['getWinningById']>>,
-    engagementLookup?: {
-      challengeId?: string | null;
-      engagementTitle?: string;
-      projectId?: string;
-    },
-  ): Promise<string | undefined> {
-    let challengeId = this.getWinningChallengeId(winning, engagementLookup);
-
-    if (
-      !challengeId &&
-      engagementLookup?.projectId &&
-      engagementLookup?.engagementTitle
-    ) {
-      challengeId =
-        await this.topcoderChallengesService.findChallengeIdFromProjectPhases(
-          engagementLookup.projectId,
-          engagementLookup.engagementTitle,
-        );
-    }
-
-    if (
-      !challengeId &&
-      engagementLookup?.projectId &&
-      engagementLookup?.engagementTitle
-    ) {
-      const challenge =
-        await this.topcoderChallengesService.findChallengeByProjectAndTitle(
-          engagementLookup.projectId,
-          engagementLookup.engagementTitle,
-        );
-      challengeId = challenge?.id;
-    }
-
-    if (!challengeId) {
-      return undefined;
-    }
-
-    try {
-      const challenge =
-        await this.topcoderChallengesService.getChallengeById(challengeId);
-
-      if (!challenge?.approvalApprovedBy) {
-        return undefined;
-      }
-
-      return this.getPaymentCreatorHandle(challenge.approvalApprovedBy);
-    } catch {
-      return undefined;
-    }
-  }
-
   /**
    * 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> {
@@ -1401,12 +1305,6 @@ export class AdminService {
           await this.topcoderEngagementsService.getAssignmentContextById(
             assignmentLookupId,
           );
-        const budgetApproverHandle =
-          await this.resolveEngagementBudgetApproverHandle(
-            winning,
-            assignmentContext,
-          );
-
         result.data.engagementDetails = {
           assignmentId: assignmentContext.assignmentId,
           engagementId: assignmentContext.engagementId,
@@ -1422,7 +1320,6 @@ export class AdminService {
             assignmentContext.standardHoursPerWeek ?? undefined,
           otherRemarks: assignmentContext.otherRemarks ?? undefined,
           paymentApproverHandle,
-          budgetApproverHandle,
         };
 
         return result;
@@ -1447,21 +1344,13 @@ export class AdminService {
         assignmentId,
       );
 
-      const builtEngagementDetails = this.buildEngagementDetailsFromEngagement(
-        engagement,
-        assignment,
-        assignmentId,
-      );
-      const budgetApproverHandle =
-        await this.resolveEngagementBudgetApproverHandle(winning, {
-          engagementTitle: builtEngagementDetails.engagementTitle,
-          projectId: builtEngagementDetails.projectId,
-        });
-
       result.data.engagementDetails = {
-        ...builtEngagementDetails,
+        ...this.buildEngagementDetailsFromEngagement(
+          engagement,
+          assignment,
+          assignmentId,
+        ),
         paymentApproverHandle,
-        budgetApproverHandle,
       };
     } catch (error) {
       this.logger.warn(

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

@@ -67,13 +67,6 @@ export class PaymentEngagementDetailsDto {
     example: 'payment_approver_handle',
   })
   paymentApproverHandle?: string;
-
-  @ApiPropertyOptional({
-    description:
-      'The Topcoder handle of the user who approved the engagement budget (from challenge `approvalApprovedBy`)',
-    example: 'budget_approver_handle',
-  })
-  budgetApproverHandle?: string;
 }
 
 export class PaymentWorkLogDto {