Merge pull request #6 from DevKor-github/feature/midpoint-timematrix

Feature/ 중간 지점 계산 API 및 계산 로직 구현

Author: leesanghuu

build.gradle

@@ -27,11 +27,14 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
+	testImplementation 'org.mockito:mockito-core:5.11.0'
+	testImplementation 'org.mockito:mockito-junit-jupiter:5.11.0'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	implementation 'org.mapstruct:mapstruct:1.5.5.Final'
 	annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'

src/main/java/com/ODG/ODG_back/controller/MidpointController.java

@@ -1,5 +1,6 @@
 package com.ODG.ODG_back.controller;
 
+import com.ODG.ODG_back.dto.midpoint.response.MidpointResponseDto;
 import com.ODG.ODG_back.service.MidpointService;
 import com.ODG.ODG_back.strategy.MidpointStrategyType;
 import lombok.RequiredArgsConstructor;
@@ -14,8 +15,8 @@ public class MidpointController {
     private final MidpointService midpointService;
 
     @GetMapping
-    public ResponseEntity<?>getRecommendedMidpoints(@PathVariable String inviteCode,
-                                                    @RequestParam MidpointStrategyType strategyType) {
+    public ResponseEntity<MidpointResponseDto> getRecommendedMidpoints(@PathVariable String inviteCode,
+                                                                            @RequestParam MidpointStrategyType strategyType) {
         return ResponseEntity.ok(midpointService.getRecommendedMidpoints(inviteCode, strategyType));
     }
 

src/main/java/com/ODG/ODG_back/domain/Midpoint.java

@@ -1,11 +1,19 @@
 package com.ODG.ODG_back.domain;
 
 import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.List;
 
 @Entity
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class Midpoint {
 
     @Id

src/main/java/com/ODG/ODG_back/domain/Participant.java

@@ -31,7 +31,7 @@ public class Participant {
 
     private BigDecimal latitude;
     private BigDecimal longitude;
-  
+
     @ManyToOne
     private Meeting meeting;
 }

src/main/java/com/ODG/ODG_back/domain/RecommendedMidpoint.java

@@ -2,11 +2,13 @@
 
 import jakarta.persistence.*;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 
 @Entity
 @Getter
+@NoArgsConstructor
 public class RecommendedMidpoint {
 
     @Id
@@ -24,4 +26,13 @@ public class RecommendedMidpoint {
 
     @ManyToOne
     private Midpoint midpoint;
+
+    public RecommendedMidpoint(Long id, double score, int rank, LocalDateTime recommendedAt, Meeting meeting, Midpoint midpoint) {
+        this.id = id;
+        this.score = score;
+        this.rank = rank;
+        this.recommendedAt = recommendedAt;
+        this.meeting = meeting;
+        this.midpoint = midpoint;
+    }
 }

src/main/java/com/ODG/ODG_back/external/google/GoogleMatrixApiClient.java

@@ -1,8 +1,9 @@
 package com.ODG.ODG_back.external.google;
 
-import java.math.BigDecimal;
+import com.ODG.ODG_back.domain.enums.TransportType;
+
 import java.util.List;
 
 public interface GoogleMatrixApiClient {
-    int[][] getTimeMatrix(List<List<BigDecimal>> origins, List<List<BigDecimal>> destinations);
+    int[][] getTimeMatrix(List<String> origins, List<String> destinations, TransportType transport);
 }

src/main/java/com/ODG/ODG_back/external/google/GoogleMatrixApiClientImpl.java

@@ -1,22 +1,55 @@
 package com.ODG.ODG_back.external.google;
 
+import com.ODG.ODG_back.domain.enums.TransportType;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.web.reactive.function.client.WebClient;
 
-import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+
+import static com.ODG.ODG_back.external.google.parser.GoogleMatrixResponseParser.parseTimeMatrix;
 
 @Component("googleMatrixApiClient")
 public class GoogleMatrixApiClientImpl implements GoogleMatrixApiClient {
 
-    @Value("{google.api.key}")
-    private String googleApiKey;
+    private final String googleApiKey;
+    private final WebClient webClient;
 
-    private final RestTemplate restTemplate = new RestTemplate();
+    public GoogleMatrixApiClientImpl(WebClient.Builder builder, @Value("${google.api.key}") String googleApiKey) {
+        this.webClient = builder.build();
+        this.googleApiKey = googleApiKey;
+    }
 
     @Override
-    public int[][] getTimeMatrix(List<List<BigDecimal>> origins, List<List<BigDecimal>> destinations) {
-        return new int[0][];
+    public int[][] getTimeMatrix(List<String> origins, List<String> destinations, TransportType transport) {
+
+        String url = buildUrl(origins, destinations, transport);
+        Map<String, Object> response = fetchApiResponse(url);
+
+        return parseTimeMatrix(response, origins.size(), destinations.size());
+    }
+
+    private String buildUrl(List<String> origins, List<String> destinations, TransportType transport) {
+
+        String originsParam = String.join("|", origins);
+        String destinationsParam = String.join("|", destinations);
+        String mode = transport == TransportType.CAR ? "driving" : "transit";
+
+        String url = String.format(
+                "https://maps.googleapis.com/maps/api/distancematrix/json?" +
+                        "origins=%s&destinations=%s&mode=%s&key=%s",
+                originsParam, destinationsParam, mode, googleApiKey
+        );
+
+        return url;
+    }
+
+    private Map<String, Object> fetchApiResponse(String url) {
+        return webClient.get()
+                .uri(url)
+                .retrieve()
+                .bodyToMono(Map.class)
+                .block();
     }
 }

src/main/java/com/ODG/ODG_back/external/google/parser/GoogleMatrixResponseParser.java

@@ -0,0 +1,29 @@
+package com.ODG.ODG_back.external.google.parser;
+
+import java.util.List;
+import java.util.Map;
+
+public class GoogleMatrixResponseParser {
+    public static int[][] parseTimeMatrix(Map<String, Object> response, int originSize, int destinationSize) {
+        List<Map<String, Object>> rows = (List<Map<String, Object>>) response.get("rows");
+
+        int[][] timeMatrix = new int[originSize][destinationSize];
+
+        for (int i = 0; i < originSize; i++) {
+            Map<String, Object> row = rows.get(i);
+            List<Map<String, Object>> elements = (List<Map<String, Object>>) row.get("elements");
+
+            for (int j = 0; j < destinationSize; j++) {
+                Map<String, Object> element = elements.get(j);
+                Map<String, Object> duration = (Map<String, Object>) element.get("duration");
+
+                if (duration != null) {
+                    timeMatrix[i][j] = (int) duration.get("value");
+                } else {
+                    timeMatrix[i][j] = Integer.MAX_VALUE; // unreachable destination
+                }
+            }
+        }
+        return timeMatrix;
+    }
+}

src/main/java/com/ODG/ODG_back/mapper/MidpointMapper.java

@@ -0,0 +1,13 @@
+package com.ODG.ODG_back.mapper;
+
+import com.ODG.ODG_back.domain.Midpoint;
+import com.ODG.ODG_back.dto.midpoint.response.MidpointResponseDto;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+@Mapper(componentModel = "spring")
+public interface MidpointMapper {
+
+    @Mapping(source = "id", target = "midpointId")
+    MidpointResponseDto toDto(Midpoint midpoint);
+}

src/main/java/com/ODG/ODG_back/repository/MidpointRepository.java

@@ -0,0 +1,7 @@
+package com.ODG.ODG_back.repository;
+
+import com.ODG.ODG_back.domain.Midpoint;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MidpointRepository extends JpaRepository<Midpoint, Long> {
+}