Merge branch 'v6' of github.com:topcoder-platform/tc-finance-api into PM-2087_use-v6-apis

Author: vas3a

prisma/migrations/20250929082539_remove_rewards_table/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - You are about to drop the `reward` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE "reward" DROP CONSTRAINT "reward_winnings_id_fkey";
+
+-- DropTable
+DROP TABLE "reward";

prisma/migrations/20250929082731_drop_payoneer_paypal_payment_methods/migration.sql

@@ -0,0 +1,18 @@
+/*
+  Warnings:
+
+  - You are about to drop the `payoneer_payment_method` table. If the table is not empty, all the data it contains will be lost.
+  - You are about to drop the `paypal_payment_method` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE "payoneer_payment_method" DROP CONSTRAINT "fk_payoneer_user_payment_method";
+
+-- DropForeignKey
+ALTER TABLE "paypal_payment_method" DROP CONSTRAINT "fk_paypal_user_payment_method";
+
+-- DropTable
+DROP TABLE "payoneer_payment_method";
+
+-- DropTable
+DROP TABLE "paypal_payment_method";

prisma/migrations/20251021125143_add_payments_winnings_indexes/migration.sql

@@ -0,0 +1,12 @@
+CREATE INDEX idx_payment_installment_number ON payment USING btree (installment_number);
+CREATE INDEX idx_payment_installment_status_version ON payment USING btree (installment_number, payment_status, winnings_id, version DESC);
+CREATE INDEX idx_payment_status_winnings ON payment USING btree (payment_status, winnings_id);
+CREATE INDEX idx_payment_win_inst_status ON payment USING btree (winnings_id, installment_number, payment_status);
+CREATE INDEX idx_payment_winnings_id ON payment USING btree (winnings_id);
+CREATE INDEX idx_payment_winnings_installment ON payment USING btree (winnings_id, installment_number);
+CREATE INDEX idx_payment_winnings_installment1_status ON payment USING btree (winnings_id, payment_status) WHERE (installment_number = 1);
+CREATE INDEX idx_winnings_category_created_at ON winnings USING btree (category, created_at DESC);
+CREATE INDEX idx_winnings_created_at ON winnings USING btree (created_at DESC);
+CREATE INDEX idx_winnings_external_id ON winnings USING btree (external_id) WHERE (external_id IS NOT NULL);
+CREATE INDEX idx_winnings_winner_created_at ON winnings USING btree (winner_id, created_at DESC);
+CREATE INDEX idx_winnings_winner_id_only ON winnings USING btree (winner_id) INCLUDE (winning_id);

prisma/schema.prisma

@@ -59,6 +59,13 @@ model payment {
   payment_method               payment_method?                @relation(fields: [payment_method_id], references: [payment_method_id], onDelete: NoAction, onUpdate: NoAction)
   winnings                     winnings                       @relation(fields: [winnings_id], references: [winning_id], onDelete: NoAction, onUpdate: NoAction)
   payment_release_associations payment_release_associations[]
+
+  @@index([installment_number], map: "idx_payment_installment_number")
+  @@index([installment_number, payment_status, winnings_id, version(sort: Desc)], map: "idx_payment_installment_status_version")
+  @@index([payment_status, winnings_id], map: "idx_payment_status_winnings")
+  @@index([winnings_id, installment_number, payment_status], map: "idx_payment_win_inst_status")
+  @@index([winnings_id], map: "idx_payment_winnings_id")
+  @@index([winnings_id, installment_number], map: "idx_payment_winnings_installment")
 }
 
 model payment_method {
@@ -96,45 +103,11 @@ model payment_releases {
   payment_method               payment_method                 @relation(fields: [payment_method_id], references: [payment_method_id], onDelete: NoAction, onUpdate: NoAction)
 }
 
-model payoneer_payment_method {
-  id                     Int                  @id @default(autoincrement())
-  user_payment_method_id String?               @db.Uuid
-  user_id                String               @unique @db.VarChar(80)
-  payee_id               String               @db.VarChar(50)
-  payoneer_id            String?              @db.VarChar(50)
-  user_payment_methods   user_payment_methods? @relation(fields: [user_payment_method_id], references: [id], onDelete: Cascade, onUpdate: NoAction, map: "fk_payoneer_user_payment_method")
-}
-
-model paypal_payment_method {
-  id                     Int                  @id @default(autoincrement())
-  user_payment_method_id String?               @db.Uuid
-  user_id                String               @unique @db.VarChar(80)
-  email                  String?              @db.VarChar(150)
-  payer_id               String?              @db.VarChar(50)
-  country_code           String?              @db.VarChar(2)
-  user_payment_methods   user_payment_methods? @relation(fields: [user_payment_method_id], references: [id], onDelete: Cascade, onUpdate: NoAction, map: "fk_paypal_user_payment_method")
-}
-
-model reward {
-  reward_id   String    @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
-  winnings_id String    @db.Uuid
-  points      Int?
-  title       String?   @db.VarChar(255)
-  description String?
-  reference   Json?
-  attributes  Json?
-  created_at  DateTime? @default(now()) @db.Timestamp(6)
-  updated_at  DateTime? @default(now()) @db.Timestamp(6)
-  winnings    winnings  @relation(fields: [winnings_id], references: [winning_id], onDelete: NoAction, onUpdate: NoAction)
-}
-
 model user_payment_methods {
   id                      String                    @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
   user_id                 String                    @db.VarChar(80)
   payment_method_id       Int
   status                  payment_method_status?    @default(OTP_PENDING)
-  payoneer_payment_method payoneer_payment_method[]
-  paypal_payment_method   paypal_payment_method[]
   trolley_payment_method  trolley_recipient[]
   payment_method          payment_method            @relation(fields: [payment_method_id], references: [payment_method_id], onDelete: NoAction, onUpdate: NoAction, map: "fk_user_payment_method")
 
@@ -165,8 +138,12 @@ model winnings {
   updated_at  DateTime?          @default(now()) @db.Timestamp(6)
   audit       audit[]
   payment     payment[]
-  reward      reward[]
   origin      origin?            @relation(fields: [origin_id], references: [origin_id], onDelete: NoAction, onUpdate: NoAction)
+
+  @@index([category, created_at(sort: Desc)], map: "idx_winnings_category_created_at")
+  @@index([created_at(sort: Desc)], map: "idx_winnings_created_at")
+  @@index([winner_id, created_at(sort: Desc)], map: "idx_winnings_winner_created_at")
+  @@index([winner_id, winning_id], map: "idx_winnings_winner_id_only")
 }
 
 model trolley_recipient {

src/api/challenges/challenges.service.ts

@@ -1,8 +1,13 @@
-import { includes, isEmpty, sortBy, find, camelCase, groupBy } from 'lodash';
+import { includes, isEmpty, find, camelCase, groupBy, orderBy } from 'lodash';
 import { Injectable } from '@nestjs/common';
 import { ENV_CONFIG } from 'src/config';
 import { Logger } from 'src/shared/global';
-import { Challenge, ChallengeResource, ResourceRole } from './models';
+import {
+  Challenge,
+  ChallengeResource,
+  ChallengeSubmission,
+  ResourceRole,
+} from './models';
 import { BillingAccountsService } from 'src/shared/topcoder/billing-accounts.service';
 import { TopcoderM2MService } from 'src/shared/topcoder/topcoder-m2m.service';
 import { ChallengeStatuses } from 'src/dto/challenge.dto';
@@ -40,7 +45,6 @@ export class ChallengesService {
 
     try {
       const challenge = await this.m2MService.m2mFetch<Challenge>(requestUrl);
-      this.logger.log(JSON.stringify(challenge, null, 2));
       return challenge;
     } catch (e) {
       this.logger.error(
@@ -50,6 +54,24 @@ export class ChallengesService {
     }
   }
 
+  async getChallengeSubmissionsCount(challengeId: string) {
+    const requestUrl = `${TC_API_BASE}/submissions?challengeId=${challengeId}&perPage=9999`;
+
+    try {
+      const submissions =
+        await this.m2MService.m2mFetch<ChallengeSubmission[]>(requestUrl);
+      const uniqueSubmissions = Object.fromEntries(
+        submissions.map((s) => [s.memberId, s]),
+      );
+      return Object.keys(uniqueSubmissions).length;
+    } catch (e) {
+      this.logger.error(
+        `Challenge submissions couldn't be fetched for challenge ${challengeId}!`,
+        e,
+      );
+    }
+  }
+
   async getChallengeResources(challengeId: string) {
     try {
       const resources = await this.m2MService.m2mFetch<ChallengeResource[]>(
@@ -97,36 +119,43 @@ export class ChallengesService {
     }[];
 
     const { prizeSets, winners, reviewers } = challenge;
+    const isCancelledFailedReview =
+      challenge.status.toLowerCase() ===
+      ChallengeStatuses.CancelledFailedReview.toLowerCase();
 
     // generate placement payments
-    const placementPrizes = sortBy(
+    const placementPrizes = orderBy(
       find(prizeSets, { type: 'PLACEMENT' })?.prizes,
       'value',
+      'desc',
     );
-    if (placementPrizes.length < winners.length) {
-      throw new Error(
-        'Task has incorrect number of placement prizes! There are more winners than prizes!',
-      );
-    }
 
-    winners.forEach((winner) => {
-      payments.push({
-        handle: winner.handle,
-        amount: placementPrizes[winner.placement - 1].value,
-        userId: winner.userId.toString(),
-        type: challenge.task.isTask
-          ? WinningsCategory.TASK_PAYMENT
-          : WinningsCategory.CONTEST_PAYMENT,
-        description:
-          challenge.type === 'Task'
-            ? challenge.name
-            : `${challenge.name} - ${placeToOrdinal(winner.placement)} Place`,
+    if (!isCancelledFailedReview) {
+      if (placementPrizes.length < winners.length) {
+        throw new Error(
+          'Task has incorrect number of placement prizes! There are more winners than prizes!',
+        );
+      }
+
+      winners.forEach((winner) => {
+        payments.push({
+          handle: winner.handle,
+          amount: placementPrizes[winner.placement - 1].value,
+          userId: winner.userId.toString(),
+          type: challenge.task.isTask
+            ? WinningsCategory.TASK_PAYMENT
+            : WinningsCategory.CONTEST_PAYMENT,
+          description:
+            challenge.type === 'Task'
+              ? challenge.name
+              : `${challenge.name} - ${placeToOrdinal(winner.placement)} Place`,
+        });
       });
-    });
+    }
 
     // generate copilot payments
     const copilotPrizes = find(prizeSets, { type: 'COPILOT' })?.prizes ?? [];
-    if (copilotPrizes.length) {
+    if (copilotPrizes.length && !isCancelledFailedReview) {
       const copilots = challengeResources.copilot;
 
       if (!copilots?.length) {
@@ -144,19 +173,22 @@ export class ChallengesService {
     }
 
     // generate reviewer payments
-    const firstPlacePrize = placementPrizes[0].value;
+    const firstPlacePrize = placementPrizes?.[0]?.value ?? 0;
     const challengeReviewer = find(reviewers, { isMemberReview: true });
+    const numOfSubmissions =
+      (await this.getChallengeSubmissionsCount(challenge.id)) ?? 1;
 
     if (challengeReviewer && challengeResources.reviewer) {
       challengeResources.reviewer?.forEach((reviewer) => {
         payments.push({
           handle: reviewer.memberHandle,
           userId: reviewer.memberId.toString(),
           amount: Math.round(
-            (challengeReviewer.basePayment ?? 0) +
-              (challengeReviewer.incrementalPayment ?? 0) *
-                challenge.numOfSubmissions *
-                firstPlacePrize,
+            (challengeReviewer.fixedAmount ?? 0) +
+              (challengeReviewer.baseCoefficient ?? 0) * firstPlacePrize +
+              (challengeReviewer.incrementalCoefficient ?? 0) *
+                firstPlacePrize *
+                numOfSubmissions,
           ),
           type: WinningsCategory.REVIEW_BOARD_PAYMENT,
         });
@@ -202,18 +234,18 @@ export class ChallengesService {
       throw new Error('Challenge not found!');
     }
 
-    if (
-      challenge.status.toLowerCase() !==
-      ChallengeStatuses.Completed.toLowerCase()
-    ) {
-      throw new Error("Challenge isn't completed yet!");
+    const allowedStatuses = [
+      ChallengeStatuses.Completed.toLowerCase(),
+      ChallengeStatuses.CancelledFailedReview.toLowerCase(),
+    ];
+
+    if (!allowedStatuses.includes(challenge.status.toLowerCase())) {
+      throw new Error("Challenge isn't in a payable status!");
     }
 
     const existingPayments = (
       await this.winningsRepo.searchWinnings({
         externalIds: [challengeId],
-        limit: 1,
-        offset: 0,
       } as WinningRequestDto)
     )?.data?.winnings;
     if (existingPayments?.length > 0) {
@@ -244,9 +276,16 @@ export class ChallengesService {
     }
 
     await Promise.all(
-      payments.map((p) =>
-        this.winningsService.createWinningWithPayments(p, userId),
-      ),
+      payments.map(async (p) => {
+        try {
+          await this.winningsService.createWinningWithPayments(p, userId);
+        } catch (e) {
+          this.logger.log(
+            `Failed to create winnings payment for user ${p.winnerId}!`,
+            e,
+          );
+        }
+      }),
     );
 
     this.logger.log('Task Completed. locking consumed budget', baValidation);

src/api/challenges/models/challenge.ts

@@ -126,8 +126,9 @@ export interface Reviewer {
   scorecardId: string;
   isMemberReview: boolean;
   memberReviewerCount?: number;
-  basePayment?: number;
-  incrementalPayment?: number;
+  baseCoefficient?: number;
+  incrementalCoefficient?: number;
+  fixedAmount?: number;
   isAIReviewer: boolean;
 }
 
@@ -141,3 +142,9 @@ export interface ResourceRole {
   id: string;
   name: string;
 }
+
+export interface ChallengeSubmission {
+  id: string;
+  memberId: string;
+  type: 'CONTEST_SUBMISSION';
+}

src/api/wallet/wallet.service.ts

@@ -133,7 +133,6 @@ export class WalletService {
         w.type AS payment_type,
         CASE
           WHEN w.type = 'PAYMENT' THEN SUM(p.total_amount)
-          WHEN w.type = 'REWARD' THEN SUM(r.points)
           ELSE 0
         END AS total_owed
       FROM
@@ -144,7 +143,6 @@ export class WalletService {
         AND p.installment_number = 1
         INNER JOIN latest_payment_version lpv ON p.winnings_id = lpv.winnings_id
         AND p.version = lpv.max_version
-        LEFT JOIN reward r ON w.winning_id = r.winnings_id
         AND w.type = 'REWARD'
       WHERE
         w.winner_id = ${winnerId}

src/api/winnings/winnings.controller.ts

@@ -7,8 +7,8 @@ import {
   ApiBearerAuth,
 } from '@nestjs/swagger';
 
-import { M2mScope } from 'src/core/auth/auth.constants';
-import { M2M, AllowedM2mScope, User } from 'src/core/auth/decorators';
+import { M2mScope, Role } from 'src/core/auth/auth.constants';
+import { AllowedM2mScope, User, Roles, M2M } from 'src/core/auth/decorators';
 import { ResponseDto, ResponseStatusType } from 'src/dto/api-response.dto';
 import { UserInfo } from 'src/dto/user.type';
 import {
@@ -29,8 +29,8 @@ export class WinningsController {
   ) {}
 
   @Post()
-  @M2M()
   @AllowedM2mScope(M2mScope.CreatePayments)
+  @Roles(Role.PaymentAdmin, Role.PaymentEditor)
   @ApiOperation({
     summary: 'Create winning with payments.',
     description: 'User must have "create:payments" scope to access.',

src/api/winnings/winnings.service.ts

@@ -56,7 +56,7 @@ export class WinningsService {
     }
 
     this.logger.debug(
-      `Member info retrieved successfully for user handle: ${userId}`,
+      `Member info retrieved successfully for user: ${userId}`,
       { member },
     );
 
@@ -142,7 +142,7 @@ export class WinningsService {
     const result = new ResponseDto<string>();
 
     this.logger.debug(
-      `Creating winning with payments for user ${userId}`,
+      `Creating winning with payments for user ${body.winnerId}`,
       body,
     );
 
@@ -186,7 +186,7 @@ export class WinningsService {
       );
       const isIdentityVerified =
         await this.identityVerificationRepo.completedIdentityVerification(
-          userId,
+          body.winnerId,
         );
 
       for (const detail of body.details || []) {