[deploy] v1.3.1 운영서버로 배포

build.gradle

@@ -92,6 +92,12 @@ dependencies {
 
 	// Firebase
 	implementation 'com.google.firebase:firebase-admin:9.3.0'
+
+    // Webflux
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
+
+    // LogStash
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 }
 
 def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile

src/main/java/konkuk/thip/TestTokenController.java → src/main/java/konkuk/thip/TestController.java

@@ -10,12 +10,17 @@
 @RestController
 @RequiredArgsConstructor
 @ConditionalOnProperty(name = "thip.test-api.enabled", havingValue = "true")
-public class TestTokenController {
+public class TestController {
 
     private final JwtUtil jwtUtil;
 
     @GetMapping("/api/test/token/access")
     public String generateAccessToken(@RequestParam Long userId) {
         return jwtUtil.createAccessToken(userId);
     }
+
+    @GetMapping("/api/test/error")
+    public String throwError() {
+        throw new RuntimeException("테스트 500 에러");
+    }
 }

src/main/java/konkuk/thip/book/adapter/out/api/aladin/AladinApiUtil.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import konkuk.thip.common.exception.BusinessException;
+import konkuk.thip.common.exception.ExternalApiException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -54,14 +54,15 @@ public Integer getPageCount(String isbn) {
                 // TODO : 알라딘으로부터 page 정보가 없으면 ??
                 // 보상 시나리오 : 유저에게 "page 정보를 찾을 수 없는 책입니다. 직접 page 정보를 입력하세요" 라고 안내
                 // 일단 지금은 exception throw 만 진행
-                throw new BusinessException(BOOK_ALADIN_API_ISBN_NOT_FOUND);
+                throw new ExternalApiException(BOOK_ALADIN_API_ISBN_NOT_FOUND);
             }
 
             JsonNode subInfo = items.get(0).path(SUB_INFO_PARSING_KEY.getValue());
 
             return subInfo.path(PAGE_COUNT_PARSING_KEY.getValue()).asInt();
         } catch (IOException e) {
-            throw new BusinessException(BOOK_ALADIN_API_PARSING_ERROR);
+            throw new ExternalApiException(BOOK_ALADIN_API_PARSING_ERROR);
         }
     }
 }
+

src/main/java/konkuk/thip/book/adapter/out/api/naver/NaverApiUtil.java

@@ -1,6 +1,7 @@
 package konkuk.thip.book.adapter.out.api.naver;
 
-import konkuk.thip.common.exception.BusinessException;
+import konkuk.thip.common.exception.ExternalApiException;
+import konkuk.thip.common.exception.InternalServerException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -63,7 +64,7 @@ private String keywordToEncoding(String keyword) {
         try {
             text = URLEncoder.encode(keyword, "UTF-8");
         } catch (UnsupportedEncodingException e) {
-            throw new BusinessException(BOOK_KEYWORD_ENCODING_FAILED);
+            throw new InternalServerException(BOOK_KEYWORD_ENCODING_FAILED);
         }
         return text;
     }
@@ -84,7 +85,7 @@ String get(String apiUrl, Map<String, String> requestHeaders){
                 return readBody(con.getErrorStream());
             }
         } catch (IOException e) {
-            throw new BusinessException(BOOK_NAVER_API_REQUEST_ERROR);
+            throw new ExternalApiException(BOOK_NAVER_API_REQUEST_ERROR);
         } finally {
             con.disconnect();
         }
@@ -96,9 +97,9 @@ private HttpURLConnection connect(String apiUrl){
             URL url = new URL(apiUrl);
             return (HttpURLConnection)url.openConnection();
         } catch (MalformedURLException e) {
-            throw new BusinessException(BOOK_NAVER_API_URL_ERROR);
+            throw new InternalServerException(BOOK_NAVER_API_URL_ERROR);
         } catch (IOException e) {
-            throw new BusinessException(BOOK_NAVER_API_URL_HTTP_CONNECT_FAILED);
+            throw new InternalServerException(BOOK_NAVER_API_URL_HTTP_CONNECT_FAILED);
         }
     }
 
@@ -116,7 +117,7 @@ private String readBody(InputStream body){
 
             return responseBody.toString();
         } catch (IOException e) {
-            throw new BusinessException(BOOK_NAVER_API_RESPONSE_ERROR);
+            throw new ExternalApiException(BOOK_NAVER_API_RESPONSE_ERROR);
         }
     }
 

src/main/java/konkuk/thip/book/adapter/out/persistence/BookRedisAdapter.java

@@ -6,7 +6,7 @@
 import konkuk.thip.book.application.port.in.dto.BookMostSearchResult;
 import konkuk.thip.book.application.port.out.BookRedisCommandPort;
 import konkuk.thip.book.application.port.out.BookRedisQueryPort;
-import konkuk.thip.common.exception.ExternalApiException;
+import konkuk.thip.common.exception.InternalServerException;
 import konkuk.thip.common.exception.code.ErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -80,7 +80,7 @@ public List<BookMostSearchResult.BookRankInfo> getYesterdayBookRankInfos(LocalDa
                     new TypeReference<List<BookMostSearchResult.BookRankInfo>>() {}
             );
         } catch (JsonProcessingException e) {
-            throw new ExternalApiException(ErrorCode.JSON_PROCESSING_ERROR);
+            throw new InternalServerException(ErrorCode.JSON_PROCESSING_ERROR);
         }
     }
 
@@ -106,7 +106,7 @@ public void saveBookSearchRankDetail(List<BookMostSearchResult.BookRankInfo> boo
         try {
             detailJson = objectMapper.writeValueAsString(bookRankDetails);
         } catch (JsonProcessingException e) {
-            throw new ExternalApiException(JSON_PROCESSING_ERROR);
+            throw new InternalServerException(JSON_PROCESSING_ERROR);
         }
         redisTemplate.opsForValue().set(redisKey, detailJson);
     }

src/main/java/konkuk/thip/common/aop/StatusFilterAspect.java

@@ -2,7 +2,7 @@
 
 import jakarta.persistence.EntityManager;
 import konkuk.thip.common.entity.StatusType;
-import konkuk.thip.common.exception.InvalidStateException;
+import konkuk.thip.common.exception.InternalServerException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -30,7 +30,7 @@ public class StatusFilterAspect {
      */
     private Session currentTxSession() {
         if (!TransactionSynchronizationManager.isActualTransactionActive()) {
-            throw new InvalidStateException(PERSISTENCE_TRANSACTION_REQUIRED);
+            throw new InternalServerException(PERSISTENCE_TRANSACTION_REQUIRED);
         }
         return session();
     }

src/main/java/konkuk/thip/common/discord/DiscordClient.java

@@ -0,0 +1,64 @@
+package konkuk.thip.common.discord;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class DiscordClient {
+
+    @Value("${discord.env}")
+    private String env;
+
+    @Value("${discord.webhook-url}")
+    private String webhookUrl;
+
+    public void sendErrorMessage(String message, String stackTrace, String requestId, String userId) {
+        if("test".equals(env)) return;
+
+        WebClient webClient = WebClient.create();
+
+        Map<String, Object> embedData = new HashMap<>();
+        embedData.put("title", "THIP 서버 500 에러 발생");
+
+        Map<String, String> field1 = new HashMap<>();
+        field1.put("name", "발생시각");
+        field1.put("value", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
+        Map<String, String> field2 = new HashMap<>();
+        field2.put("name", "에러 명");
+        field2.put("value", message);
+
+        Map<String, String> field3 = new HashMap<>();
+        field3.put("name", "스택 트레이스");
+        field3.put("value", stackTrace);
+
+        Map<String, String> field4 = new HashMap<>();
+        field4.put("name", "Request ID");
+        field4.put("value", requestId != null ? requestId : "N/A");
+
+        Map<String, String> field5 = new HashMap<>();
+        field5.put("name", "User ID");
+        field5.put("value", userId != null ? userId : "N/A");
+
+        embedData.put("fields", List.of(field1, field2, field3, field4, field5));
+
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("embeds", new Object[]{embedData});
+
+        webClient.post()
+                .uri(webhookUrl)
+                .contentType(MediaType.APPLICATION_JSON)
+                .bodyValue(payload)
+                .retrieve()
+                .bodyToMono(Void.class)
+                .block();
+    }
+}

src/main/java/konkuk/thip/common/dto/BaseResponse.java

@@ -3,9 +3,14 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.MDC;
 
+import static konkuk.thip.common.logging.LoggingConstant.REQUEST_ID;
+
+@Slf4j
 @Getter
-@JsonPropertyOrder({"success", "code", "message", "data"})
+@JsonPropertyOrder({"success", "code", "message", "requestId", "data"})
 public class BaseResponse<T> {
 
     @JsonProperty("isSuccess")
@@ -15,17 +20,20 @@ public class BaseResponse<T> {
 
     private final String message;
 
+    private final String requestId;
+
     private final T data;
 
-    private BaseResponse(boolean success, int code, String message, T data) {
+    private BaseResponse(boolean success, int code, String message, String requestId, T data) {
         this.success = success;
         this.code = code;
         this.message = message;
+        this.requestId = requestId;
         this.data = data;
     }
 
     private BaseResponse(ResponseCode response, T data) {
-        this(response.isSuccess(), response.getCode(), response.getMessage(), data);
+        this(response.isSuccess(), response.getCode(), response.getMessage(), MDC.get(REQUEST_ID.getValue()), data);
     }
 
     public static <T> BaseResponse<T> ok(T data) {

src/main/java/konkuk/thip/common/dto/ErrorResponse.java

@@ -3,9 +3,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Getter;
+import org.slf4j.MDC;
+
+import static konkuk.thip.common.logging.LoggingConstant.REQUEST_ID;
 
 @Getter
-@JsonPropertyOrder({"success", "code", "message"})
+@JsonPropertyOrder({"success", "code", "message", "requestId"})
 public class ErrorResponse {
 
     @JsonProperty("isSuccess")
@@ -15,14 +18,17 @@ public class ErrorResponse {
 
     private final String message;
 
-    private ErrorResponse(boolean success, int code, String message) {
+    private final String requestId;
+
+    private ErrorResponse(boolean success, int code, String message, String requestId) {
         this.success = success;
         this.code = code;
         this.message = message;
+        this.requestId = requestId;
     }
 
     private ErrorResponse(ResponseCode response) {
-        this(response.isSuccess(), response.getCode(), response.getMessage());
+        this(response.isSuccess(), response.getCode(), response.getMessage(), MDC.get(REQUEST_ID.getValue()));
     }
 
     public static ErrorResponse of(ResponseCode response) {
@@ -32,6 +38,6 @@ public static ErrorResponse of(ResponseCode response) {
     public static ErrorResponse of(ResponseCode response, String message) {
         StringBuilder sb =  new StringBuilder();
         sb.append(response.getMessage()).append(" ").append(message);
-        return new ErrorResponse(response.isSuccess(), response.getCode(), sb.toString());
+        return new ErrorResponse(response.isSuccess(), response.getCode(), sb.toString(), MDC.get(REQUEST_ID.getValue()));
     }
 }

src/main/java/konkuk/thip/common/exception/FirebaseException.java

@@ -2,20 +2,16 @@
 
 import konkuk.thip.common.exception.code.ErrorCode;
 
-public class FirebaseException extends BusinessException {
-    public FirebaseException(ErrorCode errorCode) {
-        super(errorCode);
-    }
+public class FirebaseException extends RuntimeException {
 
-    public FirebaseException(ErrorCode errorCode, Exception e) {
-        super(errorCode, e);
-    }
+    private final ErrorCode errorCode;
 
-    public FirebaseException(Exception e) {
-        super(ErrorCode.FIREBASE_SEND_ERROR, e);
+    public FirebaseException(ErrorCode errorCode) {
+        super(errorCode.getMessage());
+        this.errorCode = errorCode;
     }
-
-    public FirebaseException() {
-        super(ErrorCode.FIREBASE_SEND_ERROR);
+    public FirebaseException(ErrorCode errorCode, Exception e) {
+        super(errorCode.getMessage(), e);
+        this.errorCode = errorCode;
     }
 }

src/main/java/konkuk/thip/common/exception/InternalServerException.java

@@ -0,0 +1,17 @@
+package konkuk.thip.common.exception;
+
+import konkuk.thip.common.exception.code.ErrorCode;
+
+public class InternalServerException extends RuntimeException {
+
+    private final ErrorCode errorCode;
+
+    public InternalServerException(ErrorCode errorCode) {
+        super(errorCode.getMessage());
+        this.errorCode = errorCode;
+    }
+    public InternalServerException(ErrorCode errorCode, Exception e) {
+        super(errorCode.getMessage(), e);
+        this.errorCode = errorCode;
+    }
+}

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -78,11 +78,10 @@ public enum ErrorCode implements ResponseCode {
     BOOK_NAVER_API_ISBN_NOT_FOUND(HttpStatus.BAD_REQUEST, 80009, "네이버 API 에서 ISBN으로 검색한 결과가 존재하지 않습니다."),
     BOOK_NOT_FOUND(HttpStatus.NOT_FOUND, 80010, "존재하지 않는 BOOK 입니다."),
     BOOK_ALREADY_SAVED(HttpStatus.BAD_REQUEST, 80011, "사용자가 이미 저장한 책입니다."),
-    DUPLICATED_BOOKS_IN_COLLECTION(HttpStatus.INTERNAL_SERVER_ERROR, 80012, "중복된 책이 존재합니다."),
     BOOK_NOT_SAVED_CANNOT_DELETE(HttpStatus.BAD_REQUEST, 80013, "사용자가 저장하지 않은 책은 저장삭제 할 수 없습니다."),
     BOOK_NOT_SAVED_DB_CANNOT_DELETE(HttpStatus.BAD_REQUEST, 80014, "DB에 존재하지 않은 책은 저장삭제 할 수 없습니다."),
     BOOK_ALADIN_API_PARSING_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 80015, "알라딘 API 응답 파싱에 실패하였습니다."),
-    BOOK_ALADIN_API_ISBN_NOT_FOUND(HttpStatus.BAD_REQUEST, 80016, "알라딘 API 에서 ISBN으로 검색한 결과가 존재하지 않습니다."),
+    BOOK_ALADIN_API_ISBN_NOT_FOUND(HttpStatus.INTERNAL_SERVER_ERROR, 80016, "알라딘 API 에서 ISBN으로 검색한 결과가 존재하지 않습니다."),
 
     /**
      * 90000 : recentSearch error
@@ -225,6 +224,7 @@ public enum ErrorCode implements ResponseCode {
     FCM_TOKEN_ENABLED_STATE_ALREADY(HttpStatus.BAD_REQUEST, 200001, "요청한 상태로 이미 푸쉬 알림 여부가 설정되어 있습니다."),
     FCM_TOKEN_ACCESS_FORBIDDEN(HttpStatus.FORBIDDEN, 200002, "토큰을 소유하고 있는 계정이 아닙니다."),
     FIREBASE_SEND_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 200003, "FCM 푸쉬 알림 전송에 실패했습니다."),
+    FCM_TOKEN_DEVICE_ARRAY_MISMATCH(HttpStatus.INTERNAL_SERVER_ERROR, 200004, "메시지, FCM 토큰, 디바이스 ID 리스트의 크기는 같아야 합니다."),
 
 
     /**