[PROD RELEASE] - Trolley

package.json

@@ -32,9 +32,11 @@
     "csv": "^6.3.11",
     "csv-stringify": "^6.5.2",
     "dotenv": "^16.5.0",
+    "json-stringify-safe": "^5.0.1",
     "jsonwebtoken": "^9.0.2",
     "jwks-rsa": "^3.2.0",
     "lodash": "^4.17.21",
+    "nanoid": "^5.1.5",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "trolleyhq": "^1.1.0",
@@ -50,6 +52,7 @@
     "@swc/core": "^1.10.7",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.14",
+    "@types/json-stringify-safe": "^5.0.3",
     "@types/lodash": "^4.17.16",
     "@types/node": "^22.13.1",
     "@types/supertest": "^6.0.2",

prisma/migrations/20250423135831_truncate_payment_methods/migration.sql

@@ -7,5 +7,11 @@ ALTER TABLE "paypal_payment_method" ALTER COLUMN "user_payment_method_id" DROP N
 UPDATE payoneer_payment_method SET user_payment_method_id = NULL;
 UPDATE paypal_payment_method   SET user_payment_method_id = NULL;
 
-DELETE FROM user_default_payment_method;
-DELETE FROM user_payment_methods;
+DROP TABLE user_default_payment_method;
+
+DELETE FROM user_payment_methods
+WHERE payment_method_id NOT IN (
+  SELECT payment_method_id
+  FROM payment_method
+  WHERE payment_method_type IN ('Wipro Payroll', 'Trolley')
+);

prisma/migrations/20250520061120_reset_payments_status/migration.sql

@@ -0,0 +1,34 @@
+-- Update all payments witha "owed" status to "on_hold" for users that don't have a trolley_id
+-- and no trolley_recipient_payment_method set.
+
+UPDATE payment
+SET payment_status = 'ON_HOLD'
+WHERE winnings_id IN (
+  SELECT winnings.winning_id
+  FROM winnings
+  LEFT JOIN trolley_recipient ON winnings.winner_id = trolley_recipient.user_id
+  LEFT JOIN trolley_recipient_payment_method ON trolley_recipient.id = trolley_recipient_payment_method.trolley_recipient_id
+  WHERE payment.payment_status = 'OWED' AND (
+	trolley_recipient.trolley_id IS NULL OR
+	trolley_recipient_payment_method.id IS NULL
+  )
+);
+
+-- To test & see the updated payments:
+--
+-- SELECT payment.payment_id,
+--        payment.total_amount,
+--        payment.installment_number,
+--        payment.payment_method_id,
+--        payment.version,
+--        payment.payment_status,
+--        winnings.winner_id,
+--        trolley_recipient.trolley_id,
+--        trolley_recipient_payment_method.recipient_account_id
+-- FROM payment
+-- LEFT JOIN winnings ON payment.winnings_id = winnings.winning_id
+-- LEFT JOIN trolley_recipient ON winnings.winner_id = trolley_recipient.user_id
+-- LEFT JOIN trolley_recipient_payment_method ON trolley_recipient.id = trolley_recipient_payment_method.trolley_recipient_id
+-- WHERE payment.payment_status = 'OWED'
+--   AND trolley_recipient.trolley_id IS NULL
+--   AND trolley_recipient_payment_method.id IS NULL;

prisma/migrations/20250602083823_add_payment_challenge_fee/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "payment" ADD COLUMN     "challenge_fee" DECIMAL(12,2),
+ADD COLUMN     "challenge_markup" DECIMAL(12,2);

prisma/migrations/20250611095824_add_user_id_verification/migration.sql

@@ -0,0 +1,13 @@
+-- CreateEnum
+CREATE TYPE "verification_status" AS ENUM ('ACTIVE', 'INACTIVE');
+
+-- CreateTable
+CREATE TABLE "user_identity_verification_associations" (
+    "id" UUID NOT NULL DEFAULT uuid_generate_v4(),
+    "user_id" VARCHAR(80) NOT NULL,
+    "verification_id" TEXT NOT NULL,
+    "date_filed" TIMESTAMP(6) WITHOUT TIME ZONE NOT NULL,
+    "verification_status" "verification_status" NOT NULL,
+
+    CONSTRAINT "user_identity_verification_associations_pkey" PRIMARY KEY ("id")
+);

prisma/migrations/20250618100641_drop_otp_transaction/migration.sql

@@ -0,0 +1,12 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `transaction_id` on the `otp` table. All the data in the column will be lost.
+  - You are about to drop the `transaction` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "otp" DROP COLUMN "transaction_id";
+
+-- DropTable
+DROP TABLE "transaction";

prisma/schema.prisma

@@ -30,7 +30,6 @@ model otp {
   email           String         @db.VarChar(255)
   otp_hash        String         @db.VarChar(255)
   expiration_time DateTime       @default(dbgenerated("(CURRENT_TIMESTAMP + '00:05:00'::interval)")) @db.Timestamp(6)
-  transaction_id  String         @db.VarChar(255)
   action_type     reference_type
   created_at      DateTime?      @default(now()) @db.Timestamp(6)
   updated_at      DateTime?      @default(now()) @db.Timestamp(6)
@@ -55,6 +54,8 @@ model payment {
   release_date                 DateTime?                      @default(dbgenerated("(CURRENT_TIMESTAMP + '15 days'::interval)")) @db.Timestamp(6)
   payment_status               payment_status?
   billing_account              String                         @db.VarChar(80)
+  challenge_markup             Decimal?                       @db.Decimal(12, 2)
+  challenge_fee                Decimal?                       @db.Decimal(12, 2)
   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[]
@@ -67,7 +68,6 @@ model payment_method {
   description                 String?
   payment                     payment[]
   payment_releases            payment_releases[]
-  user_default_payment_method user_default_payment_method[]
   user_payment_methods        user_payment_methods[]
 }
 
@@ -128,22 +128,6 @@ model reward {
   winnings    winnings  @relation(fields: [winnings_id], references: [winning_id], onDelete: NoAction, onUpdate: NoAction)
 }
 
-model transaction {
-  id             String             @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
-  user_id        String             @db.VarChar(255)
-  reference_id   String             @db.Uuid
-  reference_type reference_type
-  status         transaction_status @default(INITIATED)
-  created_at     DateTime?          @default(now()) @db.Timestamp(6)
-  updated_at     DateTime?          @default(now()) @db.Timestamp(6)
-}
-
-model user_default_payment_method {
-  user_id           String         @id @db.VarChar(80)
-  payment_method_id Int
-  payment_method    payment_method @relation(fields: [payment_method_id], references: [payment_method_id], onDelete: Cascade, onUpdate: NoAction, map: "fk_default_payment_method")
-}
-
 model user_payment_methods {
   id                      String                    @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
   user_id                 String                    @db.VarChar(80)
@@ -212,13 +196,26 @@ model trolley_webhook_log {
   created_at    DateTime?      @default(now()) @db.Timestamp(6)
 }
 
+model user_identity_verification_associations {
+  id                  String                @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
+  user_id             String                @db.VarChar(80)
+  verification_id     String                @db.Text
+  date_filed          DateTime              @db.Timestamp(6)
+  verification_status verification_status
+}
+
 model trolley_recipient_payment_method {
   id            String         @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
   trolley_recipient_id Int
   recipient_account_id                String               @unique @db.VarChar(80)
   trolley_recipient   trolley_recipient @relation(fields: [trolley_recipient_id], references: [id], onDelete: Cascade, onUpdate: NoAction, map: "fk_trolley_recipient_trolley_recipient_payment_method")
 }
 
+enum verification_status {
+  ACTIVE
+  INACTIVE
+}
+
 enum action_type {
   INITIATE_WITHDRAWAL
   ADD_WITHDRAWAL_METHOD

src/api/admin/admin.controller.ts

@@ -164,19 +164,24 @@ export class AdminController {
     @Body() body: WinningUpdateRequestDto,
     @User() user: UserInfo,
   ): Promise<ResponseDto<string>> {
-    if (!body.paymentAmount && !body.releaseDate && !body.paymentStatus) {
+    if (
+      !body.paymentAmount &&
+      !body.releaseDate &&
+      !body.paymentStatus &&
+      !body.description
+    ) {
       throw new BadRequestException(
-        'paymentStatus, releaseDate and paymentAmount cannot be null at the same time.',
+        'description, paymentStatus, releaseDate and paymentAmount cannot be null at the same time.',
       );
     }
 
     const result = await this.adminService.updateWinnings(body, user.id);
+
+    result.status = ResponseStatusType.SUCCESS;
     if (result.error) {
       result.status = ResponseStatusType.ERROR;
     }
 
-    result.status = ResponseStatusType.SUCCESS;
-
     return result;
   }
 
@@ -200,12 +205,12 @@ export class AdminController {
     @Param('winningID') winningId: string,
   ): Promise<ResponseDto<WinningAuditDto[]>> {
     const result = await this.adminService.getWinningAudit(winningId);
+
+    result.status = ResponseStatusType.SUCCESS;
     if (result.error) {
       result.status = ResponseStatusType.ERROR;
     }
 
-    result.status = ResponseStatusType.SUCCESS;
-
     return result;
   }
 
@@ -230,12 +235,12 @@ export class AdminController {
     @Param('winningID') winningId: string,
   ): Promise<ResponseDto<AuditPayoutDto[]>> {
     const result = await this.adminService.getWinningAuditPayout(winningId);
+
+    result.status = ResponseStatusType.SUCCESS;
     if (result.error) {
       result.status = ResponseStatusType.ERROR;
     }
 
-    result.status = ResponseStatusType.SUCCESS;
-
     return result;
   }
 }

src/api/admin/admin.module.ts

@@ -1,20 +1,13 @@
 import { Module } from '@nestjs/common';
 import { AdminController } from './admin.controller';
 import { AdminService } from './admin.service';
-import { TaxFormRepository } from '../repository/taxForm.repo';
-import { PaymentMethodRepository } from '../repository/paymentMethod.repo';
 import { WinningsRepository } from '../repository/winnings.repo';
 import { TopcoderModule } from 'src/shared/topcoder/topcoder.module';
 import { PaymentsModule } from 'src/shared/payments';
 
 @Module({
   imports: [TopcoderModule, PaymentsModule],
   controllers: [AdminController],
-  providers: [
-    AdminService,
-    TaxFormRepository,
-    PaymentMethodRepository,
-    WinningsRepository,
-  ],
+  providers: [AdminService, WinningsRepository],
 })
 export class AdminModule {}