Develop

src/purchases/dtos/purchase.dto.ts

@@ -1,13 +1,15 @@
-
 export interface PurchaseHistoryItemDTO {
-    prompt_id: number;
-    title: string;
-    price: number;
-    seller_nickname: string;
+  prompt_id: number;
+  title: string;
+  price: number;
+  seller_nickname: string;
+  purchased_at: string;
+  status: 'Succeed' | 'Refunded';
+  refunded_at: string | null;
 }
 
 export interface PurchaseHistoryResponseDTO {
-    message: string;
-    purchases: PurchaseHistoryItemDTO[];
-    statusCode: number;
-}
+  message: string;
+  purchases: PurchaseHistoryItemDTO[];
+  statusCode: number;
+}

src/purchases/repositories/purchase.repository.ts

@@ -1,22 +1,26 @@
 import prisma from '../../config/prisma';
 
 export const PurchaseRepository = {
-  findSucceededByUser(userId: number) {
+  // 결제내역: 결제 성공(Succeed) + 환불(Refunded) 거래 포함.
+  // 환불된 거래도 사용자가 결제내역에서 식별할 수 있어야 함 (#497).
+  findPurchaseHistory(userId: number) {
     return prisma.purchase.findMany({
       where: {
         user_id: userId,
-        payment: { is: { status: 'Succeed'}},
+        payment: { is: { status: { in: ['Succeed', 'Refunded'] } } },
       },
       include: {
         prompt: {
           select: {
             prompt_id: true,
             title: true,
-            user: { select: { nickname: true}},
+            user: { select: { nickname: true } },
           },
         },
+        payment: { select: { status: true } },
+        refund: { select: { refunded_at: true } },
       },
-      orderBy: { created_at: 'desc'},
-    })
-  }
-};
+      orderBy: { created_at: 'desc' },
+    });
+  },
+};

src/purchases/routes/purchase.route.ts

@@ -101,6 +101,15 @@ router.post('/requests', authenticateJwt, PurchaseRequestController.requestPurch
  *                       purchased_at:
  *                         type: string
  *                         format: date-time
+ *                       status:
+ *                         type: string
+ *                         enum: [Succeed, Refunded]
+ *                         description: 결제 상태. 환불 시 Refunded
+ *                       refunded_at:
+ *                         type: string
+ *                         format: date-time
+ *                         nullable: true
+ *                         description: 환불 시각. status가 Refunded일 때만 존재
  *                 statusCode:
  *                   type: integer
  */

src/purchases/services/purchase.service.ts

@@ -1,22 +1,24 @@
-import { PurchaseRepository } from "../repositories/purchase.repository";
-import { PurchaseHistoryItemDTO, PurchaseHistoryResponseDTO } from "../dtos/purchase.dto";
+import { PurchaseRepository } from '../repositories/purchase.repository';
+import { PurchaseHistoryItemDTO, PurchaseHistoryResponseDTO } from '../dtos/purchase.dto';
 
 export const PurchaseHistoryService = {
-    async list(userId: number): Promise<PurchaseHistoryResponseDTO> {
-        const rows = await PurchaseRepository.findSucceededByUser(userId);
-
-        const purchases: PurchaseHistoryItemDTO[] = rows.map((r) => ({
-            prompt_id: r.prompt.prompt_id,
-            title: r.prompt.title,
-            price:  r.amount,
-            purchased_at: r.created_at.toISOString(),
-            seller_nickname: r.prompt.user.nickname,
-        }));
+  async list(userId: number): Promise<PurchaseHistoryResponseDTO> {
+    const rows = await PurchaseRepository.findPurchaseHistory(userId);
 
-        return {
-            message: "결제 내역 조회 성공",
-            purchases,
-            statusCode: 200,
-        }
-    }
-}
+    const purchases: PurchaseHistoryItemDTO[] = rows.map((r) => ({
+      prompt_id: r.prompt.prompt_id,
+      title: r.prompt.title,
+      price: r.amount,
+      purchased_at: r.created_at.toISOString(),
+      seller_nickname: r.prompt.user.nickname,
+      status: (r.payment?.status ?? 'Succeed') as 'Succeed' | 'Refunded',
+      refunded_at: r.refund?.refunded_at?.toISOString() ?? null,
+    }));
+
+    return {
+      message: '결제 내역 조회 성공',
+      purchases,
+      statusCode: 200,
+    };
+  },
+};

src/settlements/controllers/settlement.history.controller.ts

@@ -16,8 +16,10 @@ export const getMonthlySales = async (req: Request, res: Response) => {
     const now = new Date();
     const year = req.query.year ? Number(req.query.year) : now.getUTCFullYear();
     const month = req.query.month ? Number(req.query.month) : now.getUTCMonth() + 1;
+    const page = req.query.page ? Number(req.query.page) : undefined;
+    const limit = req.query.limit ? Number(req.query.limit) : undefined;
 
-    const result = await SettlementHistoryService.getMonthlySales(userId, year, month);
+    const result = await SettlementHistoryService.getMonthlySales(userId, year, month, page, limit);
     return res.status(200).json(result);
   } catch (error: any) {
     const status = error.status || 500;

src/settlements/dtos/settlement.history.dto.ts

@@ -13,20 +13,30 @@ export interface MonthlySalesItemDto {
   status: 'Pending' | 'Succeed' | 'Failed' | 'Refunded';
 }
 
+// 월 전체 합계 (페이지 무관 — #497 페이지네이션 도입과 함께 의미 정합화)
 export interface MonthlySalesSummaryDto {
-  count: number;
+  count: number;                  // 월 전체 거래 건수
   total_sales: number;
-  total_settled: number;          // net — Succeed만, 환불 제외
+  total_settled: number;          // net — 환불 제외
   total_fee: number;
   refunded_count: number;
   refunded_amount: number;
 }
 
+export interface PaginationDto {
+  page: number;
+  limit: number;
+  total: number;
+  total_pages: number;
+  has_next: boolean;
+}
+
 export interface MonthlySalesResponseDto {
   message: string;
   year: number;
   month: number;
   summary: MonthlySalesSummaryDto;
+  pagination: PaginationDto;
   items: MonthlySalesItemDto[];
   statusCode: number;
 }

src/settlements/repositories/settlement.history.repository.ts

@@ -17,7 +17,15 @@ export const SettlementHistoryRepository = {
     };
   },
 
-  async findSalesByMonth(userId: number, year: number, month: number) {
+  // 월별 판매 내역 (페이지네이션 적용).
+  // 페이지 데이터만 반환. 합계/카운트는 aggregateSalesByMonth/countSalesByMonth로 별도 조회.
+  async findSalesByMonth(
+    userId: number,
+    year: number,
+    month: number,
+    skip: number,
+    take: number,
+  ) {
     const start = new Date(Date.UTC(year, month - 1, 1));
     const end = new Date(Date.UTC(year, month, 1));
 
@@ -27,6 +35,8 @@ export const SettlementHistoryRepository = {
         created_at: { gte: start, lt: end },
       },
       orderBy: { created_at: 'desc' },
+      skip,
+      take,
       select: {
         settlement_id: true,
         amount: true,
@@ -51,6 +61,62 @@ export const SettlementHistoryRepository = {
     });
   },
 
+  // 월별 판매 전체 건수 (페이지네이션 메타).
+  async countSalesByMonth(userId: number, year: number, month: number): Promise<number> {
+    const start = new Date(Date.UTC(year, month - 1, 1));
+    const end = new Date(Date.UTC(year, month, 1));
+    return prisma.settlement.count({
+      where: { user_id: userId, created_at: { gte: start, lt: end } },
+    });
+  },
+
+  // 월 전체 합계 (페이지 무관).
+  // summary 의미를 "현재 페이지 합계"가 아닌 "월 전체 합계"로 정합화 (#497).
+  async aggregateSalesByMonth(
+    userId: number,
+    year: number,
+    month: number,
+  ): Promise<{
+    total_sales: number;
+    total_settled: number;
+    total_fee: number;
+    refunded_amount: number;
+    refunded_count: number;
+  }> {
+    const start = new Date(Date.UTC(year, month - 1, 1));
+    const end = new Date(Date.UTC(year, month, 1));
+    const rows = await prisma.$queryRaw<
+      Array<{
+        total_sales: bigint | null;
+        total_settled: bigint | null;
+        total_fee: bigint | null;
+        refunded_amount: bigint | null;
+        refunded_count: bigint | null;
+      }>
+    >`
+      SELECT
+        SUM(p.amount) AS total_sales,
+        SUM(CASE WHEN s.status = ${Status.Refunded} THEN 0 ELSE s.amount END) AS total_settled,
+        SUM(s.fee) AS total_fee,
+        SUM(CASE WHEN s.status = ${Status.Refunded} THEN s.amount ELSE 0 END) AS refunded_amount,
+        SUM(CASE WHEN s.status = ${Status.Refunded} THEN 1 ELSE 0 END) AS refunded_count
+      FROM Settlement s
+      JOIN Payment pm ON pm.payment_id = s.payment_id
+      JOIN Purchase p ON p.purchase_id = pm.purchase_id
+      WHERE s.user_id = ${userId}
+        AND s.created_at >= ${start}
+        AND s.created_at < ${end}
+    `;
+    const r = rows[0] ?? {};
+    return {
+      total_sales: Number(r.total_sales ?? 0),
+      total_settled: Number(r.total_settled ?? 0),
+      total_fee: Number(r.total_fee ?? 0),
+      refunded_amount: Number(r.refunded_amount ?? 0),
+      refunded_count: Number(r.refunded_count ?? 0),
+    };
+  },
+
   async aggregateYearlyTotals(userId: number): Promise<
     Array<{
       year: number;

src/settlements/routes/settlement.route.ts

@@ -455,6 +455,21 @@ router.post("/register/business", authenticateJwt, registerBusiness);
  *       - in: query
  *         name: month
  *         schema: { type: integer, minimum: 1, maximum: 12, example: 5 }
+ *       - in: query
+ *         name: page
+ *         description: 페이지 번호 1부터 시작
+ *         schema:
+ *           type: integer
+ *           minimum: 1
+ *           default: 1
+ *       - in: query
+ *         name: limit
+ *         description: 페이지당 항목 수 최대 100
+ *         schema:
+ *           type: integer
+ *           minimum: 1
+ *           maximum: 100
+ *           default: 10
  *     responses:
  *       200:
  *         description: 조회 성공
@@ -468,13 +483,22 @@ router.post("/register/business", authenticateJwt, registerBusiness);
  *                 month: { type: integer, example: 5 }
  *                 summary:
  *                   type: object
+ *                   description: 월 전체 합계 (페이지 무관)
+ *                   properties:
+ *                     count: { type: integer, description: 월 전체 거래 건수, example: 25 }
+ *                     total_sales: { type: integer, description: 원래 판매가 합계 (환불 포함), example: 250000 }
+ *                     total_settled: { type: integer, description: net 정산 금액 (환불 제외), example: 200000 }
+ *                     total_fee: { type: integer, example: 25000 }
+ *                     refunded_count: { type: integer, example: 2 }
+ *                     refunded_amount: { type: integer, example: 18000 }
+ *                 pagination:
+ *                   type: object
  *                   properties:
- *                     count: { type: integer, example: 3 }
- *                     total_sales: { type: integer, description: 원래 판매가 합계 (환불 포함), example: 30000 }
- *                     total_settled: { type: integer, description: net 정산 금액 (환불 제외), example: 18000 }
- *                     total_fee: { type: integer, example: 3000 }
- *                     refunded_count: { type: integer, example: 1 }
- *                     refunded_amount: { type: integer, example: 9000 }
+ *                     page: { type: integer, example: 1 }
+ *                     limit: { type: integer, example: 10 }
+ *                     total: { type: integer, example: 25 }
+ *                     total_pages: { type: integer, example: 3 }
+ *                     has_next: { type: boolean, example: true }
  *                 items:
  *                   type: array
  *                   items: