Feat: 포인트 결제 관련 core payment 로직 추가

.github/workflows/deploy-aws-channel.yml

@@ -18,51 +18,59 @@ jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
-    - name: Setup JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: "17"
-        distribution: "temurin"
-        cache: gradle
+      - name: Setup JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: "17"
+          distribution: "temurin"
+          cache: gradle
 
-    - name: Grant execute permission for gradlew
-      working-directory: cloud-services/msa-channel-user-service
-      run: chmod +x ./gradlew
+      - name: Grant execute permission for gradlew
+        working-directory: cloud-services/msa-channel-user-service
+        run: chmod +x ./gradlew
 
-    - name: Build Channel User Service
-      working-directory: cloud-services/msa-channel-user-service
-      run: ./gradlew clean build -x test
+      - name: Build Channel User Service
+        working-directory: cloud-services/msa-channel-user-service
+        run: ./gradlew clean build -x test
 
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Build and push Docker image
-      run: |
-        docker build -t ${{ env.DOCKER_IMAGE }}:${{ env.VERSION }} ./cloud-services/msa-coupon-service
+      - name: Build and push Docker image
+        run: |
+          docker build -t ${{ env.DOCKER_IMAGE }}:${{ env.VERSION }} ./cloud-services/msa-channel-user-service
           docker push ${{ env.DOCKER_IMAGE }}:${{ env.VERSION }}
 
-    # -----------------------------
-    # Kubernetes rolling update
-    # -----------------------------
-    - name: Deploy to Kubernetes
-      uses: appleboy/ssh-action@v1.0.3
-      with:
-        host: ${{ secrets.K8S_MASTER_IP }}
-        username: ubuntu
-        key: ${{ secrets.K8S_MASTER_KEY }}
-        timeout: 60s
-        command_timeout: 30m
-        script: |
-          set -e
+      # -----------------------------
+      # Kubernetes rolling update
+      # -----------------------------
+      - name: Deploy to Kubernetes
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.K8S_MASTER_IP }}
+          username: ubuntu
+          key: ${{ secrets.K8S_MASTER_KEY }}
+          timeout: 60s
+          command_timeout: 30m
+          script: |
+            set -e
 
-          kubectl set image deployment/$DEPLOYMENT_NAME \
-            $CONTAINER_NAME=$DOCKER_IMAGE:$VERSION \
-            -n $NAMESPACE
+            DOCKER_IMAGE="${{ env.DOCKER_IMAGE }}"
+            VERSION="${{ env.VERSION }}"
+            NAMESPACE="${{ env.NAMESPACE }}"
+            DEPLOYMENT_NAME="${{ env.DEPLOYMENT_NAME }}"
+            CONTAINER_NAME="${{ env.CONTAINER_NAME }}"
+
+            echo "NS=$NAMESPACE DEPLOY=$DEPLOYMENT_NAME CONTAINER=$CONTAINER_NAME IMAGE=$DOCKER_IMAGE:$VERSION"
+
+            kubectl -n "$NAMESPACE" set image "deployment/$DEPLOYMENT_NAME" \
+              "$CONTAINER_NAME=$DOCKER_IMAGE:$VERSION"
+
+            kubectl -n "$NAMESPACE" rollout status "deployment/$DEPLOYMENT_NAME"
 
-          kubectl rollout status deployment/$DEPLOYMENT_NAME -n $NAMESPACE

cloud-services/msa-channel-user-service/Dockerfile

@@ -0,0 +1,44 @@
+# Multi-stage build for optimal image size
+FROM gradle:8.14.3-jdk17 AS builder
+
+WORKDIR /app
+
+# Copy gradle files first (for caching)
+COPY build.gradle settings.gradle ./
+COPY gradle ./gradle
+
+# Copy source code
+COPY src ./src
+
+# Build the application (skip tests for faster build)
+RUN gradle clean build -x test --no-daemon
+
+# Runtime stage
+FROM eclipse-temurin:17-jre-alpine
+
+WORKDIR /app
+
+# Install curl for health checks
+RUN apk add --no-cache curl
+
+# Copy the built JAR from builder stage
+COPY --from=builder /app/build/libs/*.jar app.jar
+
+# Create non-root user for security (Alpine syntax)
+RUN addgroup -S spring && adduser -S spring -G spring
+USER spring:spring
+
+# Expose port (channel-user-service = 8081)
+EXPOSE 8081
+
+# Health check (actuator가 켜져있을 때만 유효)
+HEALTHCHECK --interval=30s --timeout=3s --start-period=40s --retries=3 \
+  CMD curl -f http://localhost:8081/actuator/health || exit 1
+
+# Run the application
+ENTRYPOINT ["java", \
+    "-XX:+UseContainerSupport", \
+    "-XX:MaxRAMPercentage=75.0", \
+    "-Djava.security.egd=file:/dev/./urandom", \
+    "-jar", \
+    "app.jar"]

cloud-services/msa-channel-user-service/build.gradle

@@ -42,11 +42,12 @@ dependencies {
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     implementation "io.netty:netty-resolver-dns-native-macos:4.2.9.Final:osx-aarch_64"
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     // jwt
-    implementation 'io.jsonwebtoken:jjwt-api:0.13.0'
-    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.13.0'
-    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.13.0'
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 
     // kafka
     implementation 'org.springframework.kafka:spring-kafka'

cloud-services/msa-channel-user-service/src/main/java/com/fisa/channel_service/service/BankingService.java

@@ -20,14 +20,15 @@ public void createAccount(String userUuid, String accountNo) {
     }
 
     // 입금
-    public void deposit(String userUuid, String accountNo, BigDecimal amount) {
+    public BigDecimal deposit(String userUuid, String accountNo, BigDecimal amount) {
         if (amount == null || amount.compareTo(BigDecimal.ZERO) <= 0) {
                        throw new IllegalArgumentException("입금 금액은 0보다 커야 합니다.");
         }
 
         DepositMessage message = new DepositMessage(userUuid, accountNo, amount);
         try {
             kafkaProducerService.sendDepositRequest(message);
+            return amount;
         } catch (Exception e) {
             throw new RuntimeException("입금 요청 전송 실패", e);
         }

cloud-services/msa-channel-user-service/src/main/java/com/fisa/channel_service/util/JwtUtil.java

@@ -1,5 +1,6 @@
 package com.fisa.channel_service.util;
 
+
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;

cloud-services/msa-point-service/build.gradle

@@ -34,7 +34,7 @@ ext {
 }
 
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-webmvc'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
     implementation 'org.springframework.kafka:spring-kafka'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'

cloud-services/msa-point-service/src/main/java/com/techsemina/msa/pointservice/config/AppConfig.java

@@ -0,0 +1,17 @@
+package com.techsemina.msa.pointservice.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AppConfig {
+
+    @Bean
+    public ObjectMapper objectMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.registerModule(new JavaTimeModule()); // 날짜 처리 기능 추가
+        return mapper;
+    }
+}

cloud-services/msa-point-service/src/main/java/com/techsemina/msa/pointservice/config/KafkaProducerConfig.java

@@ -17,14 +17,14 @@
 @Configuration
 public class KafkaProducerConfig {
 
-    @Value("${spring.kafka.bootstrap-servers}") // properties 값 가져오기
+    @Value("${spring.kafka.bootstrap-servers}") // application.properties 값 가져오기
     private String bootstrapServers;
 
     @Bean
     public ProducerFactory<String, Object> producerFactory() {
         Map<String, Object> configProps = new HashMap<>();
 
-        // 카프카 브로커 주소 (application.yml에 있어도 여기서 명시하면 더 확실함)
+        // 카프카 브로커 주소 (application.yml에 있어도 여기서 명시하면 더 확실)
         configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
 
         // Key는 String, Value는 JSON(Object)으로 직렬화하겠다 설정
@@ -34,7 +34,7 @@ public ProducerFactory<String, Object> producerFactory() {
         // 메시지 전송 신뢰성 설정
         configProps.put(ProducerConfig.ACKS_CONFIG, "all"); // 모든 replica 확인
         configProps.put(ProducerConfig.RETRIES_CONFIG, 3);  // 재시도 횟수
-         configProps.put(ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG, true); // 중복 전송 방지
+        configProps.put(ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG, true); // 중복 전송 방지
 
         return new DefaultKafkaProducerFactory<>(configProps);
     }

cloud-services/msa-point-service/src/main/java/com/techsemina/msa/pointservice/controller/PaymentController.java

@@ -1,28 +1,46 @@
 package com.techsemina.msa.pointservice.controller;
 
 import com.techsemina.msa.pointservice.dto.PaymentRequest;
+import com.techsemina.msa.pointservice.dto.PaymentResponse;
 import com.techsemina.msa.pointservice.service.PaymentService;
+import com.techsemina.msa.pointservice.util.OrderIdGenerator;
 import lombok.RequiredArgsConstructor;
-import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/payment")
+@RequestMapping("/api")
 @RequiredArgsConstructor
 public class PaymentController {
 
-    private final KafkaTemplate<String, Object> kafkaTemplate;
-
     // 스프링이 미리 만들어둔 객체를 주입받음 (DI)
     private final PaymentService paymentService;
 
 
     @PostMapping("/payment")
-    public String pay(@RequestBody PaymentRequest dto) {
+    public ResponseEntity<PaymentResponse> pay(@RequestBody PaymentRequest dto) {
+        // 1. 주문 번호 생성 및 주입
+        // 프론트에서 안 보냈으면(null이면) 유틸리티로 생성
+        if (dto.getOrderId() == null) {
+            String newId = OrderIdGenerator.generateOrderId(); // "PAY-2026..." 생성
+            dto.setOrderId(newId); // DTO에 쏙 넣기
+        }
+
+        // 2. ID가 채워진 dto를 서비스로 넘김 (Kafka로 메시지 던지고 바로 리턴)
         paymentService.processCompositePayment(dto);
-        return "결제 요청 처리 완료";
+
+        // 3. 응답 객체 생성
+        PaymentResponse response = PaymentResponse.builder()
+                .message("결제 요청이 정상적으로 접수되었습니다. (결과 알림 예정)")
+                .orderId(dto.getOrderId())
+                .status("PENDING")         // 아직 Kafka 타고 가는 중 - PENDING
+                .build();
+
+        // 4. 202 Accepted 리턴
+        return ResponseEntity.status(HttpStatus.ACCEPTED).body(response);
     }
 }

cloud-services/msa-point-service/src/main/java/com/techsemina/msa/pointservice/controller/TestController.java

@@ -0,0 +1,40 @@
+package com.techsemina.msa.pointservice.controller;
+import org.springframework.context.annotation.Profile;
+
+
+import com.techsemina.msa.pointservice.dto.CashResponseDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/test")
+@RequiredArgsConstructor
+@Profile({"dev", "test"})  // 운영 환경에서는 비활성화
+public class TestController {
+
+    private final KafkaTemplate<String, Object> kafkaTemplate;
+
+    // 🕵️‍♂️ 가짜 현금 서비스: "성공했다"고 뻥치기
+    // 호출 주소: POST /test/fake-success?orderId=PAY-1234
+    @PostMapping("/fake-success")
+    public String fakeSuccess(@RequestParam String orderId) {
+
+        // 현금 서비스가 보내줄 법한 메시지를 우리가 직접 만듭니다.
+        CashResponseDTO fakeResponse = new CashResponseDTO(orderId, "SUCCESS", "정상 처리됨");
+
+        // 'core-withdraw-result' 토픽으로 쏩니다.
+        // 그러면 아까 만든 PaymentConsumer가 이걸 낚아채서 'completePayment'를 실행하겠죠?
+        kafkaTemplate.send("core-withdraw-result", fakeResponse);
+
+        return "가짜 성공 메시지 전송 완료! (OrderID: " + orderId + ")";
+    }
+
+    // 🕵️‍♂️ 가짜 현금 서비스: "실패했다"고 뻥치기 (롤백 테스트)
+    @PostMapping("/fake-fail")
+    public String fakeFail(@RequestParam String orderId) {
+        CashResponseDTO fakeResponse = new CashResponseDTO(orderId, "FAILED", "잔액 부족");
+        kafkaTemplate.send("core-withdraw-result", fakeResponse);
+        return "가짜 실패 메시지 전송 완료 -> 환불될 것임";
+    }
+}

cloud-services/msa-point-service/src/main/java/com/techsemina/msa/pointservice/domain/Payment.java

@@ -0,0 +1,37 @@
+package com.techsemina.msa.pointservice.domain;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@EntityListeners(AuditingEntityListener.class) // 날짜 자동 기록용
+@Table(name = "payment_history") // 테이블 이름
+public class Payment {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    // 생성된 주문번호 (OrderIdGenerator)
+    @Column(unique = true, nullable = false)
+    private String orderId;
+
+    private String userId;      // 누가
+    private Long pointAmount;   // 포인트 얼마
+    private Long cashAmount;    // 현금 얼마
+
+    // 상태 관리 (PENDING -> COMPLETED / FAILED)
+    private String status;
+
+    @CreatedDate
+    private LocalDateTime createdAt;
+}

cloud-services/msa-point-service/src/main/java/com/techsemina/msa/pointservice/domain/PointMaster.java

@@ -36,7 +36,7 @@ public PointMaster(String userUuid, long currentAmt) {
     // [로직 1] 포인트 충전 (합산)
     public void charge(long amount) {
         if (amount <= 0) {
-            throw new IllegalArgumentException("충전 금액은 0보다 커야 합니다.");
+            throw new IllegalArgumentException("충전 금액은 0원보다 커야 합니다.");
         }
         this.currentAmt += amount;
         this.lastUpdatedAt = LocalDateTime.now();
@@ -46,7 +46,7 @@ public void charge(long amount) {
     // [로직 2] 포인트 차감
     public void use(long amount) {
         if (amount <= 0) {
-            throw new IllegalArgumentException("차감 금액은 0보다 커야 합니다.");
+            throw new IllegalArgumentException("차감 금액은 0원보다 커야 합니다.");
         }
         if (this.currentAmt < amount) {
             throw new IllegalStateException("포인트 잔액이 부족합니다.");
@@ -58,7 +58,7 @@ public void use(long amount) {
     // [로직 3] 포인트 롤백(환불)
     public void refund(long amount) {
         if (amount <= 0) {
-            throw new IllegalArgumentException("환불 금액은 0보다 커야 합니다.");
+            throw new IllegalArgumentException("환불 금액은 0원보다 커야 합니다.");
         }
         this.currentAmt += amount;
         this.lastUpdatedAt = LocalDateTime.now();