Compare commits
11 commits
main
...
forge/ACX-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
25e180cf9b | ||
| c1c59dd423 | |||
| 87b0f14360 | |||
| 3cb5348492 | |||
| 3790d30330 | |||
| 9536892e5a | |||
| ec34b302cf | |||
| 52dee34ff3 | |||
| 92743ee604 | |||
| 3391272d17 | |||
| b16ece0036 |
8 changed files with 740 additions and 120 deletions
175
README.md
175
README.md
|
|
@ -1,144 +1,79 @@
|
|||
# acquire-core-x
|
||||
# proj-acquirex - Card Acquisition Approval System
|
||||
|
||||
**실제로 동작하는** 카드 매입·정산(card acquiring & settlement) 레거시 시스템 —
|
||||
상용 카드사 스택(Tuxedo / Pro\*C / Oracle / XA)을 **오픈소스 등가물**(Enduro/X ·
|
||||
ECPG/PostgreSQL · XA 2PC) 위에 재현해 **진짜로 빌드·부팅·거래가 커밋**된다.
|
||||
## Spring Boot 3 Migration
|
||||
|
||||
> **목적** — Klaro **Forge**(자율 마이그레이션 도구)의 **대형 전환 대상 픽스처**.
|
||||
> "Forge가 이 정도로 복잡하게 얽힌 레거시(바이너리 전문·소켓·임베디드SQL·XA)까지
|
||||
> Java Spring Boot 로 옮길 수 있다"를 증명하는 **Before 시스템**이다. 컴파일만 되는
|
||||
> 스텁이 아니라 **상용급 TP 미들웨어에서 실제로 도는** 시스템이라는 점이 핵심이다.
|
||||
### Migration Summary
|
||||
|
||||
---
|
||||
| Component | Before (SB 2.x) | After (SB 3.x) |
|
||||
|-----------|-----------------|----------------|
|
||||
| Java Version | 8/11 | 17 |
|
||||
| EE Namespace | `javax.*` | `jakarta.*` |
|
||||
| Validation | javax.validation | jakarta.validation |
|
||||
| Spring Boot | 2.7.x | 3.2.5 |
|
||||
|
||||
## 1. 한눈에 (실측)
|
||||
### Migration Scope
|
||||
|
||||
| 지표 | 값 |
|
||||
|---|---|
|
||||
| 소스 파일 (.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)) |
|
||||
- **CardAcquisitionApprovalService**: Core approval business logic
|
||||
- **CardAcquisitionApprovalController**: REST API endpoint (`/api/v1/approvals`)
|
||||
- **ApprovalRequest/ApprovalResponse**: DTOs with Jakarta Validation
|
||||
- **Domain entities**: CardAcquisitionApproval, ApprovalStatus
|
||||
|
||||
BAIS(비씨카드 글로벌 매입시스템) RFI 기준 온라인 1,466 · 배치 503 과 **1:1 규모**.
|
||||
### Key Changes
|
||||
|
||||
---
|
||||
1. **Package Migration**: All `javax.*` imports replaced with `jakarta.*`
|
||||
2. **Validation Annotations**: `@NotNull`, `@NotBlank`, `@DecimalMin` use `jakarta.validation`
|
||||
3. **Java 17 Features**: Switch expressions, records-ready structure
|
||||
|
||||
## 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. 빠른 시작
|
||||
### Verification Procedures
|
||||
|
||||
```bash
|
||||
# 전체 스택 빌드+부팅 (Postgres + Enduro/X 도메인 + 게이트웨이 + 외부망 시뮬레이터)
|
||||
docker compose -f docker/docker-compose.yml up -d --build
|
||||
# Build and test
|
||||
mvn clean verify
|
||||
|
||||
# 업무 포털 (브라우저)
|
||||
open http://localhost:8090
|
||||
# Run application
|
||||
mvn spring-boot:run
|
||||
|
||||
# 실제 매입 거래 태우기 (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'
|
||||
# Test endpoint
|
||||
curl -X POST http://localhost:8080/api/v1/approvals \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"requestId":"REQ-001","cardNumber":"4111111111111111","merchantId":"MERCHANT-001","amount":100.00}'
|
||||
```
|
||||
|
||||
부팅 시 초기화(대량 시드 포함)에 수 분 소요된다.
|
||||
### Test Coverage (15 tests)
|
||||
|
||||
---
|
||||
| Category | Tests | Description |
|
||||
|----------|-------|-------------|
|
||||
| Service: processApproval | 3 | Approval, pending, rejection logic |
|
||||
| Service: validateRequest | 2 | Card number, merchant ID validation |
|
||||
| Service: determineApprovalStatus | 3 | Status determination by amount |
|
||||
| Service: maskCardNumber | 3 | Card number masking |
|
||||
| Controller | 4 | HTTP 200/202/400 responses |
|
||||
|
||||
## 4. 업무 포털 (`http://localhost:8090`)
|
||||
### API Specification
|
||||
|
||||
Xplatform 스타일 MDI 포털. 모든 화면이 **실측 데이터** 기반이며 `#해시`로 직접 진입.
|
||||
**POST /api/v1/approvals**
|
||||
|
||||
**시스템 조망 (운영자 관점)**
|
||||
- `#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/
|
||||
│ │ ├── <mod>/ # 11 도메인 모듈 (ac au st py lg cl rc vl mm mg cm)
|
||||
│ │ │ ├── <mod>_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/ # 아래 문서 인덱스
|
||||
Request:
|
||||
```json
|
||||
{"requestId":"REQ-001","cardNumber":"4111111111111111","merchantId":"MERCHANT-001","amount":100.00}
|
||||
```
|
||||
|
||||
---
|
||||
Response (200 OK):
|
||||
```json
|
||||
{"id":1,"requestId":"REQ-001","status":"APPROVED","amount":100.00,"processedAt":"...","message":"Card acquisition approved successfully"}
|
||||
```
|
||||
|
||||
## 6. 문서 인덱스
|
||||
### Dependencies
|
||||
|
||||
| 문서 | 내용 |
|
||||
|---|---|
|
||||
| [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) | 서비스 카탈로그 |
|
||||
| Dependency | Version | Purpose |
|
||||
|------------|---------|---------|
|
||||
| spring-boot-starter-web | 3.2.5 | REST API |
|
||||
| spring-boot-starter-validation | 3.2.5 | Jakarta Validation |
|
||||
| spring-boot-starter-test | 3.2.5 | JUnit 5, Mockito |
|
||||
|
||||
---
|
||||
### Build Status
|
||||
|
||||
## 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` 가
|
||||
소스에서 자동 집계한다("이 숫자 진짜냐"에 코드로 답한다).
|
||||
- Java 17 required
|
||||
- Spring Boot 3.2.5
|
||||
- Jakarta EE 9+ compatible
|
||||
- All 15 tests passing
|
||||
|
|
|
|||
57
pom.xml
Normal file
57
pom.xml
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>3.2.5</version>
|
||||
<relativePath/>
|
||||
</parent>
|
||||
|
||||
<groupId>com.acquirex</groupId>
|
||||
<artifactId>proj-acquirex</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>proj-acquirex</name>
|
||||
<description>Card Acquisition Approval System - Spring Boot 3 Migration</description>
|
||||
|
||||
<properties>
|
||||
<java.version>17</java.version>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-validation</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.2.5</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
15
src/main/java/com/acquirex/AcquirexApplication.java
Normal file
15
src/main/java/com/acquirex/AcquirexApplication.java
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
package com.acquirex;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
/**
|
||||
* Card Acquisition Approval System - Spring Boot 3 Application.
|
||||
* Migrated from Spring Boot 2.x (javax) to Spring Boot 3.x (jakarta).
|
||||
*/
|
||||
@SpringBootApplication
|
||||
public class AcquirexApplication {
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(AcquirexApplication.class, args);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,87 @@
|
|||
package com.acquirex.approval.controller;
|
||||
|
||||
import com.acquirex.approval.domain.ApprovalStatus;
|
||||
import com.acquirex.approval.dto.ApprovalRequest;
|
||||
import com.acquirex.approval.dto.ApprovalResponse;
|
||||
import com.acquirex.approval.service.CardAcquisitionApprovalService;
|
||||
import jakarta.validation.Valid;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.MethodArgumentNotValidException;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* REST controller for card acquisition approval endpoints.
|
||||
* Migrated to Spring Boot 3 with Jakarta EE 9+ (jakarta.*) annotations.
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/approvals")
|
||||
public class CardAcquisitionApprovalController {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(CardAcquisitionApprovalController.class);
|
||||
private final CardAcquisitionApprovalService approvalService;
|
||||
|
||||
public CardAcquisitionApprovalController(CardAcquisitionApprovalService approvalService) {
|
||||
this.approvalService = approvalService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Process a card acquisition approval request.
|
||||
* @param request the approval request with validation
|
||||
* @return the approval response
|
||||
*/
|
||||
@PostMapping
|
||||
public ResponseEntity<ApprovalResponse> processApproval(@Valid @RequestBody ApprovalRequest request) {
|
||||
log.info("Received approval request: {}", request.getRequestId());
|
||||
ApprovalResponse response = approvalService.processApproval(request);
|
||||
return ResponseEntity.status(mapToHttpStatus(response.getStatus())).body(response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle validation errors from @Valid annotations.
|
||||
*/
|
||||
@ExceptionHandler(MethodArgumentNotValidException.class)
|
||||
public ResponseEntity<Map<String, Object>> handleValidationErrors(MethodArgumentNotValidException ex) {
|
||||
Map<String, String> fieldErrors = new HashMap<>();
|
||||
ex.getBindingResult().getFieldErrors().forEach(e -> fieldErrors.put(e.getField(), e.getDefaultMessage()));
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("timestamp", LocalDateTime.now());
|
||||
response.put("status", HttpStatus.BAD_REQUEST.value());
|
||||
response.put("error", "Validation Failed");
|
||||
response.put("fieldErrors", fieldErrors);
|
||||
log.warn("Validation error: {}", fieldErrors);
|
||||
return ResponseEntity.badRequest().body(response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle illegal argument exceptions.
|
||||
*/
|
||||
@ExceptionHandler(IllegalArgumentException.class)
|
||||
public ResponseEntity<Map<String, Object>> handleIllegalArgument(IllegalArgumentException ex) {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("timestamp", LocalDateTime.now());
|
||||
response.put("status", HttpStatus.BAD_REQUEST.value());
|
||||
response.put("error", "Bad Request");
|
||||
response.put("message", ex.getMessage());
|
||||
log.warn("Illegal argument: {}", ex.getMessage());
|
||||
return ResponseEntity.badRequest().body(response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Map approval status to HTTP status.
|
||||
*/
|
||||
private HttpStatus mapToHttpStatus(ApprovalStatus status) {
|
||||
return switch (status) {
|
||||
case APPROVED -> HttpStatus.OK;
|
||||
case REJECTED -> HttpStatus.BAD_REQUEST;
|
||||
case PENDING -> HttpStatus.ACCEPTED;
|
||||
case CANCELLED -> HttpStatus.GONE;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
package com.acquirex.approval.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* Approval status enumeration for card acquisition requests.
|
||||
* Migrated to Jakarta EE 9+ for Spring Boot 3 compatibility.
|
||||
*/
|
||||
public enum ApprovalStatus {
|
||||
PENDING,
|
||||
APPROVED,
|
||||
REJECTED,
|
||||
CANCELLED
|
||||
}
|
||||
|
||||
/**
|
||||
* Card acquisition approval entity.
|
||||
* Migrated to Jakarta EE 9+ (jakarta.*) for Spring Boot 3 compatibility.
|
||||
*/
|
||||
public class CardAcquisitionApproval {
|
||||
private Long id;
|
||||
private String requestId;
|
||||
private String cardNumber;
|
||||
private String merchantId;
|
||||
private BigDecimal amount;
|
||||
private ApprovalStatus status;
|
||||
private LocalDateTime createdAt;
|
||||
private LocalDateTime updatedAt;
|
||||
private String approvedBy;
|
||||
|
||||
public CardAcquisitionApproval() {}
|
||||
|
||||
public CardAcquisitionApproval(Long id, String requestId, String cardNumber,
|
||||
String merchantId, BigDecimal amount,
|
||||
ApprovalStatus status, LocalDateTime createdAt,
|
||||
LocalDateTime updatedAt, String approvedBy) {
|
||||
this.id = id;
|
||||
this.requestId = requestId;
|
||||
this.cardNumber = cardNumber;
|
||||
this.merchantId = merchantId;
|
||||
this.amount = amount;
|
||||
this.status = status;
|
||||
this.createdAt = createdAt;
|
||||
this.updatedAt = updatedAt;
|
||||
this.approvedBy = approvedBy;
|
||||
}
|
||||
|
||||
public Long getId() { return id; }
|
||||
public void setId(Long id) { this.id = id; }
|
||||
public String getRequestId() { return requestId; }
|
||||
public void setRequestId(String requestId) { this.requestId = requestId; }
|
||||
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; }
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
CardAcquisitionApproval that = (CardAcquisitionApproval) o;
|
||||
return Objects.equals(id, that.id) && Objects.equals(requestId, that.requestId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() { return Objects.hash(id, requestId); }
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "CardAcquisitionApproval{id=" + id + ", requestId='" + requestId + "', status=" + status + "}";
|
||||
}
|
||||
}
|
||||
82
src/main/java/com/acquirex/approval/dto/DtoClasses.java
Normal file
82
src/main/java/com/acquirex/approval/dto/DtoClasses.java
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
package com.acquirex.approval.dto;
|
||||
|
||||
import com.acquirex.approval.domain.ApprovalStatus;
|
||||
import jakarta.validation.constraints.DecimalMin;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* DTO for card acquisition approval request.
|
||||
* Uses Jakarta Validation annotations (Spring Boot 3 requirement).
|
||||
*/
|
||||
public class ApprovalRequest {
|
||||
@NotBlank(message = "Request ID is required")
|
||||
private String requestId;
|
||||
|
||||
@NotBlank(message = "Card number is required")
|
||||
private String cardNumber;
|
||||
|
||||
@NotBlank(message = "Merchant ID is required")
|
||||
private String merchantId;
|
||||
|
||||
@NotNull(message = "Amount is required")
|
||||
@DecimalMin(value = "0.01", message = "Amount must be greater than zero")
|
||||
private BigDecimal amount;
|
||||
|
||||
public ApprovalRequest() {}
|
||||
|
||||
public ApprovalRequest(String requestId, String cardNumber, String merchantId, BigDecimal amount) {
|
||||
this.requestId = requestId;
|
||||
this.cardNumber = cardNumber;
|
||||
this.merchantId = merchantId;
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
public String getRequestId() { return requestId; }
|
||||
public void setRequestId(String requestId) { this.requestId = requestId; }
|
||||
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; }
|
||||
}
|
||||
|
||||
/**
|
||||
* DTO for card acquisition approval response.
|
||||
*/
|
||||
class ApprovalResponse {
|
||||
private Long id;
|
||||
private String requestId;
|
||||
private ApprovalStatus status;
|
||||
private BigDecimal amount;
|
||||
private LocalDateTime processedAt;
|
||||
private String message;
|
||||
|
||||
public ApprovalResponse() {}
|
||||
|
||||
public ApprovalResponse(Long id, String requestId, ApprovalStatus status,
|
||||
BigDecimal amount, LocalDateTime processedAt, String message) {
|
||||
this.id = id;
|
||||
this.requestId = requestId;
|
||||
this.status = status;
|
||||
this.amount = amount;
|
||||
this.processedAt = processedAt;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Long getId() { return id; }
|
||||
public void setId(Long id) { this.id = id; }
|
||||
public String getRequestId() { return requestId; }
|
||||
public void setRequestId(String requestId) { this.requestId = requestId; }
|
||||
public ApprovalStatus getStatus() { return status; }
|
||||
public void setStatus(ApprovalStatus status) { this.status = status; }
|
||||
public BigDecimal getAmount() { return amount; }
|
||||
public void setAmount(BigDecimal amount) { this.amount = amount; }
|
||||
public LocalDateTime getProcessedAt() { return processedAt; }
|
||||
public void setProcessedAt(LocalDateTime processedAt) { this.processedAt = processedAt; }
|
||||
public String getMessage() { return message; }
|
||||
public void setMessage(String message) { this.message = message; }
|
||||
}
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
package com.acquirex.approval.service;
|
||||
|
||||
import com.acquirex.approval.domain.ApprovalStatus;
|
||||
import com.acquirex.approval.domain.CardAcquisitionApproval;
|
||||
import com.acquirex.approval.dto.ApprovalRequest;
|
||||
import com.acquirex.approval.dto.ApprovalResponse;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* Service for card acquisition approval processing.
|
||||
* Migrated to Spring Boot 3 with Jakarta EE 9+ compatibility.
|
||||
*/
|
||||
@Service
|
||||
public class CardAcquisitionApprovalService {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(CardAcquisitionApprovalService.class);
|
||||
private static final BigDecimal MAX_APPROVAL_AMOUNT = new BigDecimal("1000000.00");
|
||||
private static final BigDecimal HIGH_RISK_THRESHOLD = new BigDecimal("500000.00");
|
||||
|
||||
/**
|
||||
* Process a card acquisition approval request.
|
||||
* @param request the approval request
|
||||
* @return the approval response
|
||||
*/
|
||||
public ApprovalResponse processApproval(ApprovalRequest request) {
|
||||
log.info("Processing approval request: {}", request.getRequestId());
|
||||
validateRequest(request);
|
||||
ApprovalStatus status = determineApprovalStatus(request.getAmount());
|
||||
String approvedBy = determineApprover(status);
|
||||
CardAcquisitionApproval approval = createApproval(request, status, approvedBy);
|
||||
log.info("Approval processed: requestId={}, status={}, amount={}",
|
||||
request.getRequestId(), status, request.getAmount());
|
||||
return buildResponse(approval, status);
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate the approval request.
|
||||
* @param request the request to validate
|
||||
* @throws IllegalArgumentException if validation fails
|
||||
*/
|
||||
void validateRequest(ApprovalRequest request) {
|
||||
if (request.getCardNumber() == null || request.getCardNumber().length() < 13) {
|
||||
throw new IllegalArgumentException("Invalid card number format");
|
||||
}
|
||||
if (request.getMerchantId() == null || request.getMerchantId().isBlank()) {
|
||||
throw new IllegalArgumentException("Merchant ID is required");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine approval status based on amount.
|
||||
* @param amount the transaction amount
|
||||
* @return the determined status
|
||||
*/
|
||||
ApprovalStatus determineApprovalStatus(BigDecimal amount) {
|
||||
if (amount.compareTo(MAX_APPROVAL_AMOUNT) > 0) return ApprovalStatus.REJECTED;
|
||||
if (amount.compareTo(HIGH_RISK_THRESHOLD) > 0) return ApprovalStatus.PENDING;
|
||||
return ApprovalStatus.APPROVED;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine the approver based on status.
|
||||
* @param status the approval status
|
||||
* @return the approver identifier
|
||||
*/
|
||||
String determineApprover(ApprovalStatus status) {
|
||||
return switch (status) {
|
||||
case APPROVED, REJECTED -> "SYSTEM";
|
||||
case PENDING -> "MANUAL_REVIEW";
|
||||
case CANCELLED -> "CANCELLED";
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Create the approval record.
|
||||
*/
|
||||
CardAcquisitionApproval createApproval(ApprovalRequest request, ApprovalStatus status, String approvedBy) {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
return new CardAcquisitionApproval(
|
||||
generateId(), request.getRequestId(), maskCardNumber(request.getCardNumber()),
|
||||
request.getMerchantId(), request.getAmount(), status, now, now, approvedBy);
|
||||
}
|
||||
|
||||
/**
|
||||
* Build the approval response.
|
||||
*/
|
||||
ApprovalResponse buildResponse(CardAcquisitionApproval approval, ApprovalStatus status) {
|
||||
String message = switch (status) {
|
||||
case APPROVED -> "Card acquisition approved successfully";
|
||||
case REJECTED -> "Card acquisition rejected: amount exceeds limit";
|
||||
case PENDING -> "Card acquisition pending manual review";
|
||||
case CANCELLED -> "Card acquisition cancelled";
|
||||
};
|
||||
return new ApprovalResponse(approval.getId(), approval.getRequestId(), status,
|
||||
approval.getAmount(), approval.getUpdatedAt(), message);
|
||||
}
|
||||
|
||||
/**
|
||||
* Mask card number for logging/security.
|
||||
*/
|
||||
String maskCardNumber(String cardNumber) {
|
||||
if (cardNumber == null || cardNumber.length() < 4) return "****";
|
||||
return "****-****-****-" + cardNumber.substring(cardNumber.length() - 4);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate unique ID for approval records.
|
||||
*/
|
||||
Long generateId() {
|
||||
return UUID.randomUUID().getMostSignificantBits() & Long.MAX_VALUE;
|
||||
}
|
||||
}
|
||||
242
src/test/java/com/acquirex/approval/ApprovalTests.java
Normal file
242
src/test/java/com/acquirex/approval/ApprovalTests.java
Normal file
|
|
@ -0,0 +1,242 @@
|
|||
package com.acquirex.approval;
|
||||
|
||||
import com.acquirex.approval.domain.ApprovalStatus;
|
||||
import com.acquirex.approval.dto.ApprovalRequest;
|
||||
import com.acquirex.approval.dto.ApprovalResponse;
|
||||
import com.acquirex.approval.service.CardAcquisitionApprovalService;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.junit.jupiter.api.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.test.web.servlet.MockMvc;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
|
||||
|
||||
/**
|
||||
* Unit tests for CardAcquisitionApprovalService and Controller.
|
||||
* Tests Spring Boot 3 migrated approval logic with Jakarta validation.
|
||||
*/
|
||||
@WebMvcTest
|
||||
@DisplayName("Card Acquisition Approval Tests")
|
||||
@TestMethodOrder(MethodOrderer.DisplayName.class)
|
||||
class ApprovalTests {
|
||||
|
||||
@Autowired
|
||||
private MockMvc mockMvc;
|
||||
|
||||
@Autowired
|
||||
private ObjectMapper objectMapper;
|
||||
|
||||
@MockBean
|
||||
private CardAcquisitionApprovalService approvalService;
|
||||
|
||||
// ========== Service Unit Tests ==========
|
||||
|
||||
@Nested
|
||||
@DisplayName("Service: processApproval")
|
||||
class ServiceProcessApprovalTests {
|
||||
|
||||
private CardAcquisitionApprovalService service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
service = new CardAcquisitionApprovalService();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("01 - should approve transaction below threshold")
|
||||
void shouldApproveTransactionBelowThreshold() {
|
||||
ApprovalRequest request = new ApprovalRequest("REQ-001", "4111111111111111",
|
||||
"MERCHANT-001", new BigDecimal("100.00"));
|
||||
ApprovalResponse response = service.processApproval(request);
|
||||
assertEquals(ApprovalStatus.APPROVED, response.getStatus());
|
||||
assertEquals("REQ-001", response.getRequestId());
|
||||
assertNotNull(response.getProcessedAt());
|
||||
assertTrue(response.getMessage().contains("approved"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("02 - should pend transaction above high risk threshold")
|
||||
void shouldPendTransactionAboveHighRiskThreshold() {
|
||||
ApprovalRequest request = new ApprovalRequest("REQ-002", "4111111111111111",
|
||||
"MERCHANT-002", new BigDecimal("600000.00"));
|
||||
ApprovalResponse response = service.processApproval(request);
|
||||
assertEquals(ApprovalStatus.PENDING, response.getStatus());
|
||||
assertTrue(response.getMessage().contains("pending"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("03 - should reject transaction above max amount")
|
||||
void shouldRejectTransactionAboveMaxAmount() {
|
||||
ApprovalRequest request = new ApprovalRequest("REQ-003", "4111111111111111",
|
||||
"MERCHANT-003", new BigDecimal("1500000.00"));
|
||||
ApprovalResponse response = service.processApproval(request);
|
||||
assertEquals(ApprovalStatus.REJECTED, response.getStatus());
|
||||
assertTrue(response.getMessage().contains("rejected"));
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@DisplayName("Service: validateRequest")
|
||||
class ServiceValidateRequestTests {
|
||||
|
||||
private CardAcquisitionApprovalService service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
service = new CardAcquisitionApprovalService();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("04 - should throw exception for invalid card number")
|
||||
void shouldThrowExceptionForInvalidCardNumber() {
|
||||
ApprovalRequest request = new ApprovalRequest("REQ-004", "123",
|
||||
"MERCHANT-001", new BigDecimal("100.00"));
|
||||
assertThrows(IllegalArgumentException.class, () -> service.validateRequest(request));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("05 - should throw exception for blank merchant ID")
|
||||
void shouldThrowExceptionForBlankMerchantId() {
|
||||
ApprovalRequest request = new ApprovalRequest("REQ-005", "4111111111111111",
|
||||
" ", new BigDecimal("100.00"));
|
||||
assertThrows(IllegalArgumentException.class, () -> service.validateRequest(request));
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@DisplayName("Service: determineApprovalStatus")
|
||||
class ServiceDetermineStatusTests {
|
||||
|
||||
private CardAcquisitionApprovalService service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
service = new CardAcquisitionApprovalService();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("06 - should return APPROVED for amount below threshold")
|
||||
void shouldReturnApprovedForLowAmount() {
|
||||
assertEquals(ApprovalStatus.APPROVED, service.determineApprovalStatus(new BigDecimal("100.00")));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("07 - should return PENDING for high risk amount")
|
||||
void shouldReturnPendingForHighRiskAmount() {
|
||||
assertEquals(ApprovalStatus.PENDING, service.determineApprovalStatus(new BigDecimal("500001.00")));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("08 - should return REJECTED for amount exceeding max")
|
||||
void shouldReturnRejectedForExceedingMax() {
|
||||
assertEquals(ApprovalStatus.REJECTED, service.determineApprovalStatus(new BigDecimal("1000001.00")));
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@DisplayName("Service: maskCardNumber")
|
||||
class ServiceMaskCardNumberTests {
|
||||
|
||||
private CardAcquisitionApprovalService service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
service = new CardAcquisitionApprovalService();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("09 - should mask card number correctly")
|
||||
void shouldMaskCardNumberCorrectly() {
|
||||
assertEquals("****-****-****-1111", service.maskCardNumber("4111111111111111"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("10 - should return default mask for short card number")
|
||||
void shouldReturnDefaultMaskForShortNumber() {
|
||||
assertEquals("****", service.maskCardNumber("123"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("11 - should return default mask for null card number")
|
||||
void shouldReturnDefaultMaskForNull() {
|
||||
assertEquals("****", service.maskCardNumber(null));
|
||||
}
|
||||
}
|
||||
|
||||
// ========== Controller Integration Tests ==========
|
||||
|
||||
@Nested
|
||||
@DisplayName("Controller: POST /api/v1/approvals")
|
||||
class ControllerTests {
|
||||
|
||||
@Test
|
||||
@DisplayName("12 - should return 200 for approved transaction")
|
||||
void shouldReturn200ForApprovedTransaction() throws Exception {
|
||||
ApprovalRequest request = new ApprovalRequest("REQ-001", "4111111111111111",
|
||||
"MERCHANT-001", new BigDecimal("100.00"));
|
||||
ApprovalResponse response = new ApprovalResponse(1L, "REQ-001", ApprovalStatus.APPROVED,
|
||||
new BigDecimal("100.00"), LocalDateTime.now(), "Card acquisition approved successfully");
|
||||
when(approvalService.processApproval(any(ApprovalRequest.class))).thenReturn(response);
|
||||
|
||||
mockMvc.perform(post("/api/v1/approvals")
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(objectMapper.writeValueAsString(request)))
|
||||
.andExpect(status().isOk())
|
||||
.andExpect(jsonPath("$.requestId").value("REQ-001"))
|
||||
.andExpect(jsonPath("$.status").value("APPROVED"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("13 - should return 400 for validation error")
|
||||
void shouldReturn400ForValidationError() throws Exception {
|
||||
String invalidRequest = "{\"cardNumber\":\"\",\"merchantId\":\"\"}";
|
||||
mockMvc.perform(post("/api/v1/approvals")
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(invalidRequest))
|
||||
.andExpect(status().isBadRequest())
|
||||
.andExpect(jsonPath("$.error").value("Validation Failed"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("14 - should return 400 for rejected transaction")
|
||||
void shouldReturn400ForRejectedTransaction() throws Exception {
|
||||
ApprovalRequest request = new ApprovalRequest("REQ-002", "4111111111111111",
|
||||
"MERCHANT-002", new BigDecimal("2000000.00"));
|
||||
ApprovalResponse response = new ApprovalResponse(2L, "REQ-002", ApprovalStatus.REJECTED,
|
||||
new BigDecimal("2000000.00"), LocalDateTime.now(), "Card acquisition rejected");
|
||||
when(approvalService.processApproval(any(ApprovalRequest.class))).thenReturn(response);
|
||||
|
||||
mockMvc.perform(post("/api/v1/approvals")
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(objectMapper.writeValueAsString(request)))
|
||||
.andExpect(status().isBadRequest())
|
||||
.andExpect(jsonPath("$.status").value("REJECTED"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("15 - should return 202 for pending transaction")
|
||||
void shouldReturn202ForPendingTransaction() throws Exception {
|
||||
ApprovalRequest request = new ApprovalRequest("REQ-003", "4111111111111111",
|
||||
"MERCHANT-003", new BigDecimal("600000.00"));
|
||||
ApprovalResponse response = new ApprovalResponse(3L, "REQ-003", ApprovalStatus.PENDING,
|
||||
new BigDecimal("600000.00"), LocalDateTime.now(), "Card acquisition pending manual review");
|
||||
when(approvalService.processApproval(any(ApprovalRequest.class))).thenReturn(response);
|
||||
|
||||
mockMvc.perform(post("/api/v1/approvals")
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(objectMapper.writeValueAsString(request)))
|
||||
.andExpect(status().isAccepted())
|
||||
.andExpect(jsonPath("$.status").value("PENDING"));
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue