Merge pull request #68 from prgrms-web-devcourse-final-project/refactor/map-api

지도 API 성능 개선을 위한 Geohash 기반 구조 리팩토링 및 Redis 캐싱 적용

Author: dnzp75

build.gradle.kts

@@ -37,6 +37,8 @@ dependencies {
 
     implementation ("org.antlr:antlr4-runtime:4.10.1")
 
+    implementation("ch.hsr:geohash:1.4.0")
+
 
     // PostgreSQL + PostGIS
     implementation("org.postgresql:postgresql:42.7.3") // 최신 버전 확인

src/main/java/com/example/log4u/common/config/RedisConfig.java

@@ -1,12 +1,21 @@
 package com.example.log4u.common.config;
 
+import java.util.List;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
+import com.example.log4u.domain.map.dto.response.DiaryClusterResponseDto;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import software.amazon.awssdk.thirdparty.jackson.core.type.TypeReference;
+
 @Configuration
 public class RedisConfig {
 
@@ -20,4 +29,19 @@ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connec
 
 		return template;
 	}
+
+	@Bean
+	public RedisTemplate<String, List<DiaryClusterResponseDto>> diaryClusterRedisTemplate(
+		RedisConnectionFactory connectionFactory,
+		ObjectMapper objectMapper
+	) {
+		RedisTemplate<String, List<DiaryClusterResponseDto>> template = new RedisTemplate<>();
+		template.setConnectionFactory(connectionFactory);
+		template.setKeySerializer(new StringRedisSerializer());
+
+		JavaType javaType = objectMapper.getTypeFactory().constructCollectionType(List.class, DiaryClusterResponseDto.class);
+		Jackson2JsonRedisSerializer<List<DiaryClusterResponseDto>> serializer = new Jackson2JsonRedisSerializer<>(objectMapper, javaType);
+		template.setValueSerializer(serializer);
+		return template;
+	}
 }

src/main/java/com/example/log4u/common/redis/ClusterCacheInitializer.java

@@ -0,0 +1,29 @@
+package com.example.log4u.domain.diary.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Builder
+@Table(name = "DiaryGeoHash")
+public class DiaryGeoHash {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+	private Long diaryId;
+
+	private String geohash;
+}

src/main/java/com/example/log4u/common/redis/RedisDao.java

@@ -13,6 +13,7 @@
 import com.example.log4u.domain.diary.dto.PopularDiaryDto;
 import com.example.log4u.domain.diary.entity.Diary;
 import com.example.log4u.domain.diary.service.DiaryService;
+import com.example.log4u.domain.diary.service.DiaryGeohashService;
 import com.example.log4u.domain.hashtag.service.HashtagService;
 import com.example.log4u.domain.like.service.LikeService;
 import com.example.log4u.domain.map.service.MapService;
@@ -33,6 +34,7 @@ public class DiaryFacade {
 	private final LikeService likeService;
 	private final HashtagService hashtagService;
 	private final UserService userService;
+	private final DiaryGeohashService diaryGeohashService;
 
 	/**
 	 * 다이어리 생성 use case
@@ -41,23 +43,30 @@ public class DiaryFacade {
 	 * 2. diaryService: 다이어리 생성<br>
 	 * 2. mediaService: 해당 다이어리의 이미지 저장<br>
 	 * 3. mapService: 해당 구역 카운트 증가
+	 * 4. diaryGeohashService: 해당 다이어리 위치가 포함되어있는 geoHash 문자열 저장
 	 * */
 	@Transactional
 	public void createDiary(Long userId, DiaryRequestDto request) {
 		String thumbnailUrl = mediaService.extractThumbnailUrl(request.mediaList());
 		Diary diary = diaryService.saveDiary(userId, request, thumbnailUrl);
 		mediaService.saveMedia(diary.getDiaryId(), request.mediaList());
 		hashtagService.saveOrUpdateHashtag(diary.getDiaryId(), request.hashtagList());
-		mapService.increaseRegionDiaryCount(request.location().latitude(), request.location().longitude());
+
+		double lat = request.location().latitude();
+		double lon = request.location().longitude();
+		mapService.increaseRegionDiaryCount(lat, lon);
+		diaryGeohashService.saveGeohash(diary.getDiaryId(), lat, lon);
 	}
 
 	/**
 	 * 다이어리 삭제 use case
 	 * <ul><li>호출 과정</li></ul>
 	 * 1. diaryService: 다이어리 검증
 	 * 2. mediaService: 해당 다이어리 이미지 삭제<br>
-	 * 3. diaryService: 다이어리 삭제<br>
-	 * 4. mapService: 해당 구역 카운트 감소
+	 * 3. mapService: 해당 구역 카운트 감소
+	 * 4. diaryGeohashService: 캐싱 되어있는 id, 데이터 삭제
+	 * 5. diaryService: 다이어리 삭제<br>
+	 *
 	 * */
 	@Transactional
 	public void deleteDiary(Long userId, Long diaryId) {
@@ -66,6 +75,7 @@ public void deleteDiary(Long userId, Long diaryId) {
 		hashtagService.deleteHashtagsByDiaryId(diaryId);
 		mapService.decreaseRegionDiaryCount(diary.getLocation().getLatitude(), diary.getLocation().getLongitude());
 
+		diaryGeohashService.deleteGeohashAndCache(diaryId);
 		diaryService.deleteDiary(diary);
 	}
 

src/main/java/com/example/log4u/domain/diary/entity/DiaryGeoHash.java

@@ -0,0 +1,18 @@
+package com.example.log4u.domain.diary.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import com.example.log4u.domain.diary.entity.DiaryGeoHash;
+
+import io.lettuce.core.dynamic.annotation.Param;
+
+public interface DiaryGeoHashRepository extends JpaRepository<DiaryGeoHash, Long> {
+
+	@Query("SELECT d.diaryId FROM DiaryGeoHash d WHERE d.geohash = :geohash")
+	List<Long> findDiaryIdByGeohash(@Param("geohash") String geohash);
+
+	DiaryGeoHash findByDiaryId(Long diaryId);
+}

src/main/java/com/example/log4u/domain/diary/facade/DiaryFacade.java

@@ -0,0 +1,46 @@
+package com.example.log4u.domain.diary.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.log4u.domain.diary.entity.DiaryGeoHash;
+import com.example.log4u.domain.diary.repository.DiaryGeoHashRepository;
+import com.example.log4u.domain.map.cache.dao.DiaryCacheDao;
+
+import ch.hsr.geohash.GeoHash;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class DiaryGeohashService {
+
+	private final DiaryGeoHashRepository diaryGeoHashRepository;
+	private final DiaryCacheDao diaryCacheDao;
+
+	@Transactional
+	public void saveGeohash(Long diaryId, double lat, double lon) {
+		String hash = GeoHash.withCharacterPrecision(lat, lon, 5).toBase32();
+		DiaryGeoHash diaryGeoHash = DiaryGeoHash.builder()
+			.diaryId(diaryId)
+			.geohash(hash)
+			.build();
+		diaryGeoHashRepository.save(diaryGeoHash);
+	}
+
+	@Transactional
+	public void deleteGeohashAndCache(Long diaryId) {
+		DiaryGeoHash geoHash = diaryGeoHashRepository.findByDiaryId(diaryId);
+		diaryCacheDao.evictDiaryIdFromCache(geoHash.getGeohash(), diaryId);
+		diaryCacheDao.evictDiaryFromCache(diaryId);
+
+		diaryGeoHashRepository.deleteById(diaryId);
+	}
+
+	public List<Long> getDiaryIdsByGeohash(String geohash) {
+		return diaryGeoHashRepository.findDiaryIdByGeohash(geohash);
+	}
+}

src/main/java/com/example/log4u/domain/diary/repository/DiaryGeoHashRepository.java

@@ -278,4 +278,8 @@ public void checkDiaryExists(Long diaryId) {
 	public List<Diary> getTop10Diaries() {
 		return diaryRepository.findTop10ByVisibilityOrderByLikeCountDesc(VisibilityType.PUBLIC);
 	}
+
+	public List<Diary> getDiaries(List<Long> ids) {
+		return diaryRepository.findAllById(ids);
+	}
 }

src/main/java/com/example/log4u/domain/diary/service/DiaryGeohashService.java

@@ -0,0 +1,21 @@
+package com.example.log4u.domain.map.cache;
+
+public class CacheKeyGenerator {
+
+	private static final String CLUSTER_CACHE_KEY_FORMAT = "cluster:geohash:%s:level:%d";
+	private static final String DIARY_KEY_PREFIX = "marker:diary:";
+	private static final String GEOHASH_ID_SET_PREFIX = "marker:ids:geohash:";
+
+	public static String clusterCacheKey(String geohash, int level) {
+		return String.format(CLUSTER_CACHE_KEY_FORMAT, geohash, level);
+	}
+
+	public static String diaryKey(Long diaryId) {
+		return DIARY_KEY_PREFIX + diaryId;
+	}
+
+	public static String diaryIdSetKey(String geohash) {
+		return GEOHASH_ID_SET_PREFIX + geohash;
+	}
+}
+