Merge pull request #23 from dev-DDIP/Feat/issue-#21

Feat: S2 기반 위치 관리 기능 구현

Author: Dockerel

build.gradle

@@ -22,6 +22,7 @@ configurations {
 
 repositories {
 	mavenCentral()
+	maven { url 'https://jitpack.io' }
 }
 
 dependencies {
@@ -41,6 +42,7 @@ dependencies {
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 	implementation 'org.springframework.session:spring-session-data-redis'
+	implementation 'org.redisson:redisson-spring-boot-starter:3.23.1'
 
 	// Lombok
 	compileOnly 'org.projectlombok:lombok'
@@ -60,10 +62,13 @@ dependencies {
 	implementation 'dev.langchain4j:langchain4j:1.0.0-beta1'
 	implementation 'dev.langchain4j:langchain4j-google-ai-gemini:1.0.0-beta1'
 
+	// S2
+	implementation 'com.github.google:s2-geometry-library-java:2.0.0'
+
 	// etc
 	implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.7.0'
 	implementation 'net.javacrumbs.shedlock:shedlock-spring:5.1.0'
-	implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:5.1.0'
+	implementation 'net.javacrumbs.shedlock:shedlock-provider-redis-spring:5.1.0'
 }
 
 tasks.named('test') {

src/main/java/com/knu/ddip/common/config/RedissonConfig.java

@@ -0,0 +1,36 @@
+package com.knu.ddip.common.config;
+
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Profile("!test")
+@Configuration
+public class RedissonConfig {
+
+    @Value("${REDIS_HOST}")
+    private String host;
+
+    @Value("${REDIS_PORT}")
+    private int port;
+
+    @Value("${REDIS_PASSWORD}")
+    private String password;
+
+    @Bean
+    public RedissonClient redissonClient() {
+        Config config = new Config();
+
+        config.useSingleServer()
+                .setAddress("redis://" + host + ":" + port)
+                .setPassword(password)
+                .setConnectionPoolSize(10)
+                .setConnectionMinimumIdleSize(1);
+
+        return Redisson.create(config);
+    }
+}

src/main/java/com/knu/ddip/common/config/ScheduleConfig.java

@@ -0,0 +1,19 @@
+package com.knu.ddip.common.config;
+
+import net.javacrumbs.shedlock.core.LockProvider;
+import net.javacrumbs.shedlock.provider.redis.spring.RedisLockProvider;
+import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@EnableScheduling
+@Configuration
+@EnableSchedulerLock(defaultLockAtLeastFor = "30s", defaultLockAtMostFor = "1m")
+public class ScheduleConfig {
+    @Bean
+    public LockProvider lockProvider(RedisConnectionFactory redisConnectionFactory) {
+        return new RedisLockProvider(redisConnectionFactory);
+    }
+}

src/main/java/com/knu/ddip/common/exception/GlobalExceptionHandler.java

@@ -1,6 +1,7 @@
 package com.knu.ddip.common.exception;
 
 import com.knu.ddip.auth.exception.*;
+import com.knu.ddip.location.exception.LocationNotFoundException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ProblemDetail;
@@ -67,4 +68,12 @@ public ResponseEntity<ProblemDetail> handleTokenStolenException(TokenStolenExcep
         return ResponseEntity.status(HttpStatusCode.valueOf(462)).body(problemDetail);
     }
 
+    @ExceptionHandler(LocationNotFoundException.class)
+    public ResponseEntity<ProblemDetail> handleLocationNotFoundException(LocationNotFoundException e) {
+
+        ProblemDetail problemDetail = ProblemDetail.forStatusAndDetail(HttpStatus.NOT_FOUND, e.getMessage());
+        problemDetail.setTitle("Location Not Found");
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(problemDetail);
+    }
+
 }

src/main/java/com/knu/ddip/location/application/dto/UpdateMyLocationRequest.java

@@ -0,0 +1,13 @@
+package com.knu.ddip.location.application.dto;
+
+import lombok.Builder;
+
+@Builder
+public record UpdateMyLocationRequest(
+        double lat,
+        double lng
+) {
+    public static UpdateMyLocationRequest of(double lat, double lng) {
+        return new UpdateMyLocationRequest(lat, lng);
+    }
+}

src/main/java/com/knu/ddip/location/application/init/GeoJsonInitializer.java

@@ -0,0 +1,25 @@
+package com.knu.ddip.location.application.init;
+
+import com.knu.ddip.location.application.service.LocationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class GeoJsonInitializer implements ApplicationRunner {
+
+    public static final String GEOJSON_INIT_LOCK_KEY = "lock:geojson:init";
+
+    private final OneTimeRunner oneTimeRunner;
+    private final LocationService locationService;
+
+    @Override
+    public void run(ApplicationArguments args) {
+        oneTimeRunner.runOnce(
+                GEOJSON_INIT_LOCK_KEY,
+                () -> locationService.loadAndSaveGeoJsonFeatures()
+        );
+    }
+}

src/main/java/com/knu/ddip/location/application/init/OneTimeRunner.java

@@ -0,0 +1,6 @@
+package com.knu.ddip.location.application.init;
+
+public interface OneTimeRunner {
+    void runOnce(String lockName, Runnable task);
+}
+

src/main/java/com/knu/ddip/location/application/scheduler/LocationScheduler.java

@@ -0,0 +1,26 @@
+package com.knu.ddip.location.application.scheduler;
+
+import com.knu.ddip.location.application.service.LocationWriter;
+import lombok.RequiredArgsConstructor;
+import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class LocationScheduler {
+
+    private final LocationWriter locationWriter;
+
+    @SchedulerLock(
+            name = "cleanup_locations_lock",
+            lockAtLeastFor = "30s",
+            lockAtMostFor = "5m"
+    )
+    @Scheduled(cron = "0 0 * * * *") // 매 정시
+    public void cleanupExpiredUserLocations() {
+        long now = System.currentTimeMillis();
+        locationWriter.cleanupExpiredUserLocations(now);
+    }
+
+}

src/main/java/com/knu/ddip/location/application/service/LocationReader.java

@@ -0,0 +1,13 @@
+package com.knu.ddip.location.application.service;
+
+import java.util.List;
+
+public interface LocationReader {
+    void validateLocationByCellId(String cellId);
+
+    List<String> findAllLocationsByCellIdIn(List<String> cellIds);
+
+    List<String> findUserIdsByCellIds(List<String> targetCellIds);
+
+    boolean isCellIdNotInTargetArea(String cellId);
+}

src/main/java/com/knu/ddip/location/application/service/LocationService.java

@@ -0,0 +1,135 @@
+package com.knu.ddip.location.application.service;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.geometry.S2CellId;
+import com.knu.ddip.location.application.dto.UpdateMyLocationRequest;
+import com.knu.ddip.location.application.util.S2Converter;
+import com.knu.ddip.location.application.util.UuidBase64Utils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+@Slf4j
+@Service
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+public class LocationService {
+
+    private final LocationReader locationReader;
+    private final LocationWriter locationWriter;
+
+    private final ObjectMapper objectMapper;
+
+    public static final int LEVEL = 17;
+    public static final String KNU_GEOJSON_FEATURE_FILENAME = "geojson/cells.geojson";
+
+    // KNU GeoJSON 파일을 읽어서 각 Feature를 DB에 저장
+    @Transactional
+    public void loadAndSaveGeoJsonFeatures() {
+        // GeoJson 파일 읽기
+        String geoJsonContent = getGeoJsonContent();
+
+        try {
+            // 기존 데이터 삭제
+            locationWriter.deleteAll();
+
+            // JSON 파싱
+            JsonNode rootNode = objectMapper.readTree(geoJsonContent);
+            JsonNode featuresNode = rootNode.get("features");
+            List<String> cellIds = StreamSupport.stream(featuresNode.spliterator(), false)
+                    .map(featureNode -> featureNode.get("properties").get("id").asText())
+                    .collect(Collectors.toList());
+
+            locationWriter.saveAll(cellIds);
+
+            log.info("총 {}개의 S2Cell Feature가 저장되었습니다.", cellIds.size());
+        } catch (IOException e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+        }
+    }
+
+    public void saveUserLocationAtomic(UUID userId, UpdateMyLocationRequest request) {
+        S2CellId cellIdObj = S2Converter.toCellId(request.lat(), request.lng(), LEVEL);
+        String cellId = cellIdObj.toToken();
+
+        // 경북대 내부에 위치하는지 확인
+        boolean cellIdNotInTargetArea = locationReader.isCellIdNotInTargetArea(cellId);
+
+        String encodedUserId = UuidBase64Utils.uuidToBase64String(userId);
+
+        locationWriter.saveUserIdByCellIdAtomic(cellId, cellIdNotInTargetArea, encodedUserId);
+    }
+
+    // 요청 전송 시 이웃 userIds 조회
+    public List<UUID> getNeighborRecipientUserIds(UUID myUserId, double lat, double lng) {
+        S2CellId cellIdObj = S2Converter.toCellId(lat, lng, LEVEL);
+        String cellId = cellIdObj.toToken();
+
+        // 경북대 내부에 위치하는지 확인
+        locationReader.validateLocationByCellId(cellId);
+
+        // 이웃 cellIds 가져오기
+        List<S2CellId> neighbors = new ArrayList<>();
+        cellIdObj.getAllNeighbors(LEVEL, neighbors);
+        List<String> neighborCellIds = neighbors.stream()
+                .map(S2CellId::toToken)
+                .collect(Collectors.toList());
+
+        // 경북대 내부에 위치하는 이웃 cellIds만 가져오기
+        List<String> targetCellIds = locationReader.findAllLocationsByCellIdIn(neighborCellIds);
+        targetCellIds.add(cellId);
+
+        // targetCellId의 userIds만 가져오기
+
+        List<UUID> userIds = locationReader.findUserIdsByCellIds(targetCellIds).stream()
+                .map(UuidBase64Utils::base64StringToUuid)
+                .filter(userId -> !userId.equals(myUserId))
+                .collect(Collectors.toList());
+
+        return userIds;
+    }
+
+    // 초기 화면에서 인접한 요청 가져오기 (현재는 인접한 cellId 가져오는 것만 구현)
+    public List<String> getNeighborCellIds(double lat, double lng) {
+        S2CellId cellIdObj = S2Converter.toCellId(lat, lng, LEVEL);
+        String cellId = cellIdObj.toToken();
+
+        // 경북대 내부에 위치하는지 확인
+        locationReader.validateLocationByCellId(cellId);
+
+        // 이웃 cellIds 가져오기
+        List<S2CellId> neighbors = new ArrayList<>();
+        cellIdObj.getAllNeighbors(LEVEL, neighbors);
+        List<String> neighborCellIds = neighbors.stream()
+                .map(S2CellId::toToken)
+                .collect(Collectors.toList());
+
+        // 경북대 내부에 위치하는 이웃 cellIds만 가져오기
+        List<String> targetCellIds = locationReader.findAllLocationsByCellIdIn(neighborCellIds);
+        targetCellIds.add(cellId);
+
+        return targetCellIds;
+    }
+
+    private String getGeoJsonContent() {
+        ClassPathResource resource = new ClassPathResource(KNU_GEOJSON_FEATURE_FILENAME);
+        try (InputStream is = resource.getInputStream()) {
+            return new String(is.readAllBytes(), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}