[BE-55] feat: 실시간 길안내 기능 구현

.github/workflows/trigger-cicd.yml

@@ -1,7 +1,7 @@
 name: Trigger Infra CICD
 on:
   push:
-    branches: [ dev ]
+    branches: [ test ]
   workflow_dispatch:
 
 jobs:
@@ -19,4 +19,4 @@ jobs:
               "sha": "${{ github.sha }}",
               "repoName": "${{ github.repository }}",
               "branchName": "${{ github.ref_name }}"
-            }
+            }

build.gradle

@@ -65,6 +65,11 @@ dependencies {
     //CoolSMS
     implementation 'com.solapi:sdk:1.0.3'
 
+    implementation 'org.hibernate.orm:hibernate-core:6.5.2.Final'
+    implementation 'org.hibernate.orm:hibernate-spatial:6.5.2.Final'
+
+    implementation 'org.locationtech.jts:jts-core:1.19.0'
+
     //AWS S3
     implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 }

src/main/java/com/econo_4factorial/newproject/auth/jwt/service/AuthTokenService.java

@@ -9,6 +9,7 @@
 import com.econo_4factorial.newproject.auth.jwt.repository.BlacklistTokenRepository;
 import com.econo_4factorial.newproject.auth.jwt.repository.RefreshTokenRepository;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,6 +18,7 @@
 import java.util.Date;
 
 @Component
+@Slf4j
 @RequiredArgsConstructor
 public class AuthTokenService {
 

src/main/java/com/econo_4factorial/newproject/base/domain/Base.java

@@ -5,6 +5,7 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.locationtech.jts.geom.Point;
 
 import java.math.BigDecimal;
 
@@ -13,7 +14,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(
         uniqueConstraints = {
-                @UniqueConstraint(columnNames = {"latitude", "longitude"})
+                @UniqueConstraint(columnNames = {"geo_point"})
         }
 )
 public class Base {
@@ -32,11 +33,8 @@ public class Base {
 
     private Double temperature;
 
-    @Column(precision = 16, scale = 14, nullable = false)
-    private BigDecimal latitude;
-
-    @Column(precision = 17, scale = 14, nullable = false)
-    private BigDecimal longitude;
+    @Column(name = "geo_point", columnDefinition = "POINT SRID 4326", nullable = false)
+    private Point GeoPoint;
 
     @Column(nullable = false)
     private Long altitude;

src/main/java/com/econo_4factorial/newproject/base/dto/BaseDTO.java

@@ -2,6 +2,7 @@
 
 
 import com.econo_4factorial.newproject.base.domain.Base;
+import org.locationtech.jts.geom.Coordinate;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -13,10 +14,14 @@ public record BaseDTO(
 
 ) {
     public static BaseDTO from(Base base) {
+        Coordinate coordinate = base.getGeoPoint().getCoordinate();
         return new BaseDTO(
                 base.getId(),
                 base.getName(),
-                List.of(base.getLongitude(), base.getLatitude())
+                List.of(
+                        BigDecimal.valueOf(coordinate.getX()),
+                        BigDecimal.valueOf(coordinate.getY())
+                )
         );
     }
 }

src/main/java/com/econo_4factorial/newproject/base/service/weather/WeatherService.java

@@ -32,8 +32,8 @@ public void updateAllBaseWeather() {
         List<Base> bases = baseRepository.findAll();
         for (Base base : bases) {
             try {
-                BigDecimal lat = base.getLatitude();
-                BigDecimal lon = base.getLongitude();
+                BigDecimal lat = BigDecimal.valueOf(base.getGeoPoint().getCoordinate().getY());
+                BigDecimal lon = BigDecimal.valueOf(base.getGeoPoint().getCoordinate().getX());
                 Long altitude = base.getAltitude();
 
                 Optional<WeatherRes> weatherOpt = Optional.ofNullable(weatherFeignClient.getWeather(lat, lon, apiKey));

src/main/java/com/econo_4factorial/newproject/common/annotation/resolver/UserIdResolver.java

@@ -4,6 +4,7 @@
 import com.econo_4factorial.newproject.auth.jwt.service.JwtTokenProvider;
 import com.econo_4factorial.newproject.common.annotation.UserId;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
@@ -14,6 +15,7 @@
 
 import java.util.Optional;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class UserIdResolver implements HandlerMethodArgumentResolver {

src/main/java/com/econo_4factorial/newproject/common/config/GeometryConfig.java

@@ -0,0 +1,16 @@
+package com.econo_4factorial.newproject.common.config;
+
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class GeometryConfig {
+
+    @Bean
+    public GeometryFactory geometryFactory() {
+        return new GeometryFactory(new PrecisionModel(), 4326);
+    }
+}

src/main/java/com/econo_4factorial/newproject/common/config/WebSocketConfig.java

@@ -15,7 +15,7 @@ public class WebSocketConfig implements WebSocketConfigurer {
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        registry.addHandler(webSocketHandler, "/travel")
+        registry.addHandler(webSocketHandler, "/travel-navigate")
                 .setAllowedOrigins("*");
     }
 }

src/main/java/com/econo_4factorial/newproject/common/exception/CommonErrorType.java

@@ -8,6 +8,8 @@ public enum CommonErrorType implements ErrorType{
     ILLEGAL_ARGUMENT_EXCEPTION("COMMON400_002", HttpStatus.BAD_REQUEST, "Illegal argument exception 발생 "),
     MISSING_PATH_VARIABLE_EXCEPTION("COMMON400_003", HttpStatus.BAD_REQUEST, "경로 변수(PathVariable)가 누락됐습니다."),
     MISSING_REQUEST_PARAM_EXCEPTION("COMMON400_004", HttpStatus.BAD_REQUEST, "쿼리 스트링이 누락됐습니다."),
+
+    WEB_SOCKET_IO_EXCEPTION("WEB_SOCKET500", HttpStatus.BAD_REQUEST, "소켓 IOException 발생"),
 
     UN_EXPECTED_EXCEPTION("COMMON500_001", HttpStatus.INTERNAL_SERVER_ERROR, "예기치 못한 에러가 발생했습니다."),
     REDIS_NOT_READY_EXCEPTION("COMMON500_002", HttpStatus.INTERNAL_SERVER_ERROR, "Redis의 연결 상태가 Ready가 아닙니다");

src/main/java/com/econo_4factorial/newproject/common/exception/WebSocketIOException.java

@@ -0,0 +1,7 @@
+package com.econo_4factorial.newproject.common.exception;
+
+public class WebSocketIOException extends InternalServerException{
+    public WebSocketIOException(){
+        super(CommonErrorType.WEB_SOCKET_IO_EXCEPTION);
+    }
+}

src/main/java/com/econo_4factorial/newproject/common/util/DateUtil.java

@@ -0,0 +1,21 @@
+package com.econo_4factorial.newproject.common.util;
+
+import lombok.experimental.UtilityClass;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.YearMonth;
+
+@UtilityClass
+public class DateUtil {
+    private static int FIRST_DAY = 1;
+    public static LocalDateTime getStartOfYearAndMonth (Integer year, Integer month) {
+        YearMonth yearMonth = YearMonth.of(year, month);
+        return yearMonth.atDay(FIRST_DAY).atStartOfDay();
+    }
+
+    public static LocalDateTime getEndOfYearAndMonth (Integer year, Integer month) {
+        YearMonth yearMonth = YearMonth.of(year, month);
+        return yearMonth.atEndOfMonth().atTime(LocalTime.MAX);
+    }
+}

src/main/java/com/econo_4factorial/newproject/common/util/TimeMapper.java

@@ -0,0 +1,17 @@
+package com.econo_4factorial.newproject.common.util;
+
+import lombok.experimental.UtilityClass;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+
+@UtilityClass
+public class TimeMapper {
+
+    public static LocalDateTime toLocalTime(Long time) {
+        return Instant.ofEpochMilli(time)
+                .atZone(ZoneId.of("Asia/Seoul"))
+                .toLocalDateTime();
+    }
+}

src/main/java/com/econo_4factorial/newproject/common/util/webSocket/WebSocketAuthService.java

@@ -0,0 +1,56 @@
+package com.econo_4factorial.newproject.common.util.webSocket;
+
+import com.econo_4factorial.newproject.auth.jwt.service.AuthTokenService;
+import com.econo_4factorial.newproject.auth.jwt.service.JwtTokenProvider;
+import com.econo_4factorial.newproject.common.exception.WebSocketIOException;
+import com.econo_4factorial.newproject.travel.dto.Payload;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.socket.WebSocketSession;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class WebSocketAuthService {
+    private final String AUTHORIZATION = "authorization";
+
+    private static final ConcurrentHashMap<String, Long> authenticatedClients = new ConcurrentHashMap<>();
+
+    private final AuthTokenService authTokenService;
+    private final JwtTokenProvider jwtTokenProvider;
+
+    public void handleAuthEvent(Payload payload, WebSocketSession session) throws IOException {
+        Long userId = authenticateUser(payload.data());
+        updateToAuthenticated(session.getId(), userId);
+        log.info("사용자 인증 성공. sessionId = {}, userId = {}", session.getId(), userId);
+    }
+
+    private Long authenticateUser(Map<String, Object> data) throws IOException {
+        Long userId = jwtTokenProvider.getUserIdFromAccessToken((String) data.get(AUTHORIZATION));
+        authTokenService.isLoggedIn(userId);
+        return userId;
+    }
+
+    private void updateToAuthenticated(String sessionId, Long userId) {
+        authenticatedClients.put(sessionId, userId);
+    }
+
+    public Boolean isAuthenticatedSession(WebSocketSession session) {
+        return authenticatedClients.containsKey(session.getId());
+
+    }
+
+    public Long getUserId(String id) {
+        return authenticatedClients.get(id);
+    }
+
+    public void removeSession(WebSocketSession session) {
+        authenticatedClients.remove(session.getId());
+    }
+}
+

src/main/java/com/econo_4factorial/newproject/common/util/webSocket/WebSocketFailRes.java

@@ -0,0 +1,12 @@
+package com.econo_4factorial.newproject.common.util.webSocket;
+
+public record WebSocketFailRes(
+        String status,
+        String errorCode,
+        String message
+){
+    public static WebSocketFailRes fail(String errorCode, String message) {
+        return new WebSocketFailRes("fail", errorCode, message);
+    }
+}
+

src/main/java/com/econo_4factorial/newproject/common/util/webSocket/WebSocketResponser.java

@@ -0,0 +1,37 @@
+package com.econo_4factorial.newproject.common.util.webSocket;
+
+import com.econo_4factorial.newproject.common.exception.ErrorType;
+import com.econo_4factorial.newproject.travel.TravelEvent;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+import java.io.IOException;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class WebSocketResponser {
+    private final ObjectMapper mapper;
+
+    public void success(WebSocketSession session, TravelEvent event, Object data) throws IOException {
+        WebSocketSuccessRes successResponse = WebSocketSuccessRes.ok(event, data);
+        String successResponseJson = mapper.writeValueAsString(successResponse);
+        session.sendMessage(new TextMessage(successResponseJson));
+        log.info("웹소켓 메세지 전송 성공 : session = {}. successResponseJson = {}", session.getId(), successResponseJson);
+    }
+
+    public void fail(WebSocketSession session, ErrorType errorType) throws IOException {
+        String errorCode = errorType.getErrorCode();
+        String errorMessage = errorType.getMessage();
+
+        WebSocketFailRes failResponse = WebSocketFailRes.fail(errorCode, errorMessage);
+        String failResponseJson = mapper.writeValueAsString(failResponse);
+        session.sendMessage(new TextMessage(failResponseJson));
+        log.info("웹소켓 메세지 전송 성공 : session = {}. failResponse = {}", session.getId(), failResponseJson);
+    }
+}

src/main/java/com/econo_4factorial/newproject/common/util/webSocket/WebSocketSuccessRes.java

@@ -0,0 +1,13 @@
+package com.econo_4factorial.newproject.common.util.webSocket;
+
+import com.econo_4factorial.newproject.travel.TravelEvent;
+
+public record WebSocketSuccessRes (
+        String event,
+        Object data,
+        String status
+){
+    public static WebSocketSuccessRes ok(TravelEvent event, Object data) {
+        return new WebSocketSuccessRes(event.getName(), data, "success");
+    }
+}

src/main/java/com/econo_4factorial/newproject/course/domain/Course.java

@@ -7,6 +7,7 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.locationtech.jts.geom.LineString;
 
 @Entity
 @Getter
@@ -24,6 +25,10 @@ public class Course {
     @JoinColumn(name = "peak_base_id", nullable = false)
     private Base peakBase;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "destination_base_id", nullable = false)
+    private Base destinationBase;
+
     @Column(nullable = false, unique = true)
     private String name;
 
@@ -41,4 +46,7 @@ public class Course {
 
     @Column(nullable = false)
     private String displayName;
+
+    @Column(columnDefinition = "LINESTRING SRID 4326")
+    private LineString coordinates;
 }

src/main/java/com/econo_4factorial/newproject/course/dto/ClosestCoordinateInfo.java

@@ -0,0 +1,10 @@
+package com.econo_4factorial.newproject.course.dto;
+
+import org.locationtech.jts.geom.Coordinate;
+
+public record ClosestCoordinateInfo(
+        Coordinate coordinate,
+        Integer index
+)
+{
+}

src/main/java/com/econo_4factorial/newproject/course/exception/CourseErrorType.java

@@ -6,7 +6,9 @@
 public enum CourseErrorType implements ErrorType {
     COURSE_NOT_FOUND_EXCEPTION ("COURSE404_001", HttpStatus.NOT_FOUND, "코스를 찾을 수 없습니다"),
 
-    BOOKMARK_NOT_FOUND_EXCEPTION ("BOOKMARK404_001", HttpStatus.NOT_FOUND, "코스 북마크를 찾을 수 없습니다");
+    BOOKMARK_NOT_FOUND_EXCEPTION ("BOOKMARK404_001", HttpStatus.NOT_FOUND, "코스 북마크를 찾을 수 없습니다"),
+
+    CLOSEST_COORDINATE_NOT_FOUND_EXCEPTION("TRAVEL500_001", HttpStatus.INTERNAL_SERVER_ERROR, "유저 좌표와 가장 가까운 pathway좌표가 없습니다");
 
     private final String errorCode;
     private final HttpStatus httpStatus;

src/main/java/com/econo_4factorial/newproject/course/exception/InternalServerException/ClosestCoordinateNotFoundException.java

@@ -0,0 +1,10 @@
+package com.econo_4factorial.newproject.course.exception.InternalServerException;
+
+import com.econo_4factorial.newproject.common.exception.InternalServerException;
+import com.econo_4factorial.newproject.course.exception.CourseErrorType;
+
+public class ClosestCoordinateNotFoundException extends InternalServerException {
+    public ClosestCoordinateNotFoundException() {
+        super(CourseErrorType.CLOSEST_COORDINATE_NOT_FOUND_EXCEPTION);
+    }
+}