Merge pull request #164 from topcoder-platform/dev

Prod deploy for engagements updates

Author: jmgasper

src/api/challenges/challenges.service.spec.ts

@@ -116,4 +116,53 @@ describe('ChallengesService', () => {
       }),
     ]);
   });
+
+  it('maps reviewer payments to TOPGEAR_PAYMENT for topgear challenges', async () => {
+    const service = new ChallengesService(
+      {} as any,
+      {} as any,
+      {} as any,
+      {} as any,
+      {} as any,
+    );
+
+    jest.spyOn(service, 'getChallengeReviews').mockResolvedValue([
+      {
+        phaseId: 'phase-resource-1',
+        phaseName: 'Review',
+        reviewerHandle: 'reviewer1',
+      },
+    ] as any);
+
+    const payments = await service.generateReviewersPayments(
+      {
+        id: '11111111-1111-1111-1111-111111111111',
+        name: 'Topgear Review Challenge',
+        metadata: [{ name: 'payment_type', value: 'topgear' }],
+        prizeSets: [{ type: 'PLACEMENT', prizes: [{ type: PrizeType.USD, value: 500 }] }],
+        reviewers: [
+          {
+            isMemberReview: true,
+            phaseId: 'review-phase-1',
+            fixedAmount: 10,
+            baseCoefficient: 0.1,
+            incrementalCoefficient: 0.05,
+          },
+        ],
+        phases: [{ id: 'phase-resource-1', phaseId: 'review-phase-1' }],
+      } as any,
+      [
+        {
+          memberHandle: 'reviewer1',
+          memberId: 123,
+        },
+      ] as any,
+    );
+
+    expect(payments).toEqual([
+      expect.objectContaining({
+        type: WinningsCategory.TOPGEAR_PAYMENT,
+      }),
+    ]);
+  });
 });

src/api/challenges/challenges.service.ts

@@ -73,7 +73,9 @@ export class ChallengesService {
     private readonly winningsRepo: WinningsRepository,
   ) {}
 
-  private getDefaultWinnerCategory(challenge: Challenge): WinningsCategory {
+  private getMetadataPaymentCategory(
+    challenge: Challenge,
+  ): WinningsCategory | undefined {
     const metadataPaymentCategory = challenge.metadata?.find(
       ({ name, value }) =>
         name?.toLowerCase() === PAYMENT_TYPE_METADATA_NAME &&
@@ -87,11 +89,35 @@ export class ChallengesService {
       ];
     }
 
+    return undefined;
+  }
+
+  private getDefaultWinnerCategory(challenge: Challenge): WinningsCategory {
+    const metadataPaymentCategory = this.getMetadataPaymentCategory(challenge);
+
+    if (metadataPaymentCategory) {
+      return metadataPaymentCategory;
+    }
+
     return challenge.task.isTask
       ? WinningsCategory.TASK_PAYMENT
       : WinningsCategory.CONTEST_PAYMENT;
   }
 
+  private getReviewerPaymentCategory(
+    challenge: Challenge,
+    currency?: PrizeType,
+  ): WinningsCategory {
+    if (currency !== PrizeType.USD) {
+      return WinningsCategory.POINTS_AWARD;
+    }
+
+    return this.getMetadataPaymentCategory(challenge) ===
+      WinningsCategory.TOPGEAR_PAYMENT
+      ? WinningsCategory.TOPGEAR_PAYMENT
+      : WinningsCategory.REVIEW_BOARD_PAYMENT;
+  }
+
   async getChallenge(challengeId: string) {
     if (!isUUID(challengeId)) {
       throw new BadRequestException(
@@ -378,10 +404,10 @@ export class ChallengesService {
 
             const placementPrize = placementPrizes?.[0];
             const currency = placementPrize?.type;
-            const winType =
-              currency === PrizeType.USD
-                ? WinningsCategory.REVIEW_BOARD_PAYMENT
-                : WinningsCategory.POINTS_AWARD;
+            const winType = this.getReviewerPaymentCategory(
+              challenge,
+              currency,
+            );
 
             return {
               handle: reviewer.memberHandle,

src/api/webhooks/trolley/handlers/recipient-account.types.ts

@@ -17,8 +17,7 @@ export interface RecipientAccountEventDataFields {
   deliveryBusinessDaysEstimate: number;
 }
 
-export interface RecipientAccountEventDataWithBankDetails
-  extends RecipientAccountEventDataFields {
+export interface RecipientAccountEventDataWithBankDetails extends RecipientAccountEventDataFields {
   country: string;
   iban: string;
   accountNum: string;
@@ -37,8 +36,7 @@ export interface RecipientAccountEventDataWithBankDetails
   recipientFees: string;
 }
 
-export interface RecipientAccountEventDataWithPaypalDetails
-  extends RecipientAccountEventDataFields {
+export interface RecipientAccountEventDataWithPaypalDetails extends RecipientAccountEventDataFields {
   emailAddress: string;
 }
 

src/api/winnings/winnings.controller.ts

@@ -60,6 +60,11 @@ export class WinningsController {
     description: 'Create winnings successfully.',
     type: ResponseDto<string>,
   })
+  @ApiResponse({
+    status: 400,
+    description:
+      'Invalid winning request or insufficient remaining funds on the billing account.',
+  })
   @HttpCode(HttpStatus.CREATED)
   async createWinnings(
     @Body() body: WinningCreateRequestDto,