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
22 changes: 22 additions & 0 deletions prisma/migrations/20261118190324_order_custom_upload/migration.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
-- 구매자 커스텀 이미지 presign 발급 기록. 정리 크론이 주문에 쓰이지 않은 객체를 지운다(기존 데이터 없음).
-- CreateTable
CREATE TABLE `order_custom_upload` (
`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
`account_id` BIGINT UNSIGNED NOT NULL,
`purpose` ENUM('RENDER', 'COMPOSITE', 'REFERENCE') NOT NULL,
`object_key` VARCHAR(512) NOT NULL,
`content_type` VARCHAR(50) NOT NULL,
`content_length` INTEGER UNSIGNED NOT NULL,
`status` ENUM('PENDING', 'ATTACHED', 'PURGING') NOT NULL DEFAULT 'PENDING',
`attached_at` DATETIME(3) NULL,
`purge_started_at` DATETIME(3) NULL,
`created_at` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
`updated_at` DATETIME(3) NOT NULL,

UNIQUE INDEX `uk_order_custom_upload_key`(`object_key`),
INDEX `idx_order_custom_upload_status_created`(`status`, `created_at`),
INDEX `idx_order_custom_upload_status_purge`(`status`, `purge_started_at`),
INDEX `idx_order_custom_upload_account`(`account_id`),
PRIMARY KEY (`id`)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

35 changes: 35 additions & 0 deletions prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,20 @@ enum CustomImageKind {
SLOT_COMPOSITE
}

// 구매자 커스텀 이미지 선업로드 용도(3D 렌더·슬롯형 합성·자유 편집 참고 사진)
enum OrderCustomUploadPurpose {
RENDER
COMPOSITE
REFERENCE
}

// 발급(PENDING) → 주문에 쓰임(ATTACHED, 보관) 또는 정리 중(PURGING, 주문에 붙일 수 없다)
enum OrderCustomUploadStatus {
PENDING
ATTACHED
PURGING
}

enum OrderStatus {
SUBMITTED
CONFIRMED
Expand Down Expand Up @@ -1188,6 +1202,27 @@ model OrderItemCustomImage {
@@map("order_item_custom_image")
}

// 커스텀 이미지 presign 발급 기록. 주문에 쓰이지 않은 객체는 정리 크론이 S3에서 지우고 행도 지운다(주문된 파일은 보관)
model OrderCustomUpload {
id BigInt @id @default(autoincrement()) @db.UnsignedBigInt
account_id BigInt @db.UnsignedBigInt
purpose OrderCustomUploadPurpose
object_key String @unique(map: "uk_order_custom_upload_key") @db.VarChar(512)
content_type String @db.VarChar(50)
content_length Int @db.UnsignedInt
status OrderCustomUploadStatus @default(PENDING)
attached_at DateTime? @db.DateTime(3)
purge_started_at DateTime? @db.DateTime(3)

created_at DateTime @default(now()) @db.DateTime(3)
updated_at DateTime @updatedAt @db.DateTime(3)

@@index([status, created_at], map: "idx_order_custom_upload_status_created")
@@index([status, purge_started_at], map: "idx_order_custom_upload_status_purge")
@@index([account_id], map: "idx_order_custom_upload_account")
@@map("order_custom_upload")
}

// 주문 1건의 결제. 계좌이체는 PENDING으로 만들고 입금 확인(관리자, 후속 연동은 AUTO) 때 CONFIRMED가 된다.
model Payment {
id BigInt @id @default(autoincrement()) @db.UnsignedBigInt
Expand Down
5 changes: 5 additions & 0 deletions prisma/seed/idempotent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ export async function resetSeedScope(prisma: PrismaClient): Promise<void> {
});
await prisma.review.deleteMany({ where: { account_id: { in: userIds } } });

// 커스텀 이미지 선업로드 기록(계정 FK는 없지만 시드 사용자 것은 함께 지운다)
await prisma.orderCustomUpload.deleteMany({
where: { account_id: { in: userIds } },
});

// 찜
await prisma.wishlistItem.deleteMany({
where: { account_id: { in: userIds } },
Expand Down
24 changes: 24 additions & 0 deletions src/features/order/order-checkout.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,30 @@ extend type Mutation {
CONCURRENT_REQUEST(CONFLICT)다. 로그인 필수.
"""
createOrder(input: CreateOrderInput!): CreateOrderOutput!
"""
커스텀 이미지 업로드용 Presigned URL 발급(구매자). uploadUrl로 PUT한 뒤 publicUrl을 주문 생성의 커스텀 입력에 넣는다.
JPEG·PNG·WebP, 장당 1바이트 이상 10MB 이하(아니면 INVALID_CONTENT_TYPE·INVALID_CONTENT_LENGTH·FILE_TOO_LARGE).
주문에 쓰이지 않은 파일은 발급 하루 뒤 지워진다. 구매자 계정만 쓸 수 있고(아니면 USER_ONLY), 정지·탈퇴 등으로
이용할 수 없는 계정이면 BUYER_ACCOUNT_NOT_ACTIVE다. 로그인 필수.
"""
createOrderCustomUploadUrl(
"""이미지 용도. 주문 생성 때 이 용도의 자리에만 쓸 수 있다."""
purpose: OrderCustomUploadPurpose!
"""파일 MIME 타입(image/jpeg·image/png·image/webp)."""
contentType: String!
"""파일 크기(바이트, 1 이상 10MB 이하)."""
contentLength: Int!
): UploadUrl!
}

"""구매자 커스텀 이미지 업로드 용도."""
enum OrderCustomUploadPurpose {
"""3D 렌더 이미지(윗면·옆면 앞·뒤·좌·우)."""
RENDER
"""슬롯형 합성 이미지(바탕 + 문구, 구매자가 본 그대로)."""
COMPOSITE
"""자유 편집 참고 사진."""
REFERENCE
}

"""주문 생성 입력. 커스텀 필드는 커스텀 스펙 확정 후 optional로 확장 예정."""
Expand Down
5 changes: 5 additions & 0 deletions src/features/order/order.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { AuthModule } from '@/features/auth';
import { OrderCancelPolicy } from '@/features/order/policies/order-cancel.policy';
import { OrderStatusTransitionPolicy } from '@/features/order/policies/order-status-transition.policy';
import { OrderBookedRepository } from '@/features/order/repositories/order-booked.repository';
import { OrderCustomUploadRepository } from '@/features/order/repositories/order-custom-upload.repository';
import { OrderStoreDailyLimitRepository } from '@/features/order/repositories/order-store-daily-limit.repository';
import { OrderTransitionRepository } from '@/features/order/repositories/order-transition.repository';
import { OrderRepository } from '@/features/order/repositories/order.repository';
Expand All @@ -30,6 +31,7 @@ import { OrderSubscriptionResolver } from '@/features/order/resolvers/order-subs
import { OrderAdminAlertConsumer } from '@/features/order/services/order-admin-alert.consumer';
import { AdminOrderService } from '@/features/order/services/order-admin.service';
import { OrderCheckoutService } from '@/features/order/services/order-checkout.service';
import { OrderCustomUploadCleanupScheduler } from '@/features/order/services/order-custom-upload-cleanup.scheduler';
import { AdminDepositService } from '@/features/order/services/order-deposit-admin.service';
import { OrderEventsService } from '@/features/order/services/order-events.service';
import { UserOrderService } from '@/features/order/services/order-my.service';
Expand Down Expand Up @@ -68,6 +70,9 @@ import { StoreModule } from '@/features/store';
OrderSubscriptionResolver,
OrderCheckoutService,
OrderCheckoutMutationResolver,
// 커스텀 이미지 선업로드 기록과 미사용분 정리(worker 크론)
OrderCustomUploadRepository,
OrderCustomUploadCleanupScheduler,
// 판매자 주문 관리(목록·상세·상태 변경·거절·취소) — 주문 도메인이 소유한다
SellerOrderService,
SellerOrderQueryResolver,
Expand Down
86 changes: 86 additions & 0 deletions src/features/order/repositories/order-custom-upload.repository.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
import { Injectable } from '@nestjs/common';

import {
OrderCustomUploadStatus,
type OrderCustomUploadPurpose,
} from '@/generated/prisma/client';
import { PrismaService } from '@/prisma';

export interface PurgeClaim {
id: bigint;
object_key: string;
}

@Injectable()
export class OrderCustomUploadRepository {
constructor(private readonly prisma: PrismaService) {}

async create(args: {
accountId: bigint;
purpose: OrderCustomUploadPurpose;
objectKey: string;
contentType: string;
contentLength: number;
}): Promise<void> {
await this.prisma.orderCustomUpload.create({
data: {
account_id: args.accountId,
purpose: args.purpose,
object_key: args.objectKey,
content_type: args.contentType,
content_length: args.contentLength,
},
});
}

/**
* 정리 대상(오래된 PENDING, 지우다 만 PURGING)을 PURGING으로 표시하고 커밋한다. 표시 뒤에는 주문이 이 업로드를
* 붙이지 못하므로 S3에서 지워도 된다. 주문 tx가 잡고 있는 행은 SKIP LOCKED로 건너뛴다(다음 정리에서 다시 본다).
*/
async claimForPurge(args: {
now: Date;
pendingCreatedBefore: Date;
purgingStartedBefore: Date;
limit: number;
}): Promise<PurgeClaim[]> {
return this.prisma.$transaction(async (tx) => {
// 상태별 인덱스 범위만 잠그도록 두 번 나눠 읽는다
const retries = await tx.$queryRaw<PurgeClaim[]>`
SELECT id, object_key FROM order_custom_upload
WHERE status = ${OrderCustomUploadStatus.PURGING}
AND purge_started_at <= ${args.purgingStartedBefore}
ORDER BY purge_started_at, id
LIMIT ${args.limit}
FOR UPDATE SKIP LOCKED`;
const fresh =
retries.length < args.limit
? await tx.$queryRaw<PurgeClaim[]>`
SELECT id, object_key FROM order_custom_upload
WHERE status = ${OrderCustomUploadStatus.PENDING}
AND created_at <= ${args.pendingCreatedBefore}
ORDER BY created_at, id
LIMIT ${args.limit - retries.length}
FOR UPDATE SKIP LOCKED`
: [];
const claimed = [...retries, ...fresh];
if (claimed.length > 0) {
await tx.orderCustomUpload.updateMany({
where: { id: { in: claimed.map((row) => row.id) } },
data: {
status: OrderCustomUploadStatus.PURGING,
purge_started_at: args.now,
},
});
}
return claimed;
});
}

/** S3에서 지운 업로드 기록을 지운다. 정리 중인 행만 대상이다. */
async deletePurged(ids: bigint[]): Promise<void> {
if (ids.length === 0) return;
await this.prisma.orderCustomUpload.deleteMany({
where: { id: { in: ids }, status: OrderCustomUploadStatus.PURGING },
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { ClockService } from '@/common/providers/clock.service';
import { RandomService } from '@/common/providers/random.service';
import { AUDIT_LOG_REPOSITORY } from '@/features/audit-log';
import { AuditLogRepository } from '@/features/audit-log/repositories/audit-log.repository';
import { OrderCustomUploadRepository } from '@/features/order/repositories/order-custom-upload.repository';
import { OrderRepository } from '@/features/order/repositories/order.repository';
import { PaymentSettingRepository } from '@/features/order/repositories/payment-setting.repository';
import { OrderCheckoutMutationResolver } from '@/features/order/resolvers/order-checkout-mutation.resolver';
Expand All @@ -23,6 +24,11 @@ import {
} from '@/test/factories';
import { createTestingModuleWithRealDb } from '@/test/modules/testing-module.builder';
import { outboxPublisherProviders } from '@/test/outbox';
import { s3TestProviders } from '@/test/storage/s3-test.helper';

jest.mock('@aws-sdk/s3-request-presigner', () => ({
getSignedUrl: jest.fn().mockResolvedValue('https://mock-presigned-url.com'),
}));

// 2026-09-16(수) 16:00 KST 고정
const NOW = new Date('2026-09-16T07:00:00.000Z');
Expand All @@ -39,6 +45,8 @@ describe('OrderCheckout Mutation Resolver (real DB)', () => {
OrderCheckoutMutationResolver,
OrderCheckoutService,
OrderRepository,
OrderCustomUploadRepository,
...s3TestProviders(),
PaymentSettingRepository,
ProductRepository,
{ provide: AUDIT_LOG_REPOSITORY, useClass: AuditLogRepository },
Expand Down Expand Up @@ -114,4 +122,26 @@ describe('OrderCheckout Mutation Resolver (real DB)', () => {
expect(saved.account_id).toBe(account.id);
expect(saved.request_note).toBe('초는 빼 주세요');
});

it('createOrderCustomUploadUrl: 구매자에게 용도별 업로드 URL을 발급하고 기록한다', async () => {
const account = await createAccount(prisma, { account_type: 'USER' });
await createUserProfile(prisma, { account_id: account.id });
const user = { accountId: account.id.toString() } as JwtUser;

const result = await resolver.createOrderCustomUploadUrl(
user,
'COMPOSITE',
'image/png',
1024,
);

expect(result.key).toMatch(
new RegExp(`^order-custom/composites/${account.id}/`),
);
await expect(
prisma.orderCustomUpload.findUniqueOrThrow({
where: { object_key: result.key },
}),
).resolves.toMatchObject({ account_id: account.id, purpose: 'COMPOSITE' });
});
});
15 changes: 15 additions & 0 deletions src/features/order/resolvers/order-checkout-mutation.resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ import { Args, Mutation, Resolver } from '@nestjs/graphql';
import { CreateOrderInput } from '@/features/order/dto/inputs/create-order.input';
import { OrderCheckoutService } from '@/features/order/services/order-checkout.service';
import type { CreateOrderOutput } from '@/features/order/types/create-order-output.type';
import type { OrderCustomUploadPurpose } from '@/generated/prisma/client';
import {
CurrentUser,
JwtAuthGuard,
parseAccountId,
type JwtUser,
} from '@/global/auth';
import type { CreateUploadUrlOutput } from '@/global/storage/types/storage.types';

@Resolver('Mutation')
@UseGuards(JwtAuthGuard)
Expand All @@ -23,4 +25,17 @@ export class OrderCheckoutMutationResolver {
): Promise<CreateOrderOutput> {
return this.checkoutService.createOrder(parseAccountId(user), input);
}

@Mutation('createOrderCustomUploadUrl')
createOrderCustomUploadUrl(
@CurrentUser() user: JwtUser,
@Args('purpose') purpose: OrderCustomUploadPurpose,
@Args('contentType') contentType: string,
@Args('contentLength') contentLength: number,
): Promise<CreateUploadUrlOutput> {
return this.checkoutService.createOrderCustomUploadUrl(
parseAccountId(user),
{ purpose, contentType, contentLength },
);
}
}
Loading
Loading