Merge pull request #713 from mahajanmahesh935/StripeFeedbacks

vijaykhollam · web-flow · commit bb1ee93fa799 · 2026-04-07T12:57:44.000+05:30
TASK #00000 : Add validation for creating intent for already paid contextId
diff --git a/src/common/utils/api-id.config.ts b/src/common/utils/api-id.config.ts
@@ -129,6 +129,7 @@ export const APIID = {
   // Payment APIs
   PAYMENT_INITIATE: "api.payment.initiate",
   PAYMENT_STATUS: "api.payment.status",
+  PAYMENT_STATUS_BY_USER_CONTEXT: "api.payment.status.byUserContext",
   PAYMENT_STATUS_OVERRIDE: "api.payment.status.override",
   PAYMENT_WEBHOOK: "api.payment.webhook",
   CERTIFICATE_GENERATE: "api.certificate.generate",
diff --git a/src/payments/dtos/payment-status.dto.ts b/src/payments/dtos/payment-status.dto.ts
@@ -89,3 +89,8 @@ export class PaymentStatusResponseDto {
   updatedAt: Date;
 }
 
+export class PaymentStatusesByUserContextResponseDto {
+  @ApiProperty({ type: [PaymentStatusResponseDto] })
+  data: PaymentStatusResponseDto[];
+}
+
diff --git a/src/payments/payments.controller.ts b/src/payments/payments.controller.ts
@@ -24,6 +24,7 @@ import {
   ApiCreatedResponse,
   ApiOkResponse,
   ApiBadRequestResponse,
+  ApiConflictResponse,
   ApiNotFoundResponse,
   ApiQuery,
 } from '@nestjs/swagger';
@@ -32,7 +33,10 @@ import { APIID } from '../common/utils/api-id.config';
 import { PaymentService } from './services/payment.service';
 import { InitiatePaymentDto } from './dtos/initiate-payment.dto';
 import { OverridePaymentStatusDto } from './dtos/override-payment-status.dto';
-import { PaymentStatusResponseDto } from './dtos/payment-status.dto';
+import {
+  PaymentStatusResponseDto,
+  PaymentStatusesByUserContextResponseDto,
+} from './dtos/payment-status.dto';
 import { PaymentReportResponseDto } from './dtos/payment-report.dto';
 
 @ApiTags('Payments')
@@ -58,6 +62,10 @@ export class PaymentsController {
     },
   })
   @ApiBadRequestResponse({ description: 'Invalid payment data' })
+  @ApiConflictResponse({
+    description:
+      'A completed (PAID) payment already exists for this user and context; includes alreadyPaid and paymentIntentId',
+  })
   async initiatePayment(@Body() dto: InitiatePaymentDto) {
     return await this.paymentService.initiatePayment(dto);
   }
@@ -111,6 +119,42 @@ export class PaymentsController {
     return await this.paymentService.getPaymentStatusBySessionId(sessionId);
   }
 
+  @Get('by-user-context')
+  @UseFilters(new AllExceptionsFilter(APIID.PAYMENT_STATUS_BY_USER_CONTEXT))
+  @ApiOperation({
+    summary: 'Get payment status by userId and contextId',
+    description:
+      'Returns every payment intent for this user that includes a target with the given contextId (e.g. cohort/course id). Each element matches GET :id/status. Ordered by intent updatedAt descending (newest first).',
+  })
+  @ApiQuery({
+    name: 'userId',
+    required: true,
+    type: String,
+    description: 'User UUID',
+  })
+  @ApiQuery({
+    name: 'contextId',
+    required: true,
+    type: String,
+    description: 'Context UUID from payment target (e.g. cohort id)',
+  })
+  @ApiOkResponse({
+    description: 'Payment statuses retrieved successfully',
+    type: PaymentStatusesByUserContextResponseDto,
+  })
+  @ApiNotFoundResponse({
+    description: 'No payment intent found for this user and context',
+  })
+  async getPaymentStatusByUserAndContext(
+    @Query('userId', ParseUUIDPipe) userId: string,
+    @Query('contextId', ParseUUIDPipe) contextId: string,
+  ) {
+    return await this.paymentService.getPaymentStatusByUserIdAndContextId(
+      userId,
+      contextId,
+    );
+  }
+
   @Get(':id/status')
   @UseFilters(new AllExceptionsFilter(APIID.PAYMENT_STATUS))
   @ApiOperation({ summary: 'Get payment status' })
diff --git a/src/payments/services/payment-intent.service.ts b/src/payments/services/payment-intent.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, NotFoundException, ConflictException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { In, Repository } from 'typeorm';
 import { PaymentIntent } from '../entities/payment-intent.entity';
 import { PaymentIntentStatus } from '../enums/payment.enums';
 
@@ -97,6 +97,65 @@ export class PaymentIntentService {
     return intent || null;
   }
 
+  /**
+   * All payment intents for this user that have a target with the given contextId.
+   * Ordered by intent updatedAt descending (newest first).
+   */
+  /**
+   * Latest PAID intent for this user with a target for the given contextId, if any.
+   */
+  async findPaidByUserIdAndContextId(
+    userId: string,
+    contextId: string,
+  ): Promise<Pick<PaymentIntent, 'id'> | null> {
+    const row = await this.paymentIntentRepository
+      .createQueryBuilder('intent')
+      .select('intent.id', 'id')
+      .innerJoin('intent.targets', 't')
+      .where('intent.userId = :userId', { userId })
+      .andWhere('t.contextId = :contextId', { contextId })
+      .andWhere('intent.status = :status', { status: PaymentIntentStatus.PAID })
+      .groupBy('intent.id')
+      .orderBy('MAX(intent.updatedAt)', 'DESC')
+      .addOrderBy('intent.id', 'DESC')
+      .limit(1)
+      .getRawOne();
+
+    const id = row?.id as string | undefined;
+    return id ? { id } : null;
+  }
+
+  async findAllByUserIdAndContextId(
+    userId: string,
+    contextId: string,
+  ): Promise<PaymentIntent[]> {
+    const rows = await this.paymentIntentRepository
+      .createQueryBuilder('intent')
+      .select('intent.id', 'id')
+      .innerJoin('intent.targets', 't')
+      .where('intent.userId = :userId', { userId })
+      .andWhere('t.contextId = :contextId', { contextId })
+      .groupBy('intent.id')
+      .orderBy('MAX(intent.updatedAt)', 'DESC')
+      .addOrderBy('intent.id', 'DESC')
+      .getRawMany();
+
+    const ids = rows.map((r) => r.id as string).filter(Boolean);
+    if (ids.length === 0) {
+      return [];
+    }
+
+    const intents = await this.paymentIntentRepository.find({
+      where: { id: In(ids) },
+      relations: ['transactions', 'targets'],
+    });
+    const order = new Map(ids.map((id, i) => [id, i]));
+    intents.sort(
+      (a, b) => (order.get(a.id) ?? 0) - (order.get(b.id) ?? 0),
+    );
+    return intents;
+  }
+
   /**
    * Update payment intent status
    */
diff --git a/src/payments/services/payment.service.ts b/src/payments/services/payment.service.ts
@@ -1,4 +1,11 @@
-import { Injectable, Logger, BadRequestException, NotFoundException, Inject } from '@nestjs/common';
+import {
+  Injectable,
+  Logger,
+  BadRequestException,
+  NotFoundException,
+  ConflictException,
+  Inject,
+} from '@nestjs/common';
 import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
 import { DataSource, EntityManager, Repository, In } from 'typeorm';
 import { PaymentProvider } from '../interfaces/payment-provider.interface';
@@ -44,6 +51,20 @@ export class PaymentService {
   async initiatePayment(dto: InitiatePaymentDto) {
     this.logger.log(`Initiating payment for user ${dto.userId}`);
 
+    const primaryContextId = dto.targets[0].contextId;
+    const existingPaid =
+      await this.paymentIntentService.findPaidByUserIdAndContextId(
+        dto.userId,
+        primaryContextId,
+      );
+    if (existingPaid) {
+      throw new ConflictException({
+        message: 'Already paid for this context.',
+        alreadyPaid: true,
+        paymentIntentId: existingPaid.id,
+      });
+    }
+
     // Validate coupon if provided
     let validatedCoupon = null;
     let finalAmount = dto.amount;
@@ -440,7 +461,10 @@ export class PaymentService {
    */
   async getPaymentStatus(paymentIntentId: string) {
     const intent = await this.paymentIntentService.findById(paymentIntentId);
-    
+    return this.formatIntentToStatusResponse(intent);
+  }
+
+  private formatIntentToStatusResponse(intent: PaymentIntent) {
     return {
       id: intent.id,
       userId: intent.userId,
@@ -487,7 +511,30 @@ export class PaymentService {
         `No payment found for session_id ${sessionId}`,
       );
     }
-    return this.getPaymentStatus(intent.id);
+    return this.formatIntentToStatusResponse(intent);
+  }
+
+  /**
+   * All payment intents for userId with a target for contextId; same item shape as getPaymentStatus.
+   * Newest intent first (by updatedAt).
+   */
+  async getPaymentStatusByUserIdAndContextId(
+    userId: string,
+    contextId: string,
+  ) {
+    const intents =
+      await this.paymentIntentService.findAllByUserIdAndContextId(
+        userId,
+        contextId,
+      );
+    if (intents.length === 0) {
+      throw new NotFoundException(
+        `No payment found for userId ${userId} and contextId ${contextId}`,
+      );
+    }
+    return {
+      data: intents.map((intent) => this.formatIntentToStatusResponse(intent)),
+    };
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -89,3 +89,8 @@ export class PaymentStatusResponseDto {`
`89`	`89`	`updatedAt: Date;`
`90`	`90`	`}`
`91`	`91`
	`92`	`+export class PaymentStatusesByUserContextResponseDto {`
	`93`	`+ @ApiProperty({ type: [PaymentStatusResponseDto] })`
	`94`	`+ data: PaymentStatusResponseDto[];`
	`95`	`+}`
	`96`	`+`