Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@
"dependencies": {
"@aws-sdk/client-s3": "^3.848.0",
"@aws-sdk/s3-request-presigner": "^3.848.0",
"@portone/server-sdk": "^0.19.0",
"@prisma/client": "^6.14.0",
"@types/express-session": "^1.18.2",
"@types/passport-google-oauth20": "^2.0.16",
"@types/passport-kakao": "^1.0.3",
"axios": "^1.11.0",
"bcrypt": "^6.0.0",
"bcryptjs": "^3.0.2",
"body-parser": "^2.2.2",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.2",
"cors": "^2.8.5",
Expand Down Expand Up @@ -58,6 +60,7 @@
"@types/axios": "^0.14.4",
"@types/bcrypt": "^6.0.0",
"@types/bcryptjs": "^3.0.0",
"@types/body-parser": "^1.19.6",
"@types/cors": "^2.8.19",
"@types/express": "^5.0.3",
"@types/jsonwebtoken": "^9.0.10",
Expand Down
42 changes: 28 additions & 14 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions src/purchases/controller/purchase.complete.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,13 @@ import { PurchaseCompleteService } from '../services/purchase.complete.service';
export const PurchaseCompleteController = {
async completePurchase(req: Request, res: Response, next: NextFunction) {
try {
console.log('πŸ”₯ μš”μ²­ λ°”λ”” 확인:', req.body); // ← 여기에 둜그 찍기
console.log('πŸ”₯ Content-Type:', req.headers['content-type']); // ← 헀더도 확인

const userId = (req.user as any).user_id;
const dto = req.body as Partial<PromptPurchaseCompleteRequestDTO>;

if (!dto || typeof dto.imp_uid !== 'string' || typeof dto.merchant_uid !== 'string') {
if (!dto || typeof dto.paymentId !== 'string') {
return res.status(400).json({
error: 'BadRequest',
message: 'imp_uid와 merchant_uidλŠ” ν•„μˆ˜μž…λ‹ˆλ‹€.',
message: 'paymentIdλŠ” ν•„μˆ˜μž…λ‹ˆλ‹€.',
statusCode: 400,
});
}
Expand Down
38 changes: 38 additions & 0 deletions src/purchases/controller/purchase.webhook.controller.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { Request, Response, NextFunction } from 'express';
import * as PortOne from '@portone/server-sdk';
import { WebhookService } from '../services/purchase.webhook.service';

export const WebhookController = {
async handleWebhook(req: Request, res: Response, next: NextFunction) {
try {
const webhookSecret = process.env.PORTONE_WEBHOOK_SECRET;
if (!webhookSecret) {
console.error('PORTONE_WEBHOOK_SECRET is not set');
return res.status(500).send('Server Config Error');
}

// 1. μ›Ήν›… μ„œλͺ… 검증
const webhook = await PortOne.Webhook.verify(
webhookSecret,
req.body,
req.headers as Record<string, string | string[] | undefined>
);

// 2. 이벀트 νƒ€μž…λ³„ 처리 -> ν˜„μž¬λŠ” 결제 μ™„λ£Œ(Paid)만 처리
if (webhook.type === 'Transaction.Paid') {
const { paymentId, storeId } = webhook.data;
await WebhookService.handleTransactionPaid(paymentId, storeId);
} else if (webhook.type === 'Transaction.Cancelled') {
console.log('[Webhook] Transaction Cancelled:', webhook.data.paymentId);
}
res.status(200).send('OK');
} catch (err) {
if (err instanceof PortOne.Webhook.WebhookVerificationError) {
console.error('[Webhook] Signature Verification Failed');
return res.status(400).send('Verification Failed');
}
console.error('[Webhook] Error:', err);
res.status(500).send('Internal Server Error');
}
}
};
3 changes: 1 addition & 2 deletions src/purchases/dtos/purchase.complete.dto.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export interface PromptPurchaseCompleteRequestDTO {
imp_uid: string; // ν¬νŠΈμ› 결제 UID
merchant_uid: string; // 주문번호
paymentId: string;
}

export interface PromptPurchaseCompleteResponseDTO {
Expand Down
1 change: 1 addition & 0 deletions src/purchases/dtos/purchase.request.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ export interface PromptPurchaseRequestDTO {
redirect_url: string;
custom_data: {
prompt_id: number;
user_id: number;
};
}
57 changes: 57 additions & 0 deletions src/purchases/repositories/purchase.complete.repository.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import { Prisma } from '@prisma/client';

type Tx = Prisma.TransactionClient;

export const PurchaseCompleteRepository = {
createPurchaseTx(tx: Tx, data: {
user_id: number;
prompt_id: number;
seller_id?: number;
amount: number;
is_free: false;
}) {
return tx.purchase.create({ data });
},

createPaymentTx(tx: Tx, data: {
purchase_id: number;
merchant_uid: string;
pg: 'kakaopay' | 'tosspay';
status: 'Succeed' | 'Failed' | 'Pending';
paymentId: string;
}) {
return tx.payment.create({
data: {
purchase: { connect: { purchase_id: data.purchase_id } },
merchant_uid: data.merchant_uid,
provider: data.pg,
status: data.status,
imp_uid: data.paymentId,
},
});
},

upsertSettlementForPaymentTx(tx: Tx, input: {
sellerId: number;
paymentId: number;
amount: number;
fee: number;
status: 'Succeed' | 'Failed' | 'Pending';
}) {
return tx.settlement.upsert({
where: { payment_id: input.paymentId },
create: {
user_id: input.sellerId,
payment_id: input.paymentId,
amount: input.amount,
fee: input.fee,
status: input.status,
},
update: {
amount: input.amount,
fee: input.fee,
status: input.status,
},
});
}
};
27 changes: 27 additions & 0 deletions src/purchases/repositories/purchase.repository.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import prisma from '../../config/prisma';

export const PurchaseRepository = {
findSucceededByUser(userId: number) {
return prisma.purchase.findMany({
where: {
user_id: userId,
payment: { is: { status: 'Succeed'}},
},
include: {
prompt: {
select: {
prompt_id: true,
title: true,
user: { select: { nickname: true}},
},
},
payment: {
select: {
provider: true,
},
},
},
orderBy: { created_at: 'desc'},
})
}
};
Loading