Merge pull request #160 from YAPP-Github/develop

[Feat] 2차 프로덕션 선행 배포

Author: lvalentine6

.github/workflows/deploy-dev.yml

@@ -202,8 +202,8 @@ jobs:
         if: steps.get_version.outputs.HAS_VERSION == 'true'
         id: get-latest-task-def
         run: |
-          TASK_DEF_ARN=$(aws ecs describe-services --cluster "${{ env.ECS_CLUSTER }}" --services "${{ env.ECS_SERVICE }}" --query "services[0].taskDefinition" --output text)
-          aws ecs describe-task-definition --task-definition "$TASK_DEF_ARN" --query "taskDefinition" --output json > task-definition.json
+          TASK_DEF_ARN=$(aws ecs describe-task-definition --task-definition "${{ env.CONTAINER_NAME }}" --query "taskDefinition.taskDefinitionArn" --output text)
+              aws ecs describe-task-definition --task-definition "$TASK_DEF_ARN" --query "taskDefinition" --output json > task-definition.json
 
       - name: Fill in the new image ID in the Amazon ECS task definition
         if: steps.get_version.outputs.HAS_VERSION == 'true'

.github/workflows/deploy-prod.yml

@@ -218,7 +218,15 @@ jobs:
         if: steps.get_version.outputs.HAS_VERSION == 'true'
         id: get-latest-task-def
         run: |
-          TASK_DEF_ARN=$(aws ecs describe-services --cluster "${{ env.ECS_CLUSTER }}" --services "${{ env.ECS_SERVICE }}" --region "${{ env.AWS_REGION }}" --query "services[0].taskDefinition" --output text)
+          if [[ -n "${{ github.event.inputs.rollback_version }}" ]]; then
+            echo "롤백 모드: 현재 서비스에서 실행 중인 안정적인 Task Definition을 사용합니다."
+            TASK_DEF_ARN=$(aws ecs describe-services --cluster "${{ env.ECS_CLUSTER }}" --services "${{ env.ECS_SERVICE }}" --region "${{ env.AWS_REGION }}" --query "services[0].taskDefinition" --output text)
+          else
+            echo "일반 배포 모드: 가장 최신 버전의 Task Definition을 사용합니다."
+            TASK_DEF_ARN=$(aws ecs describe-task-definition --task-definition "${{ env.CONTAINER_NAME }}" --query "taskDefinition.taskDefinitionArn" --output text)
+          fi
+
+          echo "사용할 Task Definition ARN: $TASK_DEF_ARN"
           aws ecs describe-task-definition --task-definition "$TASK_DEF_ARN" --region "${{ env.AWS_REGION }}" --query "taskDefinition" --output json > task-definition.json
 
       - name: Fill in the new image ID in the Amazon ECS task definition

Dockerfile

@@ -1,3 +1,6 @@
 FROM eclipse-temurin:21
+
+ADD https://dtdg.co/latest-java-tracer /dd-java-agent.jar
+
 ARG JAR_FILE=build/libs/eatda-0.0.1-SNAPSHOT.jar
 COPY ${JAR_FILE} api.jar

build.gradle

@@ -90,6 +90,9 @@ dependencies {
     implementation 'io.awspring.cloud:spring-cloud-aws-starter-parameter-store:3.2.1'
     implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3:3.2.1'
     implementation 'software.amazon.awssdk:s3:2.31.77'
+
+    //log
+    implementation 'net.logstash.logback:logstash-logback-encoder:8.0'
 }
 
 bootJar {

src/main/java/eatda/client/map/MapClient.java

@@ -21,7 +21,7 @@ public MapClient(RestClient.Builder restClient, KakaoProperties properties) {
         this.kakaoProperties = properties;
     }
 
-    public List<StoreSearchResult> searchShops(String query) {
+    public List<MapClientStoreSearchResult> searchStores(String query) {
         return restClient.get()
                 .uri("https://dapi.kakao.com/v2/local/search/keyword.json", builder -> builder
                         .queryParam("query", query)
@@ -35,7 +35,7 @@ public List<StoreSearchResult> searchShops(String query) {
                         .build())
                 .header("Authorization", "KakaoAK " + kakaoProperties.getApiKey())
                 .retrieve()
-                .body(StoreSearchResults.class)
+                .body(MapClientStoreSearchResults.class)
                 .results();
     }
 }

…/eatda/client/map/StoreSearchResult.java …ient/map/MapClientStoreSearchResult.javasrc/main/java/eatda/client/map/StoreSearchResult.java renamed to src/main/java/eatda/client/map/MapClientStoreSearchResult.java src/main/java/eatda/client/map/StoreSearchResult.java renamed to src/main/java/eatda/client/map/MapClientStoreSearchResult.java

@@ -2,12 +2,13 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import eatda.domain.store.Store;
+import eatda.domain.store.District;
 import eatda.domain.store.StoreCategory;
+import eatda.domain.store.StoreSearchResult;
 import java.util.Map;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record StoreSearchResult(
+public record MapClientStoreSearchResult(
         @JsonProperty("id") String kakaoId,
         @JsonProperty("category_group_code") String categoryGroupCode,
         @JsonProperty("category_name") String categoryName,
@@ -28,6 +29,7 @@ public record StoreSearchResult(
             "음식점 > 카페", StoreCategory.CAFE,
             "음식점 > 간식 > 제과,베이커리", StoreCategory.CAFE
     );
+    private static final District DEFAULT_DISTRICT = District.ETC;
 
     public boolean isFoodStore() {
         return "FD6".equals(categoryGroupCode);
@@ -53,17 +55,29 @@ public StoreCategory getStoreCategory() {
                 .orElse(StoreCategory.OTHER);
     }
 
-    public Store toStore() {
-        return Store.builder()
-                .kakaoId(kakaoId)
-                .category(getStoreCategory())
-                .phoneNumber(phoneNumber)
-                .name(name)
-                .placeUrl(placeUrl)
-                .roadAddress(roadAddress)
-                .lotNumberAddress(lotNumberAddress)
-                .latitude(latitude)
-                .longitude(longitude)
-                .build();
+    public District getDistrict() {
+        if (lotNumberAddress == null || lotNumberAddress.isBlank()) {
+            return DEFAULT_DISTRICT;
+        }
+        String[] addressParts = lotNumberAddress.split(" ");
+        if (addressParts.length < 2) {
+            return DEFAULT_DISTRICT;
+        }
+        return District.fromName(addressParts[1]);
+    }
+
+    public StoreSearchResult toDomain() {
+        return new StoreSearchResult(
+                kakaoId,
+                getStoreCategory(),
+                phoneNumber,
+                name,
+                placeUrl,
+                lotNumberAddress,
+                roadAddress,
+                getDistrict(),
+                latitude,
+                longitude
+        );
     }
 }

…eatda/client/map/StoreSearchResults.java …ent/map/MapClientStoreSearchResults.javasrc/main/java/eatda/client/map/StoreSearchResults.java renamed to src/main/java/eatda/client/map/MapClientStoreSearchResults.java src/main/java/eatda/client/map/StoreSearchResults.java renamed to src/main/java/eatda/client/map/MapClientStoreSearchResults.java

@@ -5,5 +5,5 @@
 import java.util.List;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record StoreSearchResults(@JsonProperty("documents") List<StoreSearchResult> results) {
+public record MapClientStoreSearchResults(@JsonProperty("documents") List<MapClientStoreSearchResult> results) {
 }

src/main/java/eatda/config/LoggingInterceptor.java

@@ -0,0 +1,48 @@
+package eatda.config;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+@Component
+public class LoggingInterceptor implements HandlerInterceptor {
+
+    private static final Logger log = LoggerFactory.getLogger(LoggingInterceptor.class);
+    private static final String START_TIME = "startTime";
+    private static final String REQUEST_ID = "requestId";
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        request.setAttribute(START_TIME, System.currentTimeMillis());
+        String requestId = UUID.randomUUID().toString().substring(0, 8);
+        MDC.put(REQUEST_ID, requestId);
+
+        log.info("[Request] {} {}", request.getMethod(), request.getRequestURI());
+        return true;
+    }
+
+    @Override
+    public void afterCompletion(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            Object handler,
+            Exception ex
+    ) {
+        Long startTime = (Long) request.getAttribute(START_TIME);
+        if (startTime == null) {
+            log.warn("[Response] {} {} (duration unknown - preHandle not called)",
+                    request.getMethod(), request.getRequestURI());
+            MDC.clear();
+            return;
+        }
+
+        long duration = System.currentTimeMillis() - startTime;
+        log.info("[Response] {} {} ({}ms)", request.getMethod(), request.getRequestURI(), duration);
+        MDC.clear();
+    }
+}

src/main/java/eatda/config/WebConfig.java

@@ -6,16 +6,24 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 @RequiredArgsConstructor
 public class WebConfig implements WebMvcConfigurer {
 
     private final JwtManager jwtManager;
+    private final LoggingInterceptor loggingInterceptor;
 
     @Override
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
         argumentResolvers.add(new AuthMemberArgumentResolver(jwtManager));
     }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(loggingInterceptor)
+                .addPathPatterns("/**");
+    }
 }