[REFACTOR] 코드 통합

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

@@ -97,6 +97,7 @@ jobs:
           SUPERTONE_API_TOKEN: ${{ secrets.SUPERTONE_API_TOKEN }}
           GOOGLE_CLIENT_ID_DEV: ${{ secrets.GOOGLE_CLIENT_ID_DEV }}
           GOOGLE_CLIENT_SECRET_DEV: ${{ secrets.GOOGLE_CLIENT_SECRET_DEV }}
+          WIDGET_SECRET_KEY_DEV: ${{ secrets.WIDGET_SECRET_KEY_DEV }}
         run: |
           export HOSTNAME=$(hostname)
           cd kokomen-backend/docker/dev

.github/workflows/cd-api-load-test.yml

@@ -84,6 +84,7 @@ jobs:
           SUPERTONE_API_TOKEN: ${{ secrets.SUPERTONE_API_TOKEN }}
           GOOGLE_CLIENT_ID_PROD: ${{ secrets.GOOGLE_CLIENT_ID_PROD }}
           GOOGLE_CLIENT_SECRET_PROD: ${{ secrets.GOOGLE_CLIENT_SECRET_PROD }}
+          WIDGET_SECRET_KEY_PROD: ${{ secrets.WIDGET_SECRET_KEY_PROD }}
           MYSQL_HOST: ${{ secrets.MYSQL_HOST }}
         run: |
           export HOSTNAME=$(hostname)

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

@@ -84,7 +84,7 @@ jobs:
           SUPERTONE_API_TOKEN: ${{ secrets.SUPERTONE_API_TOKEN }}
           GOOGLE_CLIENT_ID_PROD: ${{ secrets.GOOGLE_CLIENT_ID_PROD }}
           GOOGLE_CLIENT_SECRET_PROD: ${{ secrets.GOOGLE_CLIENT_SECRET_PROD }}
-          PAYMENT_BASE_URL_PROD: ${{ secrets.PAYMENT_BASE_URL_PROD }}
+          WIDGET_SECRET_KEY_PROD: ${{ secrets.WIDGET_SECRET_KEY_PROD }}
         run: |
           export HOSTNAME=$(hostname)
           cd kokomen-backend/docker/prod/api

docker/dev/docker-compose-dev.yml

@@ -23,6 +23,7 @@ services:
       SUPERTONE_API_TOKEN: ${SUPERTONE_API_TOKEN}
       GOOGLE_CLIENT_ID_DEV: ${GOOGLE_CLIENT_ID_DEV}
       GOOGLE_CLIENT_SECRET_DEV: ${GOOGLE_CLIENT_SECRET_DEV}
+      WIDGET_SECRET_KEY_DEV: ${WIDGET_SECRET_KEY_DEV}
     networks:
       - dev-kokomen-net
 

docker/load-test/api/docker-compose-prod.yml

@@ -24,6 +24,7 @@ services:
       SUPERTONE_API_TOKEN: ${SUPERTONE_API_TOKEN}
       GOOGLE_CLIENT_ID_PROD: ${GOOGLE_CLIENT_ID_PROD}
       GOOGLE_CLIENT_SECRET_PROD: ${GOOGLE_CLIENT_SECRET_PROD}
+      WIDGET_SECRET_KEY_PROD: ${WIDGET_SECRET_KEY_PROD}
 
   node:
     image: prom/node-exporter

docker/prod/api/docker-compose-prod.yml

@@ -24,7 +24,7 @@ services:
       SUPERTONE_API_TOKEN: ${SUPERTONE_API_TOKEN}
       GOOGLE_CLIENT_ID_PROD: ${GOOGLE_CLIENT_ID_PROD}
       GOOGLE_CLIENT_SECRET_PROD: ${GOOGLE_CLIENT_SECRET_PROD}
-      PAYMENT_BASE_URL_PROD: ${PAYMENT_BASE_URL_PROD}
+      WIDGET_SECRET_KEY_PROD: ${WIDGET_SECRET_KEY_PROD}
 
   nginx:
     image: nginx:1.28.0

src/main/java/com/samhap/kokomen/answer/service/AnswerService.java

@@ -3,6 +3,7 @@
 import com.samhap.kokomen.answer.domain.Answer;
 import com.samhap.kokomen.answer.repository.AnswerRepository;
 import com.samhap.kokomen.global.exception.BadRequestException;
+import com.samhap.kokomen.global.exception.NotFoundException;
 import com.samhap.kokomen.interview.entity.Question;
 import java.util.List;
 import java.util.Optional;
@@ -23,12 +24,12 @@ public Answer saveAnswer(Answer answer) {
 
     public Answer readById(Long answerId) {
         return answerRepository.findById(answerId)
-                .orElseThrow(() -> new BadRequestException("존재하지 않는 답변입니다."));
+                .orElseThrow(() -> new NotFoundException("존재하지 않는 답변입니다."));
     }
 
     public Answer readByQuestionId(Long questionId) {
         return answerRepository.findByQuestionId(questionId)
-                .orElseThrow(() -> new IllegalStateException("다음 질문에 대한 답변이 존재하지 않습니다. question_id = " + questionId));
+                .orElseThrow(() -> new NotFoundException("다음 질문에 대한 답변이 존재하지 않습니다. question_id = " + questionId));
     }
 
     public Optional<Answer> findByQuestionId(Long questionId) {

src/main/java/com/samhap/kokomen/auth/infrastructure/SessionInvalidator.java

@@ -1,5 +1,6 @@
 package com.samhap.kokomen.auth.infrastructure;
 
+import com.samhap.kokomen.global.exception.BadRequestException;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -15,7 +16,7 @@ public static void logout(HttpServletRequest request, HttpServletResponse respon
         Cookie jSessionIdCookie = Arrays.stream(request.getCookies())
                 .filter(cookie -> "JSESSIONID".equals(cookie.getName()))
                 .findFirst()
-                .orElseThrow(() -> new IllegalStateException("JSESSIONID 쿠키가 요청에 존재하지 않습니다."));
+                .orElseThrow(() -> new BadRequestException("JSESSIONID 쿠키가 요청에 존재하지 않습니다."));
         jSessionIdCookie.setValue("");
         jSessionIdCookie.setMaxAge(0);
         response.addCookie(jSessionIdCookie);

src/main/java/com/samhap/kokomen/global/aop/TosspaymentsLoggingAspect.java

@@ -0,0 +1,39 @@
+package com.samhap.kokomen.global.aop;
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StopWatch;
+
+@Slf4j
+@Order(1)
+@Aspect
+@Component
+public class TosspaymentsLoggingAspect {
+
+    @Around("execution(* com.samhap.kokomen.payment.external.TosspaymentsClient.*(..))")
+    public Object logTosspaymentsApiCall(ProceedingJoinPoint joinPoint) throws Throwable {
+        String methodName = joinPoint.getSignature().getName();
+        Object[] args = joinPoint.getArgs();
+
+        log.info("[토스페이먼츠 API 요청] {} - args: {}", methodName, args);
+
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        try {
+            Object result = joinPoint.proceed();
+            stopWatch.stop();
+            log.info("[토스페이먼츠 API 응답] {} - {}ms - response: {}",
+                    methodName, stopWatch.getTotalTimeMillis(), result);
+            return result;
+        } catch (Throwable e) {
+            stopWatch.stop();
+            log.error("[토스페이먼츠 API 에러] {} - {}ms - error: {}",
+                    methodName, stopWatch.getTotalTimeMillis(), e.getMessage());
+            throw e;
+        }
+    }
+}

src/main/java/com/samhap/kokomen/global/config/RetryConfig.java

@@ -0,0 +1,39 @@
+package com.samhap.kokomen.global.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.retry.backoff.ExponentialBackOffPolicy;
+import org.springframework.retry.support.RetryTemplate;
+
+@Configuration
+public class RetryConfig {
+
+    @Value("${retry.tosspayments.max-attempts}")
+    private int maxAttempts;
+
+    @Value("${retry.tosspayments.initial-interval}")
+    private long initialInterval;
+
+    @Value("${retry.tosspayments.multiplier}")
+    private double multiplier;
+
+    @Value("${retry.tosspayments.max-interval}")
+    private long maxInterval;
+
+    @Bean
+    public RetryTemplate tosspaymentsConfirmRetryTemplate() {
+        RetryTemplate retryTemplate = new RetryTemplate();
+
+        TosspaymentsConfirmRetryPolicy retryPolicy = new TosspaymentsConfirmRetryPolicy(maxAttempts);
+        retryTemplate.setRetryPolicy(retryPolicy);
+
+        ExponentialBackOffPolicy backOffPolicy = new ExponentialBackOffPolicy();
+        backOffPolicy.setInitialInterval(initialInterval);
+        backOffPolicy.setMultiplier(multiplier);
+        backOffPolicy.setMaxInterval(maxInterval);
+        retryTemplate.setBackOffPolicy(backOffPolicy);
+
+        return retryTemplate;
+    }
+}

src/main/java/com/samhap/kokomen/global/config/TosspaymentsConfirmRetryPolicy.java

@@ -0,0 +1,36 @@
+package com.samhap.kokomen.global.config;
+
+import org.springframework.retry.RetryContext;
+import org.springframework.retry.policy.SimpleRetryPolicy;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
+import org.springframework.web.client.ResourceAccessException;
+
+public class TosspaymentsConfirmRetryPolicy extends SimpleRetryPolicy {
+
+    public TosspaymentsConfirmRetryPolicy(int maxAttempts) {
+        super(maxAttempts);
+    }
+
+    @Override
+    public boolean canRetry(RetryContext context) {
+        Throwable lastException = context.getLastThrowable();
+        if (lastException != null && !isRetryableException(lastException)) {
+            return false;
+        }
+        return super.canRetry(context);
+    }
+
+    private boolean isRetryableException(Throwable throwable) {
+        if (throwable instanceof HttpServerErrorException) {
+            return true;
+        }
+        if (throwable instanceof ResourceAccessException) {
+            return true;
+        }
+        if (throwable instanceof HttpClientErrorException e) {
+            return e.getStatusCode().value() == 409;
+        }
+        return false;
+    }
+}

src/main/java/com/samhap/kokomen/global/exception/BadRequestException.java

@@ -7,4 +7,8 @@ public class BadRequestException extends KokomenException {
     public BadRequestException(String message) {
         super(message, HttpStatus.BAD_REQUEST);
     }
+
+    public BadRequestException(String message, Throwable cause) {
+        super(message, cause, HttpStatus.BAD_REQUEST);
+    }
 }

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

@@ -6,13 +6,13 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.web.HttpMediaTypeNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.resource.NoResourceFoundException;
 
-// TODO: HttpMessageNotReadableException 예외 처리 추가
 @Slf4j
 @RestControllerAdvice
 public class GlobalExceptionHandler {
@@ -93,6 +93,14 @@ public ResponseEntity<Void> handleNoResourceFound(NoResourceFoundException e) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
     }
 
+    @ExceptionHandler(HttpMediaTypeNotSupportedException.class)
+    public ResponseEntity<ErrorResponse> handleHttpMediaTypeNotSupportedException(
+            HttpMediaTypeNotSupportedException e) {
+        log.warn("HttpMediaTypeNotSupportedException :: message: {}", e.getMessage());
+        return ResponseEntity.status(HttpStatus.UNSUPPORTED_MEDIA_TYPE)
+                .body(new ErrorResponse("지원하지 않는 Content-Type입니다."));
+    }
+
     @ExceptionHandler(Exception.class)
     public ResponseEntity<ErrorResponse> handleException(Exception e) {
         log.error("Exception :: status: {}, message: {}, stackTrace: ", HttpStatus.INTERNAL_SERVER_ERROR,

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

@@ -0,0 +1,14 @@
+package com.samhap.kokomen.global.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class InternalServerErrorException extends KokomenException {
+
+    public InternalServerErrorException(String message) {
+        super(message, HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+
+    public InternalServerErrorException(String message, Throwable cause) {
+        super(message, cause, HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.samhap.kokomen.global.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class NotFoundException extends KokomenException {
+
+    public NotFoundException(String message) {
+        super(message, HttpStatus.NOT_FOUND);
+    }
+
+    public NotFoundException(String message, Throwable cause) {
+        super(message, cause, HttpStatus.NOT_FOUND);
+    }
+}

src/main/java/com/samhap/kokomen/global/exception/PaymentServiceErrorMessage.java

@@ -0,0 +1,25 @@
+package com.samhap.kokomen.global.exception;
+
+import lombok.Getter;
+
+@Getter
+public enum PaymentServiceErrorMessage {
+
+    MISSING_REQUEST_PARAMETER("필수 요청 파라미터가 누락되었습니다."),
+    JSON_PARSE_ERROR("JSON 파싱 오류: 유효하지 않은 값이 전달되었습니다."),
+    PAYMENT_NOT_FOUND_BY_ID("해당 id의 결제 정보가 존재하지 않습니다."),
+    PAYMENT_NOT_FOUND_BY_PAYMENT_KEY("해당 paymentKey의 결제 정보가 존재하지 않습니다."),
+    PAYMENT_RESULT_NOT_FOUND("해당 결제의 결과 정보가 존재하지 않습니다."),
+    CONFIRM_SERVER_ERROR("결제 처리 중 서버 오류가 발생했습니다."),
+    CANCEL_SERVER_ERROR("결제 취소 처리 중 서버 오류가 발생했습니다."),
+    CANCEL_NETWORK_ERROR("결제 취소 처리 중 네트워크 오류가 발생했습니다."),
+    INVALID_REQUEST("잘못된 요청입니다."),
+    INVALID_REQUEST_FORMAT("잘못된 요청 형식입니다."),
+    INTERNAL_SERVER_ERROR("서버에 문제가 발생하였습니다.");
+
+    private final String message;
+
+    PaymentServiceErrorMessage(String message) {
+        this.message = message;
+    }
+}

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

@@ -2,6 +2,7 @@
 
 import com.samhap.kokomen.global.annotation.Authentication;
 import com.samhap.kokomen.global.dto.MemberAuth;
+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 +30,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("MemberAuth 파라미터는 @Authentication 어노테이션이 있어야 합니다.");
         }
         boolean authenticationRequired = authentication.required();
         HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
@@ -56,7 +57,7 @@ private void validateAuthentication(Long memberId, boolean authenticationRequire
             log.error("세션에 MEMBER_ID가 없습니다.");
         }
         if (memberId == null && authenticationRequired) {
-            throw new IllegalStateException("세션에 MEMBER_ID가 없습니다.");
+            throw new UnauthorizedException("세션에 MEMBER_ID가 없습니다.");
         }
     }
 }

src/main/java/com/samhap/kokomen/global/infrastructure/ObjectToStringDeserializer.java

@@ -0,0 +1,25 @@
+package com.samhap.kokomen.global.infrastructure;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+
+public class ObjectToStringDeserializer extends JsonDeserializer<String> {
+
+    @Override
+    public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        JsonNode node = p.getCodec().readTree(p);
+
+        // 이미 문자열인 경우 그대로 반환
+        if (node.isTextual()) {
+            return node.asText();
+        }
+
+        // 객체나 배열인 경우 JSON 문자열로 변환
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.writeValueAsString(node);
+    }
+}

src/main/java/com/samhap/kokomen/global/service/S3Service.java

@@ -2,6 +2,7 @@
 
 import com.samhap.kokomen.global.annotation.ExecutionTimer;
 import com.samhap.kokomen.global.constant.AwsConstant;
+import com.samhap.kokomen.global.exception.BadRequestException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import software.amazon.awssdk.core.ResponseBytes;
@@ -69,6 +70,6 @@ private String extractKeyFromCdnUrl(String cdnUrl) {
         if (cdnUrl.startsWith(AwsConstant.CLOUD_FRONT_DOMAIN_URL)) {
             return cdnUrl.substring(AwsConstant.CLOUD_FRONT_DOMAIN_URL.length());
         }
-        throw new IllegalArgumentException("Invalid CDN URL: " + cdnUrl);
+        throw new BadRequestException("Invalid CDN URL: " + cdnUrl);
     }
 }