[REFACTOR] 결제 코드 리팩토링

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,14 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: '[FIX] '
+labels: ''
+assignees: ''
+
+---
+
+# 버그 내용
+
+# 스크린샷
+
+# 참고 사항

.github/ISSUE_TEMPLATE/feat-request.md

@@ -0,0 +1,12 @@
+---
+name: Feat request
+about: Suggest an idea for this project
+title: '[FEAT] '
+labels: ''
+assignees: ''
+
+---
+
+# 투두 리스트
+
+# 참고 사항

.github/ISSUE_TEMPLATE/refactor-report.md

@@ -0,0 +1,12 @@
+---
+name: Refactor request
+about: Suggest an idea for this project
+title: '[REFACTOR] '
+labels: ''
+assignees: ''
+
+---
+
+# 투두 리스트
+
+# 참고 사항

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+closed #
+
+# 작업 내용
+
+# 참고 사항

.github/workflows/cd-api-dev.yml

@@ -5,22 +5,7 @@ on:
     branches: [ develop ]
 
 jobs:
-  detect-changes:
-    runs-on: ubuntu-latest
-    outputs:
-      api_changed: ${{ steps.filter.outputs.api }}
-    steps:
-      - uses: actions/checkout@v4
-      - id: filter
-        uses: dorny/paths-filter@v3
-        with:
-          base: develop
-          filters: |
-            api:
-              - 'api/**'
-
   build-api:
-    needs: detect-changes
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/cd-api-prod.yml

@@ -5,22 +5,7 @@ on:
     branches: [ main ]
 
 jobs:
-  detect-changes:
-    runs-on: ubuntu-latest
-    outputs:
-      api_changed: ${{ steps.filter.outputs.api }}
-    steps:
-      - uses: actions/checkout@v4
-      - id: filter
-        uses: dorny/paths-filter@v3
-        with:
-          base: main
-          filters: |
-            api:
-              - 'api/**'
-
   build-api:
-    needs: detect-changes
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/cd-internal-dev.yml

@@ -5,22 +5,7 @@ on:
     branches: [ develop ]
 
 jobs:
-  detect-changes:
-    runs-on: ubuntu-latest
-    outputs:
-      internal_changed: ${{ steps.filter.outputs.internal }}
-    steps:
-      - uses: actions/checkout@v4
-      - id: filter
-        uses: dorny/paths-filter@v3
-        with:
-          base: develop
-          filters: |
-            internal:
-              - 'internal/**'
-
   build-internal:
-    needs: detect-changes
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/cd-internal-prod.yml

@@ -5,22 +5,7 @@ on:
     branches: [ main ]
 
 jobs:
-  detect-changes:
-    runs-on: ubuntu-latest
-    outputs:
-      internal_changed: ${{ steps.filter.outputs.internal }}
-    steps:
-      - uses: actions/checkout@v4
-      - id: filter
-        uses: dorny/paths-filter@v3
-        with:
-          base: main
-          filters: |
-            internal:
-              - 'internal/**'
-
   build-internal:
-    needs: detect-changes
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -101,6 +86,7 @@ jobs:
           SPRING_DATASOURCE_USERNAME_PROD: ${{ secrets.SPRING_DATASOURCE_USERNAME_PROD }}
           SPRING_DATASOURCE_PASSWORD_PROD: ${{ secrets.SPRING_DATASOURCE_PASSWORD_PROD }}
           SPRING_DATASOURCE_URL_PROD: ${{ secrets.SPRING_DATASOURCE_URL_PROD }}
+          WIDGET_SECRET_KEY_PROD: ${{ secrets.WIDGET_SECRET_KEY_PROD }}
         run: |
           export HOSTNAME=$(hostname)
           cd kokomen-payment/docker/prod

.github/workflows/ci-api-test.yml

@@ -5,21 +5,7 @@ on:
     branches: [ main, develop ]
 
 jobs:
-  detect-changes:
-    runs-on: ubuntu-latest
-    outputs:
-      api_changed: ${{ steps.filter.outputs.api }}
-    steps:
-      - uses: actions/checkout@v4
-      - id: filter
-        uses: dorny/paths-filter@v3
-        with:
-          filters: |
-            api:
-              - 'api/**'
-
   build:
-    needs: detect-changes
     runs-on: ubuntu-latest
     permissions:
       checks: write

.github/workflows/ci-internal-test.yml

@@ -5,21 +5,7 @@ on:
     branches: [ main, develop ]
 
 jobs:
-  detect-changes:
-    runs-on: ubuntu-latest
-    outputs:
-      internal_changed: ${{ steps.filter.outputs.internal }}
-    steps:
-      - uses: actions/checkout@v4
-      - id: filter
-        uses: dorny/paths-filter@v3
-        with:
-          filters: |
-            internal:
-              - 'internal/**'
-
   build:
-    needs: detect-changes
     runs-on: ubuntu-latest
     permissions:
       checks: write

.gitignore

@@ -35,3 +35,4 @@ out/
 
 ### VS Code ###
 .vscode/
+.claude

api/src/main/java/com/samhap/kokomen/global/exception/ApiErrorMessage.java

@@ -0,0 +1,22 @@
+package com.samhap.kokomen.global.exception;
+
+import lombok.Getter;
+
+@Getter
+public enum ApiErrorMessage {
+
+    AUTHENTICATION_ANNOTATION_REQUIRED("MemberAuth 파라미터는 @Authentication 어노테이션이 있어야 합니다."),
+    LOGIN_REQUIRED("로그인이 필요합니다"),
+    MEMBER_ID_NOT_IN_SESSION("세션에 MEMBER_ID가 없습니다."),
+    INVALID_REQUEST("잘못된 요청입니다."),
+    MISSING_REQUEST_PARAMETER("필수 요청 파라미터가 누락되었습니다."),
+    INVALID_REQUEST_FORMAT("잘못된 요청 형식입니다. JSON 형식을 확인해주세요."),
+    JSON_PARSE_ERROR("JSON 파싱 오류: 유효하지 않은 값이 전달되었습니다."),
+    INTERNAL_SERVER_ERROR("서버에 문제가 발생하였습니다.");
+
+    private final String message;
+
+    ApiErrorMessage(String message) {
+        this.message = message;
+    }
+}

api/src/main/java/com/samhap/kokomen/global/exception/GlobalExceptionHandler.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import com.samhap.kokomen.global.dto.ErrorResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
@@ -11,7 +12,6 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-// TODO: HttpMessageNotReadableException 예외 처리 추가
 @Slf4j
 @RestControllerAdvice
 public class GlobalExceptionHandler {
@@ -25,12 +25,12 @@ public ResponseEntity<ErrorResponse> handleKokomenException(KokomenException e)
 
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public ResponseEntity<ErrorResponse> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
-        String defaultErrorMessageForUser = "잘못된 요청입니다.";
+        String defaultErrorMessageForUser = ApiErrorMessage.INVALID_REQUEST.getMessage();
         String message = e.getBindingResult()
                 .getFieldErrors()
                 .stream()
                 .findFirst()
-                .map(error -> error.getDefaultMessage())
+                .map(DefaultMessageSourceResolvable::getDefaultMessage)
                 .orElse(defaultErrorMessageForUser);
 
         if (message.equals(defaultErrorMessageForUser)) {
@@ -44,35 +44,33 @@ public ResponseEntity<ErrorResponse> handleMethodArgumentNotValidException(Metho
     }
 
     @ExceptionHandler(MissingServletRequestParameterException.class)
-    public ResponseEntity<ErrorResponse> handleMissingServletRequestParameterException(MissingServletRequestParameterException e) {
-        String message = "필수 요청 파라미터 '" + e.getParameterName() + "'가 누락되었습니다.";
-        log.warn("MissingServletRequestParameterException :: message: {}", message);
+    public ResponseEntity<ErrorResponse> handleMissingServletRequestParameterException(
+            MissingServletRequestParameterException e) {
+        log.warn("MissingServletRequestParameterException :: parameterName: {}", e.getParameterName());
         return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                .body(new ErrorResponse(message));
+                .body(new ErrorResponse(ApiErrorMessage.MISSING_REQUEST_PARAMETER.getMessage()));
     }
 
     @ExceptionHandler(HttpMessageNotReadableException.class)
     public ResponseEntity<ErrorResponse> handleHttpMessageNotReadableException(HttpMessageNotReadableException e) {
-        String message = "잘못된 요청 형식입니다. JSON 형식을 확인해주세요.";
         if (e.getCause() instanceof InvalidFormatException invalidFormatException) {
             String fieldName = invalidFormatException.getPath().get(0).getFieldName();
             String invalidValue = String.valueOf(invalidFormatException.getValue());
-            message = String.format(
-                    "JSON 파싱 오류: '%s' 필드에 유효하지 않은 값이 전달되었습니다. (전달된 값: '%s')",
-                    fieldName,
-                    invalidValue
-            );
+            log.warn("HttpMessageNotReadableException :: fieldName: {}, invalidValue: {}", fieldName, invalidValue);
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .body(new ErrorResponse(ApiErrorMessage.JSON_PARSE_ERROR.getMessage()));
         }
 
-        log.warn("HttpMessageNotReadableException :: message: {}", message);
+        log.warn("HttpMessageNotReadableException :: message: {}", e.getMessage());
         return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                .body(new ErrorResponse(message));
+                .body(new ErrorResponse(ApiErrorMessage.INVALID_REQUEST_FORMAT.getMessage()));
     }
 
     @ExceptionHandler(Exception.class)
     public ResponseEntity<ErrorResponse> handleException(Exception e) {
-        log.error("Exception :: status: {}, message: {}, stackTrace: ", HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage(), e);
+        log.error("Exception :: status: {}, message: {}, stackTrace: ", HttpStatus.INTERNAL_SERVER_ERROR,
+                e.getMessage(), e);
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(new ErrorResponse("서버에 문제가 발생하였습니다."));
+                .body(new ErrorResponse(ApiErrorMessage.INTERNAL_SERVER_ERROR.getMessage()));
     }
 }

api/src/main/java/com/samhap/kokomen/global/infrastructure/MemberAuthArgumentResolver.java

@@ -2,6 +2,8 @@
 
 import com.samhap.kokomen.global.annotation.Authentication;
 import com.samhap.kokomen.global.dto.MemberAuth;
+import com.samhap.kokomen.global.exception.ApiErrorMessage;
+import com.samhap.kokomen.global.exception.InternalServerErrorException;
 import com.samhap.kokomen.global.exception.UnauthorizedException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
@@ -29,7 +31,7 @@ public Object resolveArgument(MethodParameter parameter,
                                   WebDataBinderFactory binderFactory) throws Exception {
         Authentication authentication = parameter.getParameterAnnotation(Authentication.class);
         if (authentication == null) {
-            throw new IllegalStateException("MemberAuth 파라미터는 @Authentication 어노테이션이 있어야 합니다.");
+            throw new InternalServerErrorException(ApiErrorMessage.AUTHENTICATION_ANNOTATION_REQUIRED.getMessage());
         }
         boolean authenticationRequired = authentication.required();
         HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
@@ -47,16 +49,16 @@ public Object resolveArgument(MethodParameter parameter,
 
     private void validateAuthentication(HttpSession session, boolean authenticationRequired) {
         if (session == null && authenticationRequired) {
-            throw new UnauthorizedException("로그인이 필요합니다");
+            throw new UnauthorizedException(ApiErrorMessage.LOGIN_REQUIRED.getMessage());
         }
     }
 
     private void validateAuthentication(Long memberId, boolean authenticationRequired) {
         if (memberId == null) {
-            log.error("세션에 MEMBER_ID가 없습니다.");
+            log.error(ApiErrorMessage.MEMBER_ID_NOT_IN_SESSION.getMessage());
         }
         if (memberId == null && authenticationRequired) {
-            throw new IllegalStateException("세션에 MEMBER_ID가 없습니다.");
+            throw new UnauthorizedException(ApiErrorMessage.MEMBER_ID_NOT_IN_SESSION.getMessage());
         }
     }
 }

common/run-test-redis.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 if ! docker ps --format '{{.Names}}' | grep -q '^payment-test-redis$'; then
-  echo "payment-test-redis 컨테이너가 실행 중이 아닙니다. docker-compose -f test.yml up -d payment-test-redis로 시작합니다..."
-  docker compose -f test.yml up -d payment-test-redis
+  echo "payment-test-redis 컨테이너가 실행 중이 아닙니다. docker compose -f test-docker-compose.yml up -d payment-test-redis로 시작합니다..."
+  docker compose -f "$(git rev-parse --show-toplevel)/test-docker-compose.yml" up -d payment-test-redis
 else
   echo "payment-test-redis 컨테이너가 이미 실행 중입니다."
 fi

common/src/main/java/com/samhap/kokomen/global/exception/InternalServerErrorException.java

@@ -0,0 +1,12 @@
+package com.samhap.kokomen.global.exception;
+
+public class InternalServerErrorException extends KokomenException {
+
+    public InternalServerErrorException(String message) {
+        super(message, 500);
+    }
+
+    public InternalServerErrorException(String message, Throwable cause) {
+        super(message, cause, 500);
+    }
+}

common/src/main/java/com/samhap/kokomen/global/exception/NotFoundException.java

@@ -0,0 +1,8 @@
+package com.samhap.kokomen.global.exception;
+
+public class NotFoundException extends KokomenException {
+
+  public NotFoundException(String message) {
+    super(message, 404);
+  }
+}