From 161903ce99041f86f3afa51d720b83a14f52fcd7 Mon Sep 17 00:00:00 2001
From: Dong Jin Park <160587239+straycat405@users.noreply.github.com>
Date: Tue, 10 Mar 2026 19:00:35 +0900
Subject: [PATCH 1/4] Add Swagger API Docs section to README

Added Swagger API documentation link to README.
---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 4ce343c..96c31ae 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,11 @@
 
 ---
 
+## Swagger API Docs
+### http://3.39.35.239:8080/swagger-ui/index.html
+
+---
+
 ## 📌 프로젝트 소개
 
 >  **Delivery Commerce API**는

From 4b337909df452f01e49c71e1ed4b0a358900cc31 Mon Sep 17 00:00:00 2001
From: DongJin Park <straycat405@gmail.com>
Date: Tue, 10 Mar 2026 19:09:34 +0900
Subject: [PATCH 2/4] =?UTF-8?q?-=20README.md=20=EC=B5=9C=EC=8B=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 73 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 4ce343c..be93368 100644
--- a/README.md
+++ b/README.md
@@ -65,38 +65,48 @@
 | 분류 | 기술 |
 |:---:|:---:|
 | Server | AWS EC2 (Free tier) |
-| Database | AWS RDS (PostgreSQL) |
-| Cache | AWS ElastiCache (Redis) |
-| CI/CD | GitHub Actions |
+| Container | Docker, Docker Compose |
+| CI/CD | GitHub Actions + Docker Hub |
 
 ---
 
 ## 🏗️ 아키텍처
 
 ```
-┌────────────────────────────────────────────┐
-│              GitHub Actions                │
-│  push/PR → Build & Test → Deploy to EC2    │
-└──────────────────┬─────────────────────────┘
-                   │ SSH / SCP
-┌──────────────────▼─────────────────────────┐
-│              AWS EC2 (t2.micro)            │
-│         Spring Boot Application            │
-│                 :8080                      │
-└───────────┬──────────────┬─────────────────┘
-            │              │
-┌───────────▼──┐   ┌───────▼──────┐
-│  AWS RDS     │   │ AWS          │
-│  PostgreSQL  │   │ ElastiCache  │
-│  :5432       │   │ Redis :6379  │
-└──────────────┘   └──────────────┘
+┌─────────────────────────────────────────────────────┐
+│                   GitHub Actions                    │
+│  push/PR → Build & Test                             │
+│  main push → bootJar → Docker 빌드 → Docker Hub push │
+└───────────────────────┬─────────────────────────────┘
+                        │ SSH (appleboy/ssh-action)
+                        │ docker pull + docker compose up -d --no-deps app
+┌───────────────────────▼─────────────────────────────┐
+│               AWS EC2 (t2.micro)                    │
+│  ┌─────────────────────────────────────────────┐    │
+│  │  app (straycat405/deliverycommerce:latest)  │    │
+│  │  Spring Boot  :8080 → 외부 공개              │    │
+│  └─────────────────────────────────────────────┘    │
+│  ┌──────────────────────┐  ┌─────────────────────┐  │
+│  │  postgres:16         │  │  redis:7            │  │
+│  │  PostgreSQL  :5432   │  │  Redis       :6379  │  │
+│  │  (내부 통신 전용)      │  │  (내부 통신 전용)     │  │
+│  └──────────────────────┘  └─────────────────────┘  │
+└─────────────────────────────────────────────────────┘
+
+         ┌──────────────────────┐
+         │     Docker Hub       │
+         │  :latest / :{sha}    │
+         └──────────────────────┘
 ```
 
 ### CI/CD Workflow
 ```
-feature/* → develop (PR)   : Build & Test 자동 실행
-develop   → main (PR)   : Build & Test 자동 실행
-main merge              : Build & Test → Deploy to EC2 자동 실행
+feature/* → develop (PR)  : Build & Test 자동 실행
+develop   → main    (PR)  : Build & Test 자동 실행
+main merge                : Build & Test → bootJar → Docker 이미지 빌드
+                            → Docker Hub push (latest + {sha} 태그)
+                            → EC2 SSH 접속 → .env 갱신 → docker pull
+                            → docker compose up -d --no-deps app (앱만 재시작, DB/Redis 유지)
 ```
 
 ---
@@ -112,7 +122,10 @@ main merge              : Build & Test → Deploy to EC2 자동 실행
 ```
 com.babjo.deliverycommerce
 ├── domain
+│   ├── ai            # AI 요청 이력 (AiRequestLog)
 │   ├── cart          # 장바구니 (Cart, CartItem)
+│   ├── order         # 주문 (Order, OrderItem)
+│   ├── payment       # 결제 (Payment, PaymentHistory)
 │   ├── product       # 상품 + AI 설명 생성
 │   ├── review        # 리뷰 & 평점
 │   ├── store         # 가게
@@ -162,6 +175,7 @@ REDIS_HOST=localhost
 REDIS_PORT=6379
 SPRING_PROFILES_ACTIVE=dev
 GOOGLE_API_KEY=your_google_api_key
+GOOGLE_PROJECT_ID=your_google_project_id
 ```
 
 ### 3. PostgreSQL & Redis 실행 (Docker)
@@ -219,10 +233,21 @@ http://localhost:8080/swagger-ui/index.html
 - Soft Delete
 
 ### 📦 주문 (Order)
-- 개발 중
+- 주문 생성 (장바구니 기반, 가격 정합성 검증)
+- 본인 주문 목록 조회 (페이징)
+- 주문 상세 조회
+- 주문 취소 (CUSTOMER - CREATED 상태에서만)
+- 주문 상태 변경 (OWNER - 접수 → 조리중 → 픽업대기 → 픽업완료)
+- 주문 내역 Soft Delete
 
 ### 💳 결제 (Payment)
-- 개발 중
+- 결제 생성 (READY 상태, 주문 중복 방지)
+- 결제 승인 (READY → COMPLETED)
+- 결제 실패 처리 (READY → FAILED)
+- 결제 취소 (생성 후 5분 이내만 가능, READY/COMPLETED → CANCELED)
+- 결제 목록 조회 (QueryDSL 동적 필터링, 페이지 사이즈 10/30/50)
+- 결제 Soft Delete
+- 상태 변경 이력 Insert-Only 저장 (PaymentHistory)
 
 ### ⭐ 리뷰 (Review)
 - 리뷰 작성 / 수정 / 삭제

From 40f3157b9e4e7fc0db52da7bd1cc6f78364cec9b Mon Sep 17 00:00:00 2001
From: Dong Jin Park <160587239+straycat405@users.noreply.github.com>
Date: Tue, 10 Mar 2026 19:14:57 +0900
Subject: [PATCH 3/4] Update README.md for clarity and formatting

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c862231..6c30dbe 100644
--- a/README.md
+++ b/README.md
@@ -83,8 +83,8 @@
 │  push/PR → Build & Test                             │
 │  main push → bootJar → Docker 빌드 → Docker Hub push │
 └───────────────────────┬─────────────────────────────┘
-                        │ SSH (appleboy/ssh-action)
-                        │ docker pull + docker compose up -d --no-deps app
+                        │ 
+                        │ 
 ┌───────────────────────▼─────────────────────────────┐
 │               AWS EC2 (t2.micro)                    │
 │  ┌─────────────────────────────────────────────┐    │
@@ -94,7 +94,7 @@
 │  ┌──────────────────────┐  ┌─────────────────────┐  │
 │  │  postgres:16         │  │  redis:7            │  │
 │  │  PostgreSQL  :5432   │  │  Redis       :6379  │  │
-│  │  (내부 통신 전용)      │  │  (내부 통신 전용)     │  │
+│  │  (내부 통신 전용)     │  │  (내부 통신 전용)    │  │
 │  └──────────────────────┘  └─────────────────────┘  │
 └─────────────────────────────────────────────────────┘
 

From 42ec7a11d29e50a32604a18ff73f7b079a3566d6 Mon Sep 17 00:00:00 2001
From: DongJin Park <straycat405@gmail.com>
Date: Tue, 10 Mar 2026 19:44:35 +0900
Subject: [PATCH 4/4] =?UTF-8?q?-=20deploy=20=EC=84=A4=EC=A0=95=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20(=EA=B9=83=ED=97=88=EB=B8=8C=20=ED=91=9C=EC=8B=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 01adccb..71c3442 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -69,6 +69,7 @@ jobs:
     needs: test # 테스트 실패시 배포 차단
     runs-on: ubuntu-latest
     timeout-minutes: 10 # SSH hang 등 무한 대기 방지
+    environment: production
     if: github.ref == 'refs/heads/main' && github.event_name == 'push' # main 브랜치인지 and 실제 PUSH 검사
 
     steps: