Merge pull request #106 from topcoder-platform/v6

V6 -> dev

Author: kkartunov

.circleci/config.yml

@@ -51,7 +51,7 @@ jobs:
         environment:
             DEPLOY_ENV: 'DEV'
             LOGICAL_ENV: 'dev'
-            APPNAME: 'tc-finance-api'
+            APPNAME: 'finance-api-v6'
             DEPLOYMENT_ENVIRONMENT: 'dev'
         steps: *build_and_deploy_steps
 
@@ -60,7 +60,7 @@ jobs:
         environment:
             DEPLOY_ENV: 'PROD'
             LOGICAL_ENV: 'prod'
-            APPNAME: 'tc-finance-api'
+            APPNAME: 'finance-api-v6'
             DEPLOYMENT_ENVIRONMENT: 'prod'
         steps: *build_and_deploy_steps
 
@@ -74,10 +74,10 @@ workflows:
                       branches:
                           only:
                               - dev
-                              - npm-module-updates
+                              - v6
             - 'build-prod':
                   context: org-global
                   filters:
                       branches:
                           only:
-                              - master
+                              - master

.env.sample

@@ -1,4 +1,5 @@
-TOPCODER_API_BASE_URL="https://api.topcoder-dev.com/v5"
+TOPCODER_API_V5_BASE_URL="https://api.topcoder-dev.com/v5"
+TOPCODER_API_V6_BASE_URL="https://api.topcoder-dev.com/v6"
 AUTH0_CERT="-----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEArAV0dmDkedFdlaQ6KQiqUv+UGshfMXx/4jJCLZ9802ynJqAvIt+Z
 V7EiPqjc2J1xVfJJEvQ9ZS5A2TFWAk16NUTU4LN+TkjEnqeg+LlUPWY3Y4RXa2OU
@@ -15,4 +16,4 @@ DB_PASSWORD=randompassword
 DB_HOST=127.0.0.1
 DB_PORT=5434
 DB_NAME=walletdb
-DATABASE_URL="postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=disable"
+DATABASE_URL="postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=disable"

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/20251020100641_challenge-processing-lock/migration.sql

@@ -0,0 +1,6 @@
+CREATE TABLE "challenge_lock" (
+  "id" SERIAL PRIMARY KEY,
+  "external_id" VARCHAR(255) NOT NULL UNIQUE,
+  "lock_time" TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "error" TEXT
+);

prisma/schema.prisma

@@ -103,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")
 
@@ -172,7 +138,6 @@ 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")
@@ -223,6 +188,13 @@ model trolley_recipient_payment_method {
   trolley_recipient   trolley_recipient @relation(fields: [trolley_recipient_id], references: [id], onDelete: Cascade, onUpdate: NoAction, map: "fk_trolley_recipient_trolley_recipient_payment_method")
 }
 
+model challenge_lock {
+  id Int @id @default(autoincrement())
+  external_id  String            @unique @db.VarChar(255)
+  lock_time    DateTime       @default(now()) @db.Timestamp(6)
+  error        String?            @db.Text
+}
+
 enum verification_status {
   ACTIVE
   INACTIVE

src/api/admin/admin.service.ts

@@ -13,10 +13,7 @@ import { ResponseDto } from 'src/dto/api-response.dto';
 import { PaymentStatus } from 'src/dto/payment.dto';
 import { WinningAuditDto, AuditPayoutDto } from './dto/audit.dto';
 import { WinningUpdateRequestDto } from './dto/winnings.dto';
-import {
-  AdminPaymentUpdateData,
-  TopcoderChallengesService,
-} from 'src/shared/topcoder/challenges.service';
+import { TopcoderChallengesService } from 'src/shared/topcoder/challenges.service';
 import { Logger } from 'src/shared/global';
 
 function formatDate(date = new Date()) {
@@ -317,30 +314,6 @@ export class AdminService {
         }
       });
 
-      transactions.push(async () => {
-        const winning = await this.getWinningById(winningsId);
-        if (!winning) {
-          this.logger.error(
-            `Error updating legacy system for winning ${winningsId}. Winning not found!`,
-          );
-          throw new Error(
-            `Error updating legacy system for winning ${winningsId}. Winning not found!`,
-          );
-        }
-
-        const payoutData: AdminPaymentUpdateData = {
-          userId: +winning.winner_id,
-          status: body.paymentStatus,
-          amount: body.paymentAmount,
-          releaseDate: formatDate(new Date(body.releaseDate)),
-        };
-
-        await this.tcChallengesService.updateLegacyPayments(
-          winning.external_id as string,
-          payoutData,
-        );
-      });
-
       // Run all transaction tasks in a single prisma transaction
       await this.prisma.$transaction(async (tx) => {
         for (const transaction of transactions) {

src/api/api.module.ts

@@ -17,6 +17,8 @@ import { WinningsModule } from './winnings/winnings.module';
 import { UserModule } from './user/user.module';
 import { WalletModule } from './wallet/wallet.module';
 import { WithdrawalModule } from './withdrawal/withdrawal.module';
+import { ChallengesModule } from './challenges/challenges.module';
+import { ChallengePaymentsModule } from './challenge-payments/challenge-payments.module';
 
 @Module({
   imports: [
@@ -26,9 +28,11 @@ import { WithdrawalModule } from './withdrawal/withdrawal.module';
     WebhooksModule,
     AdminModule,
     WinningsModule,
+    ChallengePaymentsModule,
     UserModule,
     WalletModule,
     WithdrawalModule,
+    ChallengesModule,
   ],
   controllers: [HealthCheckController],
   providers: [

src/api/challenge-payments/challenge-payments.controller.ts

@@ -0,0 +1,43 @@
+import {
+  Controller,
+  Get,
+  Param,
+  Query,
+  Req,
+} from '@nestjs/common';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { AllowedM2mScope, Roles, User } from 'src/core/auth/decorators';
+import { M2mScope, Role } from 'src/core/auth/auth.constants';
+import { UserInfo } from 'src/dto/user.type';
+import { ChallengePaymentsService } from './challenge-payments.service';
+
+@ApiTags('Payments')
+@Controller('/challenge-payments')
+@ApiBearerAuth()
+export class ChallengePaymentsController {
+  constructor(
+    private readonly challengePaymentsService: ChallengePaymentsService,
+  ) {}
+
+  @Get('/:challengeId')
+  @AllowedM2mScope(M2mScope.ReadPayments, M2mScope.CreatePayments)
+  @Roles(Role.PaymentAdmin, Role.PaymentEditor, Role.PaymentViewer, Role.User)
+  @ApiOperation({
+    summary:
+      'List payments (winnings) for a challenge with role-aware filtering',
+  })
+  async getChallengePayments(
+    @Param('challengeId') challengeId: string,
+    @Query('winnerOnly') winnerOnly: string | undefined,
+    @User() user: UserInfo,
+    @Req() req: any,
+  ) {
+    return this.challengePaymentsService.listChallengePayments({
+      challengeId,
+      requestUserId: user?.id,
+      isMachineToken: Boolean(req?.m2mTokenScope),
+      winnerOnly: (winnerOnly || '').toLowerCase() === 'true',
+      auth0User: req?.auth0User,
+    });
+  }
+}

src/api/challenge-payments/challenge-payments.module.ts

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { ChallengePaymentsController } from './challenge-payments.controller';
+import { ChallengePaymentsService } from './challenge-payments.service';
+import { TopcoderModule } from 'src/shared/topcoder/topcoder.module';
+
+@Module({
+  imports: [TopcoderModule],
+  controllers: [ChallengePaymentsController],
+  providers: [ChallengePaymentsService],
+})
+export class ChallengePaymentsModule {}