Merge pull request #147 from topcoder-platform/dev

[PROD RELEASE] - Update & fixes

Author: kkartunov

.circleci/config.yml

@@ -75,6 +75,7 @@ workflows:
                           only:
                               - dev
                               - engagements
+                              - PM-4165_allow-editing-credited-payments
             - 'build-prod':
                   context: org-global
                   filters:

package.json

@@ -88,7 +88,10 @@
       "**/*.(t|j)s"
     ],
     "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
+    "testEnvironment": "node",
+    "moduleNameMapper": {
+      "^src/(.*)$": "<rootDir>/$1"
+    }
   },
   "prisma": {
     "seed": "ts-node prisma/seed.ts"

prisma/migrations/20260219170000_add_winnings_type_created_at_index/migration.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_winnings_type_created_at ON winnings USING btree (type, created_at DESC);

prisma/schema.prisma

@@ -147,6 +147,7 @@ model winnings {
 
   @@index([category, created_at(sort: Desc)], map: "idx_winnings_category_created_at")
   @@index([created_at(sort: Desc)], map: "idx_winnings_created_at")
+  @@index([type, created_at(sort: Desc)], map: "idx_winnings_type_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")
 }

src/api/admin/admin.controller.ts

@@ -140,6 +140,7 @@ export class AdminController {
         {
           includeCount: false,
           includePayoutStatus: false,
+          latestPaymentOnly: true,
         },
       );
 

src/api/admin/admin.service.ts

@@ -368,7 +368,8 @@ export class AdminService {
         // Update payment amount if requested
         if (
           body.paymentAmount !== undefined &&
-          (payment.payment_status === PaymentStatus.OWED ||
+          (payment.payment_status === PaymentStatus.CREDITED ||
+            payment.payment_status === PaymentStatus.OWED ||
             payment.payment_status === PaymentStatus.ON_HOLD ||
             payment.payment_status === PaymentStatus.ON_HOLD_ADMIN)
         ) {
@@ -646,6 +647,7 @@ export class AdminService {
         version: currentVersion,
         payment_status: {
           in: [
+            PaymentStatus.CREDITED,
             PaymentStatus.OWED,
             PaymentStatus.ON_HOLD,
             PaymentStatus.ON_HOLD_ADMIN,

src/api/challenge-payments/challenge-payments.service.spec.ts

@@ -0,0 +1,101 @@
+jest.mock('src/shared/global', () => ({
+  Logger: class {
+    debug = jest.fn();
+
+    error = jest.fn();
+
+    info = jest.fn();
+
+    log = jest.fn();
+
+    warn = jest.fn();
+  },
+}));
+
+jest.mock('src/config', () => ({
+  ENV_CONFIG: {
+    TOPCODER_API_V6_BASE_URL: 'https://api.topcoder-dev.com/v6',
+  },
+}));
+
+import { ChallengePaymentsService } from './challenge-payments.service';
+
+describe('ChallengePaymentsService', () => {
+  let findManyMock: jest.Mock;
+  let m2mFetchMock: jest.Mock;
+  let service: ChallengePaymentsService;
+
+  beforeEach(() => {
+    findManyMock = jest.fn().mockResolvedValue([]);
+    m2mFetchMock = jest.fn();
+
+    service = new ChallengePaymentsService(
+      {
+        winnings: {
+          findMany: findManyMock,
+        },
+      } as any,
+      {
+        m2mFetch: m2mFetchMock,
+      } as any,
+    );
+  });
+
+  it('returns all challenge payments for managers', async () => {
+    m2mFetchMock
+      .mockResolvedValueOnce([
+        {
+          memberHandle: 'manager-user',
+          memberId: '123',
+          roleId: 'manager-role-id',
+        },
+      ])
+      .mockResolvedValueOnce([
+        {
+          fullWriteAccess: false,
+          id: 'manager-role-id',
+          name: 'Manager',
+        },
+      ]);
+
+    await service.listChallengePayments({
+      auth0User: { roles: ['Topcoder User'] },
+      challengeId: 'challenge-id',
+      isMachineToken: false,
+      requestUserId: '123',
+      winnerOnly: false,
+    });
+
+    const where = findManyMock.mock.calls[0][0].where;
+    expect(where.winner_id).toBeUndefined();
+  });
+
+  it('keeps winner filtering for users without challenge-wide access', async () => {
+    m2mFetchMock
+      .mockResolvedValueOnce([
+        {
+          memberHandle: 'reviewer-user',
+          memberId: '456',
+          roleId: 'reviewer-role-id',
+        },
+      ])
+      .mockResolvedValueOnce([
+        {
+          fullWriteAccess: false,
+          id: 'reviewer-role-id',
+          name: 'Reviewer',
+        },
+      ]);
+
+    await service.listChallengePayments({
+      auth0User: { roles: ['Topcoder User'] },
+      challengeId: 'challenge-id',
+      isMachineToken: false,
+      requestUserId: '456',
+      winnerOnly: false,
+    });
+
+    const where = findManyMock.mock.calls[0][0].where;
+    expect(where.winner_id).toBe('456');
+  });
+});

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

@@ -101,16 +101,17 @@ export class ChallengePaymentsService {
       }
 
       try {
-        const isCopilot = await this.isCopilotForChallenge(
-          challengeId,
-          requestUserId,
-        );
-        if (isCopilot) {
+        const hasChallengeWideAccess =
+          await this.hasChallengeWideAccessForChallenge(
+            challengeId,
+            requestUserId,
+          );
+        if (hasChallengeWideAccess) {
           allowAllForChallenge = true;
         }
       } catch (error) {
         this.logger.warn(
-          `Failed to verify copilot status for user ${requestUserId} on challenge ${challengeId}`,
+          `Failed to verify challenge-wide payment access for user ${requestUserId} on challenge ${challengeId}`,
           error instanceof Error ? error.message : error,
         );
       }
@@ -150,7 +151,11 @@ export class ChallengePaymentsService {
             roles.push(String(role));
           }
         });
-      } else if (value) {
+      } else if (
+        typeof value === 'string' ||
+        typeof value === 'number' ||
+        typeof value === 'boolean'
+      ) {
         roles.push(String(value));
       }
     });
@@ -165,7 +170,7 @@ export class ChallengePaymentsService {
     return roles;
   }
 
-  private async isCopilotForChallenge(
+  private async hasChallengeWideAccessForChallenge(
     challengeId: string,
     userId: string,
   ): Promise<boolean> {
@@ -181,19 +186,26 @@ export class ChallengePaymentsService {
       return false;
     }
 
-    const copilotRoleIds = new Set(
+    const challengeWideRoleIds = new Set(
       resourceRoles
-        ?.filter((role) =>
-          role?.name ? role.name.toLowerCase().includes('copilot') : false,
+        ?.filter(
+          (role) =>
+            role?.fullWriteAccess === true ||
+            (role?.name
+              ? role.name.toLowerCase().includes('copilot') ||
+                role.name.toLowerCase().includes('manager')
+              : false),
         )
         .map((role) => role.id),
     );
 
-    if (copilotRoleIds.size === 0) {
+    if (challengeWideRoleIds.size === 0) {
       return false;
     }
 
-    return resources.some((resource) => copilotRoleIds.has(resource.roleId));
+    return resources.some((resource) =>
+      challengeWideRoleIds.has(resource.roleId),
+    );
   }
 
   private async fetchWinnings(

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

@@ -0,0 +1,61 @@
+import { ChallengeStatuses } from '../../dto/challenge.dto';
+
+jest.mock('src/config', () => ({
+  ENV_CONFIG: {
+    TGBillingAccounts: [],
+    TOPCODER_API_V6_BASE_URL: 'https://api.topcoder-dev.com/v6',
+  },
+}));
+
+jest.mock('src/shared/global', () => ({
+  Logger: class {
+    debug = jest.fn();
+
+    error = jest.fn();
+
+    info = jest.fn();
+
+    log = jest.fn();
+
+    warn = jest.fn();
+  },
+}));
+
+import { ChallengesService } from './challenges.service';
+
+describe('ChallengesService', () => {
+  it('skips creating payments for fun challenges', async () => {
+    const prisma = {
+      challenge_lock: {
+        create: jest.fn(),
+        deleteMany: jest.fn(),
+      },
+    };
+    const service = new ChallengesService(
+      prisma as any,
+      {} as any,
+      {} as any,
+      {} as any,
+      {} as any,
+    );
+    const challenge = {
+      funChallenge: true,
+      id: '11111111-1111-1111-1111-111111111111',
+      name: 'MM 163',
+      status: ChallengeStatuses.Completed,
+    };
+    const createPaymentsSpy = jest
+      .spyOn(service as any, 'createPayments')
+      .mockResolvedValue(undefined);
+
+    jest.spyOn(service, 'getChallenge').mockResolvedValue(challenge as any);
+
+    await service.generateChallengePayments(
+      '11111111-1111-1111-1111-111111111111',
+      'test-user',
+    );
+
+    expect(createPaymentsSpy).not.toHaveBeenCalled();
+    expect(prisma.challenge_lock.create).not.toHaveBeenCalled();
+  });
+});

src/api/challenges/challenges.service.ts

@@ -41,7 +41,7 @@ interface PaymentPayload {
   amount: number;
   userId: string;
   type: WinningsCategory;
-  currency: string;
+  currency: PrizeType;
   description?: string;
 }
 
@@ -566,6 +566,13 @@ export class ChallengesService {
       throw new Error("Challenge isn't in a payable status!");
     }
 
+    if (challenge.funChallenge === true) {
+      this.logger.log(
+        `Skipping payment generation for fun challenge ${challenge.id} (${challenge.name}).`,
+      );
+      return;
+    }
+
     // need to read for update (LOCK the rows)
     this.logger.log(`Attempting to acquire lock for challenge ${challenge.id}`);
     try {