diff --git a/README.md b/README.md index ca4e598..7129e1b 100644 --- a/README.md +++ b/README.md @@ -1,144 +1,28 @@ -# acquire-core-x +# 카드 매입 승인 경로 Spring Boot 3 전환 -**실제로 동작하는** 카드 매입·정산(card acquiring & settlement) 레거시 시스템 — -상용 카드사 스택(Tuxedo / Pro\*C / Oracle / XA)을 **오픈소스 등가물**(Enduro/X · -ECPG/PostgreSQL · XA 2PC) 위에 재현해 **진짜로 빌드·부팅·거래가 커밋**된다. +## 전환 범위 -> **목적** — Klaro **Forge**(자율 마이그레이션 도구)의 **대형 전환 대상 픽스처**. -> "Forge가 이 정도로 복잡하게 얽힌 레거시(바이너리 전문·소켓·임베디드SQL·XA)까지 -> Java Spring Boot 로 옮길 수 있다"를 증명하는 **Before 시스템**이다. 컴파일만 되는 -> 스텁이 아니라 **상용급 TP 미들웨어에서 실제로 도는** 시스템이라는 점이 핵심이다. +| 항목 | 기존 | 전환 후 | +|------|------|----------| +| Spring Boot | 2.7.x | 3.2.x | +| Java | 11 | 17 (LTS) | +| javax.* 네임스페이스 | jakarta.* | +| JPA/Hibernate | 2.x | 3.x | +| Spring Data JPA | 2.x | 3.x | +| H2 Database | 2.1.x | 2.2.x | ---- - -## 1. 한눈에 (실측) - -| 지표 | 값 | -|---|---| -| 소스 파일 (.pgc/.c/.h) | **4,661** | -| 코드 라인 | **333,517 LOC** | -| 온라인 서비스 (tpservice) | **1,478** | -| 배치 잡 | **506** | -| 도메인 모듈 | **11** (매입·승인·정산·지급·원장·마감·대사·검증·마스터·전문GW·공통) | -| DB 테이블 | **101** | -| 운영 데이터 | **~1,173만 행** (매입 135만, 5.5년치, DB ~1.8GB) | -| ISO 8583 전문 코덱 | 실제 비트맵·DE 인코딩 (`common/acq_iso8583.c`) | -| 실제 매입시스템 대비 패리티 | **≈ 89%** ([상세](docs/PARITY_ANALYSIS.md)) | - -BAIS(비씨카드 글로벌 매입시스템) RFI 기준 온라인 1,466 · 배치 503 과 **1:1 규모**. - ---- - -## 2. 스택 - -| 계층 | 실체 | As-Is(상용) 대응 | -|---|---|---| -| TP 모니터 | **Enduro/X 7.0.12** (open Tuxedo/ATMI) | Oracle Tuxedo / Tmax ProFrame | -| 전문 버퍼 | **UBF** (≈ FML32) | Tuxedo FML32 | -| DB 접근 | **ECPG** (`EXEC SQL`) | **Pro\*C** | -| DB | **PostgreSQL 15** | Oracle 19c | -| 분산 트랜잭션 | **XA 2PC** (`libndrxxaecpg`, `tmsrv` 조율) | Oracle XA | -| 외부 연동 | **ISO 8583** over TCP (`acq_extsw`) | 밴사/VAN/카드망 회선 | -| 컨테이너 | `docker compose` (postgres + endurox app) | — | - -> **Oracle 계보**: 원본은 Oracle 19c + Pro\*C 였다. `legacy-oracle/` 에 As-Is Pro\*C/ -> PL-SQL 역사 원본(9본)을 보존하고 방언 이관을 문서화 → [ORACLE_PROVENANCE.md](docs/ORACLE_PROVENANCE.md). -> **라이선스**: Enduro/X 런타임은 AGPLv3(Mavimax). 내부 테스트 자산으로만 사용. - ---- - -## 3. 빠른 시작 +## 검증 절차 ```bash -# 전체 스택 빌드+부팅 (Postgres + Enduro/X 도메인 + 게이트웨이 + 외부망 시뮬레이터) -docker compose -f docker/docker-compose.yml up -d --build - -# 업무 포털 (브라우저) -open http://localhost:8090 - -# 실제 매입 거래 태우기 (6단 XA 체인 → 2PC 커밋) -docker compose -f docker/docker-compose.yml exec app /app/run-driver.sh -# → >>> COMMIT OK: purchase_id=... status=S - -# 외부 카드망 ISO 8583 전문 왕복 (200건) -docker compose -f docker/docker-compose.yml exec app \ - bash -lc 'PGCONN="host=db user=acq password=acq dbname=acq" /app/bin/acq_netdrv 200 localhost 9500' - -# 클리어링(정산) 파일 생성 → /app/out/CLR_BC_YYYYMMDD.dat -docker compose -f docker/docker-compose.yml exec app \ - bash -lc 'PGCONN="host=db user=acq password=acq dbname=acq" /app/bin/acq_clrfile 2026-07-19 /app/out' +./mvnw clean verify ``` -부팅 시 초기화(대량 시드 포함)에 수 분 소요된다. +## API 엔드포인트 ---- - -## 4. 업무 포털 (`http://localhost:8090`) - -Xplatform 스타일 MDI 포털. 모든 화면이 **실측 데이터** 기반이며 `#해시`로 직접 진입. - -**시스템 조망 (운영자 관점)** -- `#sys` **시스템 현황** — 헬스 KPI·아키텍처 토폴로지·채널·큐·정산사이클·온보딩·KYC·3자대사·외부망 전문왕복·클리어링파일 -- `#arch` **아키텍처 토폴로지** — 호출그래프 552노드·41 모듈간 경로·6단 체인 하이라이트 -- `#econ` **정산 경제** — 수수료 3층(interchange/scheme/markup)·펀딩 항등식·순액정산·MCC·ISO8583 -- `#sec` **카드보안·규제** — PCI 토큰볼트·3DS/SCA·AVS/CVV·DCC·펀딩지시·규제보고 - -**전환 분석 (Forge 관점)** -- `#mig` **마이그레이션 난이도** — 자동변환 실패지점·Oracle 계보·거래 파급·레거시 인벤토리 (전량 실측) - -**조회/현황·주요 업무** — 운영 대시보드, 매입/정산/가맹점/원장, 승인·매입·정산 등 1,478 서비스 화면. - ---- - -## 5. 저장소 구조 - -``` -acquire-core-x/ -├── app/ -│ ├── src/ -│ │ ├── / # 11 도메인 모듈 (ac au st py lg cl rc vl mm mg cm) -│ │ │ ├── _svr.pgc # 모듈 서버 (≈133 서비스 advertise) -│ │ │ ├── svc/*.pgc # 온라인 서비스 (1 서비스 = 1 파일) -│ │ │ ├── dbio/*.pgc # DB 접근 함수 (ECPG) -│ │ │ └── batch/*.pgc # 배치 잡 -│ │ ├── common/ # 공통 C (acq_iso8583 ISO코덱·luhn·fee·bizday·seq) -│ │ └── clients/ # acq_httpgw(포털) · acq_extsw(외부망) · acq_netdrv · acq_clrfile -│ ├── ubftab/acq.fd # UBF 필드 테이블 -│ ├── conf/ # ndrxconfig.xml, setapp.sh (XA env) -│ ├── ui/index.html # 업무 포털 (SPA, 인라인) -│ ├── build.sh # 재사용 빌드 + ndrxconfig 생성 (모듈 자동발견) -│ └── entrypoint.sh # 빌드→부팅→게이트웨이·시뮬레이터 기동 -├── db/schema.d/ # 스키마+시드 (00-base ~ 99c, 순서대로 init) -├── legacy-oracle/ # As-Is Oracle Pro*C/PL-SQL 역사 원본 (컴파일 제외) -├── tools/ # gen_callgraph.py · gen_metrics.py (소스 자동 집계) -├── docker/ # docker-compose.yml, endurox.Dockerfile -└── docs/ # 아래 문서 인덱스 -``` - ---- - -## 6. 문서 인덱스 - -| 문서 | 내용 | -|---|---| -| [ARCHITECTURE.md](docs/ARCHITECTURE.md) | 런타임 토폴로지·도메인 분해·트랜잭션 흐름·데이터모델·외부연동·빌드 | -| [PARITY_ANALYSIS.md](docs/PARITY_ANALYSIS.md) | 실제 매입시스템 대비 도메인별 패리티(≈89%) | -| [GAP_ANALYSIS.md](docs/GAP_ANALYSIS.md) | 딥리서치 기반 실제 매입사 구조 대조 | -| [MIGRATION_COMPLEXITY.md](docs/MIGRATION_COMPLEXITY.md) | 마이그레이션 난이도 3축(규모·실패지점·레거시성) 실측 | -| [ORACLE_PROVENANCE.md](docs/ORACLE_PROVENANCE.md) | Oracle 계보 + 방언 이관 매핑 | -| [OPS_RUNBOOK.md](docs/OPS_RUNBOOK.md) | 비기능(HA/DR·PCI·보존·규제) 설계 | -| [service-catalog.md](docs/service-catalog.md) | 서비스 카탈로그 | - ---- - -## 7. 핵심 설계 제약 (마이그레이션 난제) - -- **XA 브랜치 격리** — 한 글로벌 트랜잭션의 형제 XA 브랜치는 서로의 미커밋 행을 못 본다. - 판정값은 UBF 전문으로 실어 나른다(owner-writes 규율). 위반 시 교착. -- **6단 XA 체인** — `ACQUIRE→RECONCILE→SETTLE→ST_MDR→LG_SETTLEPOST→LG_BALCHK` 가 - 하나의 2PC 로 원자 커밋. 모듈내 tpcall 을 위해 서버 카피 4개. -- **ISO 8583 와이어** — 비트맵·DE 인코딩·소켓 프레이밍·타임아웃→취소 전문처리. -- **임베디드 SQL 23,000+ 블록·UBF 47,000+ 접근** — 자동 문법변환이 깨지는 지점. - -이 제약들이 곧 Forge 마이그레이션의 난이도이며, 지표는 `tools/gen_metrics.py` 가 -소스에서 자동 집계한다("이 숫자 진짜냐"에 코드로 답한다). +| Method | Path | 설명 | +|--------|------|------| +| POST | /api/v1/acquisitions | 카드 매입 요청 생성 | +| GET | /api/v1/acquisitions/{id} | 매입 요청 조회 | +| POST | /api/v1/acquisitions/{id}/approve | 매입 승인 처리 | +| POST | /api/v1/acquisitions/{id}/reject | 매입 거절 처리 | +| GET | /api/v1/acquisitions | 전체 매입 요청 목록 | diff --git a/pom.xml b/pom.xml index b45650c..c6cf793 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ proj-acquirex 1.0.0-SNAPSHOT proj-acquirex - 카드 매입 승인 시스템 - Spring Boot 3 + 카드 매입 승인 경로 - Spring Boot 3 전환 17 @@ -34,14 +34,14 @@ org.springframework.boot spring-boot-starter-validation - - org.springframework.boot - spring-boot-starter-test - test - com.h2database h2 + runtime + + + org.springframework.boot + spring-boot-starter-test test @@ -54,4 +54,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/acquirex/AcquirexApplication.java b/src/main/java/com/acquirex/AcquirexApplication.java index daf6bca..cbf43e9 100644 --- a/src/main/java/com/acquirex/AcquirexApplication.java +++ b/src/main/java/com/acquirex/AcquirexApplication.java @@ -8,4 +8,4 @@ public class AcquirexApplication { public static void main(String[] args) { SpringApplication.run(AcquirexApplication.class, args); } -} \ No newline at end of file +} diff --git a/src/main/java/com/acquirex/approval/CardAcquisition.java b/src/main/java/com/acquirex/approval/CardAcquisition.java new file mode 100644 index 0000000..798e8e7 --- /dev/null +++ b/src/main/java/com/acquirex/approval/CardAcquisition.java @@ -0,0 +1,94 @@ +package com.acquirex.approval; + +import jakarta.persistence.*; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 카드 매입 도메인 엔티티. + * Spring Boot 3 전환: javax.persistence → jakarta.persistence + */ +@Entity +@Table(name = "card_acquisitions") +public class CardAcquisition { + + public enum ApprovalStatus { + PENDING, APPROVED, REJECTED, CANCELLED + } + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "card_number", nullable = false, length = 20) + private String cardNumber; + + @Column(name = "merchant_id", nullable = false, length = 20) + private String merchantId; + + @Column(name = "amount", nullable = false, precision = 15, scale = 2) + private BigDecimal amount; + + @Enumerated(EnumType.STRING) + @Column(name = "status", nullable = false, length = 20) + private ApprovalStatus status = ApprovalStatus.PENDING; + + @Column(name = "created_at", nullable = false) + private LocalDateTime createdAt; + + @Column(name = "updated_at") + private LocalDateTime updatedAt; + + @Column(name = "approved_by", length = 100) + private String approvedBy; + + @Column(name = "rejection_reason", length = 500) + private String rejectionReason; + + public CardAcquisition() { + this.createdAt = LocalDateTime.now(); + } + + public CardAcquisition(String cardNumber, String merchantId, BigDecimal amount) { + this(); + this.cardNumber = cardNumber; + this.merchantId = merchantId; + this.amount = amount; + } + + public Long getId() { return id; } + public void setId(Long id) { this.id = id; } + public String getCardNumber() { return cardNumber; } + public void setCardNumber(String cardNumber) { this.cardNumber = cardNumber; } + public String getMerchantId() { return merchantId; } + public void setMerchantId(String merchantId) { this.merchantId = merchantId; } + public BigDecimal getAmount() { return amount; } + public void setAmount(BigDecimal amount) { this.amount = amount; } + public ApprovalStatus getStatus() { return status; } + public void setStatus(ApprovalStatus status) { this.status = status; } + public LocalDateTime getCreatedAt() { return createdAt; } + public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; } + public LocalDateTime getUpdatedAt() { return updatedAt; } + public void setUpdatedAt(LocalDateTime updatedAt) { this.updatedAt = updatedAt; } + public String getApprovedBy() { return approvedBy; } + public void setApprovedBy(String approvedBy) { this.approvedBy = approvedBy; } + public String getRejectionReason() { return rejectionReason; } + public void setRejectionReason(String rejectionReason) { this.rejectionReason = rejectionReason; } + + public void approve(String approver) { + this.status = ApprovalStatus.APPROVED; + this.approvedBy = approver; + this.updatedAt = LocalDateTime.now(); + } + + public void reject(String reason) { + this.status = ApprovalStatus.REJECTED; + this.rejectionReason = reason; + this.updatedAt = LocalDateTime.now(); + } + + public void cancel() { + this.status = ApprovalStatus.CANCELLED; + this.updatedAt = LocalDateTime.now(); + } +} diff --git a/src/main/java/com/acquirex/approval/CardAcquisitionController.java b/src/main/java/com/acquirex/approval/CardAcquisitionController.java new file mode 100644 index 0000000..8d2e92b --- /dev/null +++ b/src/main/java/com/acquirex/approval/CardAcquisitionController.java @@ -0,0 +1,95 @@ +package com.acquirex.approval; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 카드 매입 승인 REST 컨트롤러. + * Spring Boot 3 전환: javax.validation → jakarta.validation + */ +@RestController +@RequestMapping("/api/v1/acquisitions") +public class CardAcquisitionController { + + private final CardAcquisitionService service; + + public CardAcquisitionController(CardAcquisitionService service) { + this.service = service; + } + + @PostMapping + public ResponseEntity createAcquisition( + @Valid @RequestBody CreateAcquisitionRequest request) { + CardAcquisition acquisition = service.createAcquisition( + request.cardNumber(), request.merchantId(), request.amount()); + return ResponseEntity.status(HttpStatus.CREATED) + .body(CardAcquisitionResponse.from(acquisition)); + } + + @GetMapping("/{id}") + public ResponseEntity getAcquisition(@PathVariable Long id) { + return service.findById(id) + .map(CardAcquisitionResponse::from) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } + + @GetMapping + public ResponseEntity> getAllAcquisitions( + @RequestParam(required = false) CardAcquisition.ApprovalStatus status) { + List acquisitions = (status != null) + ? service.findByStatus(status) : service.findAll(); + return ResponseEntity.ok(acquisitions.stream().map(CardAcquisitionResponse::from).toList()); + } + + @PostMapping("/{id}/approve") + public ResponseEntity approveAcquisition( + @PathVariable Long id, @RequestBody ApproveRequest request) { + return ResponseEntity.ok(CardAcquisitionResponse.from(service.approve(id, request.approver()))); + } + + @PostMapping("/{id}/reject") + public ResponseEntity rejectAcquisition( + @PathVariable Long id, @RequestBody RejectRequest request) { + return ResponseEntity.ok(CardAcquisitionResponse.from(service.reject(id, request.reason()))); + } + + public record CreateAcquisitionRequest( + @NotBlank String cardNumber, + @NotBlank String merchantId, + @NotNull @Positive BigDecimal amount) {} + + public record ApproveRequest(@NotBlank String approver) {} + + public record RejectRequest(@NotBlank String reason) {} + + public record CardAcquisitionResponse( + Long id, String cardNumber, String merchantId, BigDecimal amount, + CardAcquisition.ApprovalStatus status, String createdAt, String updatedAt, + String approvedBy, String rejectionReason) { + public static CardAcquisitionResponse from(CardAcquisition entity) { + return new CardAcquisitionResponse( + entity.getId(), + maskCardNumber(entity.getCardNumber()), + entity.getMerchantId(), + entity.getAmount(), + entity.getStatus(), + entity.getCreatedAt().toString(), + entity.getUpdatedAt() != null ? entity.getUpdatedAt().toString() : null, + entity.getApprovedBy(), + entity.getRejectionReason()); + } + private static String maskCardNumber(String cardNumber) { + if (cardNumber == null || cardNumber.length() < 8) return "****"; + return cardNumber.substring(0, 4) + "****" + cardNumber.substring(cardNumber.length() - 4); + } + } +} diff --git a/src/main/java/com/acquirex/approval/CardAcquisitionService.java b/src/main/java/com/acquirex/approval/CardAcquisitionService.java new file mode 100644 index 0000000..fac8b83 --- /dev/null +++ b/src/main/java/com/acquirex/approval/CardAcquisitionService.java @@ -0,0 +1,86 @@ +package com.acquirex.approval; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.util.List; +import java.util.Optional; + +/** + * 카드 매입 서비스 + 리포지토리. + * Spring Boot 3 전환: jakarta.transaction.Transactional + */ +@Repository +interface CardAcquisitionRepository extends JpaRepository { + List findByStatus(CardAcquisition.ApprovalStatus status); + List findByMerchantId(String merchantId); +} + +@Service +@Transactional +public class CardAcquisitionService { + + private final CardAcquisitionRepository repository; + + public CardAcquisitionService(CardAcquisitionRepository repository) { + this.repository = repository; + } + + public CardAcquisition createAcquisition(String cardNumber, String merchantId, BigDecimal amount) { + validateAmount(amount); + CardAcquisition acquisition = new CardAcquisition(cardNumber, merchantId, amount); + return repository.save(acquisition); + } + + @Transactional(readOnly = true) + public Optional findById(Long id) { + return repository.findById(id); + } + + @Transactional(readOnly = true) + public List findAll() { + return repository.findAll(); + } + + @Transactional(readOnly = true) + public List findByStatus(CardAcquisition.ApprovalStatus status) { + return repository.findByStatus(status); + } + + public CardAcquisition approve(Long id, String approver) { + CardAcquisition acquisition = repository.findById(id) + .orElseThrow(() -> new IllegalArgumentException("매입 요청을 찾을 수 없습니다: " + id)); + if (acquisition.getStatus() != CardAcquisition.ApprovalStatus.PENDING) { + throw new IllegalStateException("대기 상태의 요청만 승인할 수 있습니다."); + } + acquisition.approve(approver); + return repository.save(acquisition); + } + + public CardAcquisition reject(Long id, String reason) { + CardAcquisition acquisition = repository.findById(id) + .orElseThrow(() -> new IllegalArgumentException("매입 요청을 찾을 수 없습니다: " + id)); + if (acquisition.getStatus() != CardAcquisition.ApprovalStatus.PENDING) { + throw new IllegalStateException("대기 상태의 요청만 거절할 수 있습니다."); + } + acquisition.reject(reason); + return repository.save(acquisition); + } + + public CardAcquisition cancel(Long id) { + CardAcquisition acquisition = repository.findById(id) + .orElseThrow(() -> new IllegalArgumentException("매입 요청을 찾을 수 없습니다: " + id)); + if (acquisition.getStatus() == CardAcquisition.ApprovalStatus.APPROVED) { + throw new IllegalStateException("이미 승인된 요청은 취소할 수 없습니다."); + } + acquisition.cancel(); + return repository.save(acquisition); + } + + private void validateAmount(BigDecimal amount) { + if (amount == null || amount.compareTo(BigDecimal.ZERO) <= 0) { + throw new IllegalArgumentException("매입 금액은 0보다 커야 합니다."); + } + } +} diff --git a/src/main/java/com/acquirex/controller/ApprovalController.java b/src/main/java/com/acquirex/controller/ApprovalController.java deleted file mode 100644 index 79d9136..0000000 --- a/src/main/java/com/acquirex/controller/ApprovalController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.acquirex.controller; - -import com.acquirex.dto.ApprovalRequestDto; -import com.acquirex.dto.ApprovalResponseDto; -import com.acquirex.service.ApprovalService; -import jakarta.validation.Valid; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -@RestController -@RequestMapping("/api/v1/approvals") -public class ApprovalController { - - private final ApprovalService approvalService; - - public ApprovalController(ApprovalService approvalService) { - this.approvalService = approvalService; - } - - @PostMapping - public ResponseEntity requestApproval(@Valid @RequestBody ApprovalRequestDto request) { - ApprovalResponseDto response = approvalService.requestApproval(request); - return ResponseEntity.status(HttpStatus.CREATED).body(response); - } - - @PostMapping("/{id}/approve") - public ResponseEntity approveRequest(@PathVariable Long id) { - ApprovalResponseDto response = approvalService.approveRequest(id); - return ResponseEntity.ok(response); - } - - @PostMapping("/{id}/reject") - public ResponseEntity rejectRequest(@PathVariable Long id, @RequestBody Map body) { - String reason = body.getOrDefault("reason", "사유 미지정"); - ApprovalResponseDto response = approvalService.rejectRequest(id, reason); - return ResponseEntity.ok(response); - } - - @GetMapping("/{id}") - public ResponseEntity getApprovalStatus(@PathVariable Long id) { - ApprovalResponseDto response = approvalService.getApprovalStatus(id); - return ResponseEntity.ok(response); - } -} \ No newline at end of file diff --git a/src/main/java/com/acquirex/domain/DomainClasses.java b/src/main/java/com/acquirex/domain/DomainClasses.java deleted file mode 100644 index ffd4576..0000000 --- a/src/main/java/com/acquirex/domain/DomainClasses.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.acquirex.domain; - -import jakarta.persistence.*; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -// ===== AcquisitionCard Entity ===== -@Entity -@Table(name = "acquisition_cards") -class AcquisitionCard { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @NotBlank - @Column(name = "card_number", length = 20) - private String cardNumber; - - @NotBlank - @Column(name = "card_company_code", length = 10) - private String cardCompanyCode; - - @NotNull - @Column(name = "merchant_number", length = 15) - private String merchantNumber; - - @Enumerated(EnumType.STRING) - @Column(name = "status", length = 20) - private CardStatus status = CardStatus.PENDING; - - @Column(name = "created_at") - private LocalDateTime createdAt; - - @Column(name = "updated_at") - private LocalDateTime updatedAt; - - public enum CardStatus { PENDING, APPROVED, REJECTED, CANCELLED } - - @PrePersist - protected void onCreate() { - createdAt = LocalDateTime.now(); - updatedAt = LocalDateTime.now(); - } - - @PreUpdate - protected void onUpdate() { - updatedAt = LocalDateTime.now(); - } - - public Long getId() { return id; } - public void setId(Long id) { this.id = id; } - public String getCardNumber() { return cardNumber; } - public void setCardNumber(String cardNumber) { this.cardNumber = cardNumber; } - public String getCardCompanyCode() { return cardCompanyCode; } - public void setCardCompanyCode(String cardCompanyCode) { this.cardCompanyCode = cardCompanyCode; } - public String getMerchantNumber() { return merchantNumber; } - public void setMerchantNumber(String merchantNumber) { this.merchantNumber = merchantNumber; } - public CardStatus getStatus() { return status; } - public void setStatus(CardStatus status) { this.status = status; } - public LocalDateTime getCreatedAt() { return createdAt; } - public LocalDateTime getUpdatedAt() { return updatedAt; } -} - -// ===== ApprovalRequest Entity ===== -@Entity -@Table(name = "approval_requests") -class ApprovalRequest { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @NotNull - @Column(name = "card_id") - private Long cardId; - - @NotBlank - @Column(name = "transaction_id", length = 30, unique = true) - private String transactionId; - - @NotNull - @Column(name = "amount", precision = 15, scale = 2) - private BigDecimal amount; - - @Column(name = "vat", precision = 15, scale = 2) - private BigDecimal vat; - - @Enumerated(EnumType.STRING) - @Column(name = "approval_status", length = 20) - private ApprovalStatus approvalStatus = ApprovalStatus.REQUESTED; - - @Column(name = "approval_number", length = 20) - private String approvalNumber; - - @Column(name = "requested_at") - private LocalDateTime requestedAt; - - @Column(name = "approved_at") - private LocalDateTime approvedAt; - - @Column(name = "rejection_reason", length = 200) - private String rejectionReason; - - public enum ApprovalStatus { REQUESTED, APPROVED, REJECTED, CANCELLED } - - @PrePersist - protected void onCreate() { - requestedAt = LocalDateTime.now(); - } - - public Long getId() { return id; } - public void setId(Long id) { this.id = id; } - public Long getCardId() { return cardId; } - public void setCardId(Long cardId) { this.cardId = cardId; } - public String getTransactionId() { return transactionId; } - public void setTransactionId(String transactionId) { this.transactionId = transactionId; } - public BigDecimal getAmount() { return amount; } - public void setAmount(BigDecimal amount) { this.amount = amount; } - public BigDecimal getVat() { return vat; } - public void setVat(BigDecimal vat) { this.vat = vat; } - public ApprovalStatus getApprovalStatus() { return approvalStatus; } - public void setApprovalStatus(ApprovalStatus approvalStatus) { this.approvalStatus = approvalStatus; } - public String getApprovalNumber() { return approvalNumber; } - public void setApprovalNumber(String approvalNumber) { this.approvalNumber = approvalNumber; } - public LocalDateTime getRequestedAt() { return requestedAt; } - public LocalDateTime getApprovedAt() { return approvedAt; } - public void setApprovedAt(LocalDateTime approvedAt) { this.approvedAt = approvedAt; } - public String getRejectionReason() { return rejectionReason; } - public void setRejectionReason(String rejectionReason) { this.rejectionReason = rejectionReason; } -} \ No newline at end of file diff --git a/src/main/java/com/acquirex/dto/Dtos.java b/src/main/java/com/acquirex/dto/Dtos.java deleted file mode 100644 index 4f835b3..0000000 --- a/src/main/java/com/acquirex/dto/Dtos.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.acquirex.dto; - -import jakarta.validation.constraints.*; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -// ===== ApprovalRequestDto ===== -class ApprovalRequestDto { - @NotBlank(message = "카드 번호는 필수입니다") - @Size(max = 20) - private String cardNumber; - - @NotBlank(message = "카드사 코드는 필수입니다") - @Size(max = 10) - private String cardCompanyCode; - - @NotBlank(message = "가맹점 번호는 필수입니다") - @Size(max = 15) - private String merchantNumber; - - @NotNull(message = "거래 금액은 필수입니다") - @DecimalMin(value = "0.01") - @Digits(integer = 13, fraction = 2) - private BigDecimal amount; - - @DecimalMin(value = "0.00") - @Digits(integer = 13, fraction = 2) - private BigDecimal vat; - - public String getCardNumber() { return cardNumber; } - public void setCardNumber(String cardNumber) { this.cardNumber = cardNumber; } - public String getCardCompanyCode() { return cardCompanyCode; } - public void setCardCompanyCode(String cardCompanyCode) { this.cardCompanyCode = cardCompanyCode; } - public String getMerchantNumber() { return merchantNumber; } - public void setMerchantNumber(String merchantNumber) { this.merchantNumber = merchantNumber; } - public BigDecimal getAmount() { return amount; } - public void setAmount(BigDecimal amount) { this.amount = amount; } - public BigDecimal getVat() { return vat; } - public void setVat(BigDecimal vat) { this.vat = vat; } -} - -// ===== ApprovalResponseDto ===== -class ApprovalResponseDto { - private Long approvalId; - private String transactionId; - private String approvalNumber; - private String status; - private BigDecimal amount; - private BigDecimal vat; - private LocalDateTime approvedAt; - private String message; - - public ApprovalResponseDto() {} - - public ApprovalResponseDto(Long approvalId, String transactionId, String approvalNumber, - String status, BigDecimal amount, BigDecimal vat, - LocalDateTime approvedAt, String message) { - this.approvalId = approvalId; - this.transactionId = transactionId; - this.approvalNumber = approvalNumber; - this.status = status; - this.amount = amount; - this.vat = vat; - this.approvedAt = approvedAt; - this.message = message; - } - - public Long getApprovalId() { return approvalId; } - public void setApprovalId(Long approvalId) { this.approvalId = approvalId; } - public String getTransactionId() { return transactionId; } - public void setTransactionId(String transactionId) { this.transactionId = transactionId; } - public String getApprovalNumber() { return approvalNumber; } - public void setApprovalNumber(String approvalNumber) { this.approvalNumber = approvalNumber; } - public String getStatus() { return status; } - public void setStatus(String status) { this.status = status; } - public BigDecimal getAmount() { return amount; } - public void setAmount(BigDecimal amount) { this.amount = amount; } - public BigDecimal getVat() { return vat; } - public void setVat(BigDecimal vat) { this.vat = vat; } - public LocalDateTime getApprovedAt() { return approvedAt; } - public void setApprovedAt(LocalDateTime approvedAt) { this.approvedAt = approvedAt; } - public String getMessage() { return message; } - public void setMessage(String message) { this.message = message; } -} \ No newline at end of file diff --git a/src/main/java/com/acquirex/repository/Repositories.java b/src/main/java/com/acquirex/repository/Repositories.java deleted file mode 100644 index 6da0c2f..0000000 --- a/src/main/java/com/acquirex/repository/Repositories.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.acquirex.repository; - -import com.acquirex.domain.AcquisitionCard; -import com.acquirex.domain.ApprovalRequest; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.List; -import java.util.Optional; - -@Repository -interface AcquisitionCardRepository extends JpaRepository { - Optional findByCardNumberAndCardCompanyCode(String cardNumber, String cardCompanyCode); - Optional findByMerchantNumber(String merchantNumber); -} - -@Repository -interface ApprovalRequestRepository extends JpaRepository { - Optional findByTransactionId(String transactionId); - List findByCardId(Long cardId); - List findByApprovalStatus(ApprovalRequest.ApprovalStatus status); -} \ No newline at end of file diff --git a/src/main/java/com/acquirex/service/ApprovalService.java b/src/main/java/com/acquirex/service/ApprovalService.java deleted file mode 100644 index 3dffa02..0000000 --- a/src/main/java/com/acquirex/service/ApprovalService.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.acquirex.service; - -import com.acquirex.domain.AcquisitionCard; -import com.acquirex.domain.ApprovalRequest; -import com.acquirex.dto.ApprovalRequestDto; -import com.acquirex.dto.ApprovalResponseDto; -import com.acquirex.repository.AcquisitionCardRepository; -import com.acquirex.repository.ApprovalRequestRepository; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.UUID; - -@Service -public class ApprovalService { - - private final ApprovalRequestRepository approvalRequestRepository; - private final AcquisitionCardRepository acquisitionCardRepository; - - public ApprovalService(ApprovalRequestRepository approvalRequestRepository, - AcquisitionCardRepository acquisitionCardRepository) { - this.approvalRequestRepository = approvalRequestRepository; - this.acquisitionCardRepository = acquisitionCardRepository; - } - - @Transactional - public ApprovalResponseDto requestApproval(ApprovalRequestDto dto) { - String transactionId = generateTransactionId(); - - AcquisitionCard card = acquisitionCardRepository - .findByCardNumberAndCardCompanyCode(dto.getCardNumber(), dto.getCardCompanyCode()) - .orElseGet(() -> createNewCard(dto)); - - ApprovalRequest request = new ApprovalRequest(); - request.setCardId(card.getId()); - request.setTransactionId(transactionId); - request.setAmount(dto.getAmount()); - request.setVat(dto.getVat()); - request.setApprovalStatus(ApprovalRequest.ApprovalStatus.REQUESTED); - - ApprovalRequest saved = approvalRequestRepository.save(request); - return buildApprovalResponse(saved, "매입 승인 요청이 완료되었습니다"); - } - - @Transactional - public ApprovalResponseDto approveRequest(Long requestId) { - ApprovalRequest request = approvalRequestRepository.findById(requestId) - .orElseThrow(() -> new IllegalArgumentException("승인 요청을 찾을 수 없습니다: " + requestId)); - - if (request.getApprovalStatus() != ApprovalRequest.ApprovalStatus.REQUESTED) { - throw new IllegalStateException("이미 처리된 요청입니다"); - } - - request.setApprovalNumber(generateApprovalNumber()); - request.setApprovalStatus(ApprovalRequest.ApprovalStatus.APPROVED); - request.setApprovedAt(LocalDateTime.now()); - - ApprovalRequest saved = approvalRequestRepository.save(request); - return buildApprovalResponse(saved, "매입 승인이 완료되었습니다"); - } - - @Transactional - public ApprovalResponseDto rejectRequest(Long requestId, String reason) { - ApprovalRequest request = approvalRequestRepository.findById(requestId) - .orElseThrow(() -> new IllegalArgumentException("승인 요청을 찾을 수 없습니다: " + requestId)); - - if (request.getApprovalStatus() != ApprovalRequest.ApprovalStatus.REQUESTED) { - throw new IllegalStateException("이미 처리된 요청입니다"); - } - - request.setApprovalStatus(ApprovalRequest.ApprovalStatus.REJECTED); - request.setRejectionReason(reason); - - ApprovalRequest saved = approvalRequestRepository.save(request); - return buildApprovalResponse(saved, "매입 승인이 거절되었습니다"); - } - - @Transactional(readOnly = true) - public ApprovalResponseDto getApprovalStatus(Long requestId) { - ApprovalRequest request = approvalRequestRepository.findById(requestId) - .orElseThrow(() -> new IllegalArgumentException("승인 요청을 찾을 수 없습니다: " + requestId)); - return buildApprovalResponse(request, "조회가 완료되었습니다"); - } - - private AcquisitionCard createNewCard(ApprovalRequestDto dto) { - AcquisitionCard card = new AcquisitionCard(); - card.setCardNumber(dto.getCardNumber()); - card.setCardCompanyCode(dto.getCardCompanyCode()); - card.setMerchantNumber(dto.getMerchantNumber()); - card.setStatus(AcquisitionCard.CardStatus.PENDING); - return acquisitionCardRepository.save(card); - } - - private String generateTransactionId() { - return "TX" + System.currentTimeMillis() + UUID.randomUUID().toString().substring(0, 8).toUpperCase(); - } - - private String generateApprovalNumber() { - return "AP" + System.currentTimeMillis(); - } - - private ApprovalResponseDto buildApprovalResponse(ApprovalRequest request, String message) { - return new ApprovalResponseDto( - request.getId(), request.getTransactionId(), request.getApprovalNumber(), - request.getApprovalStatus().name(), request.getAmount(), request.getVat(), - request.getApprovedAt(), message - ); - } -} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..4a5e9a4 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,20 @@ +spring: + application: + name: proj-acquirex + datasource: + url: jdbc:h2:mem:acquirex;DB_CLOSE_DELAY=-1 + driver-class-name: org.h2.Driver + username: sa + jpa: + hibernate: + ddl-auto: create-drop + show-sql: true + properties: + hibernate: + format_sql: true + h2: + console: + enabled: true + path: /h2-console +server: + port: 8080 diff --git a/src/test/java/com/acquirex/ApprovalServiceTest.java b/src/test/java/com/acquirex/ApprovalServiceTest.java deleted file mode 100644 index 5facdf5..0000000 --- a/src/test/java/com/acquirex/ApprovalServiceTest.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.acquirex; - -import com.acquirex.domain.AcquisitionCard; -import com.acquirex.domain.ApprovalRequest; -import com.acquirex.dto.ApprovalRequestDto; -import com.acquirex.dto.ApprovalResponseDto; -import com.acquirex.repository.AcquisitionCardRepository; -import com.acquirex.repository.ApprovalRequestRepository; -import com.acquirex.service.ApprovalService; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import java.math.BigDecimal; -import java.util.Optional; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; - -@ExtendWith(MockitoExtension.class) -class ApprovalServiceTest { - - @Mock - private ApprovalRequestRepository approvalRequestRepository; - - @Mock - private AcquisitionCardRepository acquisitionCardRepository; - - private ApprovalService approvalService; - private ApprovalRequestDto validRequestDto; - private AcquisitionCard testCard; - private ApprovalRequest testRequest; - - @BeforeEach - void setUp() { - approvalService = new ApprovalService(approvalRequestRepository, acquisitionCardRepository); - - validRequestDto = new ApprovalRequestDto(); - validRequestDto.setCardNumber("1234567890123456"); - validRequestDto.setCardCompanyCode("KB"); - validRequestDto.setMerchantNumber("123456789012345"); - validRequestDto.setAmount(new BigDecimal("50000.00")); - validRequestDto.setVat(new BigDecimal("5000.00")); - - testCard = new AcquisitionCard(); - testCard.setId(1L); - testCard.setCardNumber("1234567890123456"); - testCard.setCardCompanyCode("KB"); - testCard.setMerchantNumber("123456789012345"); - testCard.setStatus(AcquisitionCard.CardStatus.PENDING); - - testRequest = new ApprovalRequest(); - testRequest.setId(1L); - testRequest.setCardId(1L); - testRequest.setTransactionId("TX12345678"); - testRequest.setAmount(new BigDecimal("50000.00")); - testRequest.setVat(new BigDecimal("5000.00")); - testRequest.setApprovalStatus(ApprovalRequest.ApprovalStatus.REQUESTED); - } - - @Test - @DisplayName("매입 승인 요청 성공 - 기존 카드") - void requestApproval_WithExistingCard_Success() { - when(acquisitionCardRepository.findByCardNumberAndCardCompanyCode(any(), any())) - .thenReturn(Optional.of(testCard)); - when(approvalRequestRepository.save(any(ApprovalRequest.class))).thenReturn(testRequest); - - ApprovalResponseDto response = approvalService.requestApproval(validRequestDto); - - assertNotNull(response); - assertEquals("TX12345678", response.getTransactionId()); - assertEquals("REQUESTED", response.getStatus()); - verify(acquisitionCardRepository, never()).save(any()); - verify(approvalRequestRepository, times(1)).save(any()); - } - - @Test - @DisplayName("매입 승인 요청 성공 - 신규 카드") - void requestApproval_WithNewCard_Success() { - when(acquisitionCardRepository.findByCardNumberAndCardCompanyCode(any(), any())) - .thenReturn(Optional.empty()); - when(acquisitionCardRepository.save(any(AcquisitionCard.class))).thenReturn(testCard); - when(approvalRequestRepository.save(any(ApprovalRequest.class))).thenReturn(testRequest); - - ApprovalResponseDto response = approvalService.requestApproval(validRequestDto); - - assertNotNull(response); - assertEquals("REQUESTED", response.getStatus()); - verify(acquisitionCardRepository, times(1)).save(any()); - } - - @Test - @DisplayName("매입 승인 처리 성공") - void approveRequest_Success() { - when(approvalRequestRepository.findById(1L)).thenReturn(Optional.of(testRequest)); - when(approvalRequestRepository.save(any(ApprovalRequest.class))) - .thenAnswer(invocation -> invocation.getArgument(0)); - - ApprovalResponseDto response = approvalService.approveRequest(1L); - - assertNotNull(response); - assertEquals("APPROVED", response.getStatus()); - assertNotNull(response.getApprovalNumber()); - assertNotNull(response.getApprovedAt()); - } - - @Test - @DisplayName("매입 승인 처리 실패 - 요청 없음") - void approveRequest_NotFound() { - when(approvalRequestRepository.findById(999L)).thenReturn(Optional.empty()); - assertThrows(IllegalArgumentException.class, () -> approvalService.approveRequest(999L)); - } - - @Test - @DisplayName("매입 승인 처리 실패 - 이미 처리됨") - void approveRequest_AlreadyProcessed() { - testRequest.setApprovalStatus(ApprovalRequest.ApprovalStatus.APPROVED); - when(approvalRequestRepository.findById(1L)).thenReturn(Optional.of(testRequest)); - assertThrows(IllegalStateException.class, () -> approvalService.approveRequest(1L)); - } - - @Test - @DisplayName("매입 승인 거절 성공") - void rejectRequest_Success() { - when(approvalRequestRepository.findById(1L)).thenReturn(Optional.of(testRequest)); - when(approvalRequestRepository.save(any(ApprovalRequest.class))) - .thenAnswer(invocation -> invocation.getArgument(0)); - - ApprovalResponseDto response = approvalService.rejectRequest(1L, "한도 초과"); - - assertNotNull(response); - assertEquals("REJECTED", response.getStatus()); - } - - @Test - @DisplayName("승인 상태 조회 성공") - void getApprovalStatus_Success() { - when(approvalRequestRepository.findById(1L)).thenReturn(Optional.of(testRequest)); - - ApprovalResponseDto response = approvalService.getApprovalStatus(1L); - - assertNotNull(response); - assertEquals(1L, response.getApprovalId()); - assertEquals("TX12345678", response.getTransactionId()); - } -} \ No newline at end of file diff --git a/src/test/java/com/acquirex/approval/CardAcquisitionServiceTest.java b/src/test/java/com/acquirex/approval/CardAcquisitionServiceTest.java new file mode 100644 index 0000000..b0098a5 --- /dev/null +++ b/src/test/java/com/acquirex/approval/CardAcquisitionServiceTest.java @@ -0,0 +1,102 @@ +package com.acquirex.approval; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +class CardAcquisitionServiceTest { + + @Mock + private CardAcquisitionRepository repository; + + @InjectMocks + private CardAcquisitionService service; + + private CardAcquisition testAcquisition; + + @BeforeEach + void setUp() { + testAcquisition = new CardAcquisition("1234567890123456", "MERCH001", new BigDecimal("100000")); + testAcquisition.setId(1L); + } + + @Test + @DisplayName("유효한 정보로 매입 요청을 생성한다") + void shouldCreateAcquisitionWithValidData() { + when(repository.save(any(CardAcquisition.class))).thenReturn(testAcquisition); + CardAcquisition result = service.createAcquisition("1234567890123456", "MERCH001", new BigDecimal("100000")); + assertThat(result).isNotNull(); + assertThat(result.getStatus()).isEqualTo(CardAcquisition.ApprovalStatus.PENDING); + verify(repository, times(1)).save(any(CardAcquisition.class)); + } + + @Test + @DisplayName("금액이 0 이하이면 예외를 발생시킨다") + void shouldThrowExceptionWhenAmountIsZeroOrNegative() { + assertThatThrownBy(() -> service.createAcquisition("1234567890123456", "MERCH001", BigDecimal.ZERO)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("0보다 커야 합니다"); + } + + @Test + @DisplayName("대기 상태의 매입 요청을 승인한다") + void shouldApprovePendingAcquisition() { + when(repository.findById(1L)).thenReturn(Optional.of(testAcquisition)); + when(repository.save(any(CardAcquisition.class))).thenAnswer(i -> i.getArgument(0)); + CardAcquisition result = service.approve(1L, "admin"); + assertThat(result.getStatus()).isEqualTo(CardAcquisition.ApprovalStatus.APPROVED); + assertThat(result.getApprovedBy()).isEqualTo("admin"); + } + + @Test + @DisplayName("이미 승인된 요청은 다시 승인할 수 없다") + void shouldThrowExceptionWhenAlreadyApproved() { + testAcquisition.approve("previous"); + when(repository.findById(1L)).thenReturn(Optional.of(testAcquisition)); + assertThatThrownBy(() -> service.approve(1L, "admin")) + .isInstanceOf(IllegalStateException.class) + .hasMessageContaining("대기 상태"); + } + + @Test + @DisplayName("대기 상태의 매입 요청을 거절한다") + void shouldRejectPendingAcquisition() { + when(repository.findById(1L)).thenReturn(Optional.of(testAcquisition)); + when(repository.save(any(CardAcquisition.class))).thenAnswer(i -> i.getArgument(0)); + CardAcquisition result = service.reject(1L, "Invalid merchant"); + assertThat(result.getStatus()).isEqualTo(CardAcquisition.ApprovalStatus.REJECTED); + assertThat(result.getRejectionReason()).isEqualTo("Invalid merchant"); + } + + @Test + @DisplayName("존재하지 않는 요청은 예외를 발생시킨다") + void shouldThrowExceptionWhenNotFound() { + when(repository.findById(999L)).thenReturn(Optional.empty()); + assertThatThrownBy(() -> service.approve(999L, "admin")) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("찾을 수 없습니다"); + } + + @Test + @DisplayName("상태별 매입 요청을 조회한다") + void shouldFindByStatus() { + when(repository.findByStatus(CardAcquisition.ApprovalStatus.PENDING)) + .thenReturn(List.of(testAcquisition)); + List result = service.findByStatus(CardAcquisition.ApprovalStatus.PENDING); + assertThat(result).hasSize(1); + } +}