Merge pull request #28 from CarToi/dev

kimD0ngjun · web-flow · commit 71e459400dc9 · 2025-07-09T15:46:56.000+09:00
배포 추가 - 지오코딩 로직 + 요청 / 응답 환산 처리 변경
diff --git a/src/main/java/org/jun/saemangeum/consume/config/CoordinateConfig.java b/src/main/java/org/jun/saemangeum/consume/config/CoordinateConfig.java
@@ -0,0 +1,34 @@
+//package org.jun.saemangeum.consume.config;
+//
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.http.client.SimpleClientHttpRequestFactory;
+//import org.springframework.web.client.RestTemplate;
+//
+//@Configuration
+//public class CoordinateConfig {
+//
+//    @Value("${kakao.apiKey}")
+//    private String apiKey;
+//
+//    @Bean(name = "coordinateTemplate")
+//    public RestTemplate coordinateTemplate() {
+//        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+//        requestFactory.setConnectTimeout(5000);
+//        requestFactory.setReadTimeout(5000);
+//
+//        RestTemplate restTemplate = new RestTemplate(requestFactory);
+//
+//        // Authorization 헤더 자동 추가용 인터셉터 설정
+//        restTemplate.getInterceptors().add((request, body, execution) -> {
+//            request.getHeaders().add("Authorization", "KakaoAK " + apiKey);
+//            request.getHeaders().add("User-Agent", "Mozilla/5.0");
+//            return execution.execute(request, body);
+//        });
+//
+//        return restTemplate;
+//    }
+//}
+
+// 카카오 인코딩 정책을 먼저 파악하고 빈 등록하기
diff --git a/src/main/java/org/jun/saemangeum/consume/domain/dto/Coordinate.java b/src/main/java/org/jun/saemangeum/consume/domain/dto/Coordinate.java
@@ -0,0 +1,7 @@
+package org.jun.saemangeum.consume.domain.dto;
+
+public record Coordinate(
+        double longitude, // 경도(longitude)
+        double latitude // 위도(latitude)
+) {
+}
diff --git a/src/main/java/org/jun/saemangeum/consume/domain/dto/KakaoResponse.java b/src/main/java/org/jun/saemangeum/consume/domain/dto/KakaoResponse.java
@@ -0,0 +1,44 @@
+package org.jun.saemangeum.consume.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.util.List;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class KakaoResponse {
+    private List<Document> documents;
+
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class Document {
+        private String x;
+        private String y;
+        private Address address;
+        private RoadAddress road_address;
+
+        @Getter
+        @Setter
+        @NoArgsConstructor
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        public static class Address {
+            private String x;
+            private String y;
+        }
+
+        @Getter
+        @Setter
+        @NoArgsConstructor
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        public static class RoadAddress {
+            private String x;
+            private String y;
+        }
+    }
+}
diff --git a/src/main/java/org/jun/saemangeum/consume/domain/dto/RecommendationResponse.java b/src/main/java/org/jun/saemangeum/consume/domain/dto/RecommendationResponse.java
@@ -1,12 +1,20 @@
 package org.jun.saemangeum.consume.domain.dto;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 import org.jun.saemangeum.global.domain.Category;
 
-public record RecommendationResponse(
-        String title, // 추천 컨텐츠명
-        String position, // 위치 (주소 혹은 추상적인 지리적 위치)
-        Category category, // 컨텐츠 분류 (FESTIVAL, EVENT, TOUR, CULTURE)
-        String image, // 이미지 소스 url (null 가능성 존재)
-        String url // 컨텐츠 데이터 출처
-) {
+@Getter
+@AllArgsConstructor
+public class RecommendationResponse {
+    private String title; // 추천 컨텐츠명
+    private String position; // 위치 (주소 혹은 추상적인 지리적 위치)
+    private Category category; // 컨텐츠 분류 (FESTIVAL, EVENT, TOUR, CULTURE)
+    private String image; // 이미지 소스 url (null 가능성 존재)
+    private String url; // 컨텐츠 데이터 출처
+    private Coordinate coordinate; // 위경도 좌표 내부 JSON
+
+    public void updateCoordinate(Coordinate coordinate) {
+        this.coordinate = coordinate;
+    }
 }
diff --git a/src/main/java/org/jun/saemangeum/consume/domain/swap/ContentView.java b/src/main/java/org/jun/saemangeum/consume/domain/swap/ContentView.java
@@ -42,7 +42,7 @@ public class ContentView implements IContent {
 
     @Override
     public RecommendationResponse to() {
-        return new RecommendationResponse(title, position, category, image, url);
+        return new RecommendationResponse(title, position, category, image, url, null);
     }
 
     @Override
diff --git a/src/main/java/org/jun/saemangeum/consume/service/application/SurveyRecommendationService.java b/src/main/java/org/jun/saemangeum/consume/service/application/SurveyRecommendationService.java
@@ -1,6 +1,7 @@
 package org.jun.saemangeum.consume.service.application;
 
 import lombok.RequiredArgsConstructor;
+import org.jun.saemangeum.consume.domain.dto.Coordinate;
 import org.jun.saemangeum.consume.domain.dto.RecommendationResponse;
 import org.jun.saemangeum.consume.domain.dto.SurveyCreateRequest;
 import org.jun.saemangeum.consume.domain.dto.SurveyUpdateRequest;
@@ -9,6 +10,7 @@
 import org.jun.saemangeum.consume.service.domain.RecommendationLogService;
 import org.jun.saemangeum.consume.service.domain.SurveyService;
 import org.jun.saemangeum.consume.service.strategy.StrategyContextHolder;
+import org.jun.saemangeum.consume.util.CoordinateCalculator;
 import org.jun.saemangeum.global.domain.IContent;
 import org.jun.saemangeum.global.exception.SatisfactionsException;
 import org.springframework.stereotype.Service;
@@ -19,6 +21,7 @@
 @Service
 @RequiredArgsConstructor
 public class SurveyRecommendationService {
+    private final CoordinateCalculator coordinateCalculator;
     private final SurveyService surveyService;
     private final RecommendationLogService recommendationLogService;
 
@@ -27,7 +30,8 @@ public class SurveyRecommendationService {
      */
     public List<RecommendationResponse> createRecommendationsBySurvey(SurveyCreateRequest request) {
         String age = request.age() > 30 ? "늙은" : "젊은";
-        String text = request.gender() + " " + age + " "
+        String awareness = ""; // request.resident()
+        String text = request.gender() + " " + age + " " + awareness
                 + request.city() + " " + request.mood() + " " + request.want();
 
         // 전략 패턴 적용
@@ -38,7 +42,12 @@ public List<RecommendationResponse> createRecommendationsBySurvey(SurveyCreateRe
                 .map(e -> new RecommendationLog(e, survey)).toList();
         recommendationLogService.saveALl(recommendationLogs);
 
-        return contents.stream().map(IContent::to).toList();
+        Coordinate coordinate = new Coordinate(0.1, 0.1);
+
+        return contents.stream()
+                .map(IContent::to)
+                .peek(e -> e.updateCoordinate(coordinateCalculator.getCoordinate(e.getPosition())))
+                .toList();
     }
 
     /**
diff --git a/src/main/java/org/jun/saemangeum/consume/service/strategy/TableEmbeddingVectorStrategy.java b/src/main/java/org/jun/saemangeum/consume/service/strategy/TableEmbeddingVectorStrategy.java
@@ -37,7 +37,7 @@ public List<? extends IContent> calculateSimilarity(String text) {
 
             TableEmbeddingVectorStrategy.ContentSimilarity cs =
                     new TableEmbeddingVectorStrategy.ContentSimilarity(vec.getContent(), similarity);
-            if (pq.size() < 18) {
+            if (pq.size() < 10) {
                 pq.offer(cs);
             } else if (similarity > pq.peek().similarity) {
                 pq.poll();
diff --git a/src/main/java/org/jun/saemangeum/consume/service/strategy/ViewEmbeddingVectorStrategy.java b/src/main/java/org/jun/saemangeum/consume/service/strategy/ViewEmbeddingVectorStrategy.java
@@ -37,7 +37,7 @@ public List<? extends IContent> calculateSimilarity(String text) {
 
             ViewEmbeddingVectorStrategy.ContentSimilarity cs =
                     new ViewEmbeddingVectorStrategy.ContentSimilarity(vec.getContentView(), similarity);
-            if (pq.size() < 18) {
+            if (pq.size() < 10) {
                 pq.offer(cs);
             } else if (similarity > pq.peek().similarity) {
                 pq.poll();
diff --git a/src/main/java/org/jun/saemangeum/consume/util/CoordinateCalculator.java b/src/main/java/org/jun/saemangeum/consume/util/CoordinateCalculator.java
@@ -0,0 +1,104 @@
+package org.jun.saemangeum.consume.util;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URLEncoder;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+import lombok.extern.slf4j.Slf4j;
+import org.jun.saemangeum.consume.domain.dto.Coordinate;
+import org.jun.saemangeum.consume.domain.dto.KakaoResponse;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class CoordinateCalculator {
+
+    @Value("${kakao.apiKey}")
+    private String apiKey;
+
+    @Value("${kakao.centralX}")
+    private double centralX;
+
+    @Value("${kakao.centralY}")
+    private double centralY;
+
+    @Value("${kakao.distance}")
+    private double distance;
+
+    private final ObjectMapper objectMapper = new ObjectMapper();
+    private final HttpClient httpClient = HttpClient.newHttpClient();
+
+    public Coordinate getCoordinate(String position) {
+        String responseJson = getResponseJson(position);
+        KakaoResponse body = null;
+
+        try {
+            body = objectMapper.readValue(responseJson, KakaoResponse.class);
+        } catch (JsonProcessingException ex) {
+            log.error(ex.getMessage());
+        }
+
+        if (body == null) return null;
+        if (body.getDocuments() == null || body.getDocuments().isEmpty()) return null;
+
+        var doc = body.getDocuments().getFirst();
+
+        // 최상위 x/y
+        if (doc.getX() != null && doc.getY() != null) return toCoordinate(doc.getX(), doc.getY());
+
+        // road_address
+        if (doc.getRoad_address() != null && doc.getRoad_address().getX() != null) {
+            return toCoordinate(doc.getRoad_address().getX(), doc.getRoad_address().getY());
+        }
+
+        // address
+        if (doc.getAddress() != null && doc.getAddress().getX() != null) {
+            return toCoordinate(doc.getAddress().getX(), doc.getAddress().getY());
+        }
+
+        // 최종 폴백
+        return null;
+    }
+
+    private String getResponseJson(String position) {
+        String apiUrl = "https://dapi.kakao.com/v2/local/search/address.json";
+
+        try {
+            String encodedPosition = URLEncoder.encode(position, StandardCharsets.UTF_8);
+            String urlWithParams = apiUrl + "?query=" + encodedPosition;
+
+            HttpRequest request = HttpRequest.newBuilder()
+                    .uri(URI.create(urlWithParams))
+                    .header("Authorization", "KakaoAK " + apiKey)
+                    .GET()
+                    .build();
+
+            HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+            return response.body();
+
+        } catch (IOException | InterruptedException e) {
+            log.error(e.getMessage());
+        }
+
+        return null;
+    }
+
+    private Coordinate toCoordinate(String x, String y) {
+        double dx = Double.parseDouble(x);
+        double dy = Double.parseDouble(y);
+        return calculate(dx, dy) ? new Coordinate(dx, dy) : null;
+    }
+
+    private boolean calculate(double x, double y) {
+        double dx = x - centralX;
+        double dy = y - centralY;
+
+        return distance >= Math.sqrt(dx * dx + dy * dy);
+    }
+}
diff --git a/src/main/java/org/jun/saemangeum/global/domain/Content.java b/src/main/java/org/jun/saemangeum/global/domain/Content.java
@@ -67,7 +67,7 @@ public void setVector(Vector vector) {
 
     @Override
     public RecommendationResponse to() {
-        return new RecommendationResponse(title, position, category, image, url);
+        return new RecommendationResponse(title, position, category, image, url, null);
     }
 
     @Override
diff --git a/src/test/java/org/jun/saemangeum/connect/CoordinateTest.java b/src/test/java/org/jun/saemangeum/connect/CoordinateTest.java
@@ -0,0 +1,33 @@
+package org.jun.saemangeum.connect;
+
+import org.jun.saemangeum.consume.domain.dto.Coordinate;
+import org.jun.saemangeum.consume.util.CoordinateCalculator;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class CoordinateTest {
+
+    @Autowired
+    private CoordinateCalculator coordinateCalculator;
+
+    @Test
+    @DisplayName("카카오 API 위도 & 경도 환산 테스트")
+    void test() {
+        String position = "전북특별자치도 군산시 영명길 29";
+        String wrongPosition = "아리울 예술창고";
+
+        Coordinate coordinate1 = coordinateCalculator.getCoordinate(position);
+        Coordinate coordinate2 = coordinateCalculator.getCoordinate(wrongPosition);
+
+        System.out.println(coordinate1);
+        System.out.println(coordinate2);
+
+        Assertions.assertNotNull(coordinate1);
+        Assertions.assertNull(coordinate2);
+    }
+
+}
diff --git a/src/test/java/org/jun/saemangeum/service/StrategyConcurrencyTest.java b/src/test/java/org/jun/saemangeum/service/StrategyConcurrencyTest.java
@@ -11,6 +11,7 @@
 import org.jun.saemangeum.consume.service.strategy.StrategyContextHolder;
 import org.jun.saemangeum.consume.service.strategy.TableEmbeddingVectorStrategy;
 import org.jun.saemangeum.consume.service.strategy.ViewEmbeddingVectorStrategy;
+import org.jun.saemangeum.consume.util.CoordinateCalculator;
 import org.jun.saemangeum.global.domain.Category;
 import org.jun.saemangeum.global.domain.Content;
 import org.junit.jupiter.api.Assertions;
@@ -59,7 +60,8 @@ public ViewEmbeddingVectorStrategy mockViewEmbeddingVectorStrategy() {
                             "where",
                             Category.CULTURE,
                             "img",
-                            "url"));
+                            "url",
+                            null));
 
             ViewEmbeddingVectorStrategy mock = Mockito.mock(ViewEmbeddingVectorStrategy.class);
             Mockito.when(mock.calculateSimilarity(Mockito.anyString()))
@@ -68,6 +70,14 @@ public ViewEmbeddingVectorStrategy mockViewEmbeddingVectorStrategy() {
             return mock;
         }
 
+        @Bean(name = "mockCoordinateCalculator")
+        public CoordinateCalculator mockCoordinateCalculator() {
+            CoordinateCalculator mock = Mockito.mock(CoordinateCalculator.class);
+            Mockito.when(mock.getCoordinate(Mockito.anyString())).thenReturn(null);
+
+            return mock;
+        }
+
         @Bean
         public SurveyRecommendationService mockSurveyRecommendationService() {
             SurveyService surveyService = Mockito.mock(SurveyService.class);
@@ -78,7 +88,7 @@ public SurveyRecommendationService mockSurveyRecommendationService() {
             Mockito.when(surveyService.save(Mockito.any())).thenReturn(mockSurvey);
             Mockito.doNothing().when(logService).saveALl(Mockito.anyList());
 
-            return new SurveyRecommendationService(surveyService, logService);
+            return new SurveyRecommendationService(mockCoordinateCalculator(), surveyService, logService);
         }
     }
 
@@ -129,8 +139,8 @@ void testStrategyThreadUnsafe() throws InterruptedException {
 
                 List<RecommendationResponse> responses =
                         mockSurveyRecommendationService.createRecommendationsBySurvey(request);
-                observedTitles.add(responses.getFirst().title());
-                log.info("[데이터 소비 3티어] 사용된 추천 제목(전략): {}", responses.getFirst().title());
+                observedTitles.add(responses.getFirst().getTitle());
+                log.info("[데이터 소비 3티어] 사용된 추천 제목(전략): {}", responses.getFirst().getTitle());
             } catch (InterruptedException e) {
                 log.error("스레드 인터럽트 발생");
             } finally
diff --git a/src/test/java/org/jun/saemangeum/service/StrategyPatternTest.java b/src/test/java/org/jun/saemangeum/service/StrategyPatternTest.java

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public class ContentView implements IContent {`
`42`	`42`
`43`	`43`	`@Override`
`44`	`44`	`public RecommendationResponse to() {`
`45`		`- return new RecommendationResponse(title, position, category, image, url);`
	`45`	`+ return new RecommendationResponse(title, position, category, image, url, null);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void setVector(Vector vector) {`
`67`	`67`
`68`	`68`	`@Override`
`69`	`69`	`public RecommendationResponse to() {`
`70`		`- return new RecommendationResponse(title, position, category, image, url);`
	`70`	`+ return new RecommendationResponse(title, position, category, image, url, null);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@Override`