Merge pull request #69 from prgrms-web-devcourse-final-project/refactor/map-cluster-marker

Redis 캐싱 구조 리팩토링

Author: dnzp75

.github/workflows/dev-build.yml

@@ -35,21 +35,26 @@ jobs:
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
-      - name: S3에서 init.sql 다운로드
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
-        run: |
-          mkdir -p docker
-          aws s3 cp s3://devcos4-team08-bucket/db/init.sql ./docker/init.sql
+#      - name: S3에서 init.sql 다운로드
+#        env:
+#          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+#          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+#          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+#        run: |
+#          mkdir -p docker
+#          aws s3 cp s3://devcos4-team08-bucket/db/init.sql ./docker/init.sql
 
 
       - name: Docker Compose 설치
         run: |
           sudo curl -L "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
           sudo chmod +x /usr/local/bin/docker-compose
 
+      - name: CI용 빈 init.sql 생성
+        run: |
+          mkdir -p docker
+          touch docker/init.sql
+
       - name: Docker Compose 실행
         run: |
           chmod -R 755 ./docker
@@ -85,6 +90,7 @@ jobs:
           fi
 
       - name: Test and analyze
+        if: github.event_name != 'pull_request' 
         env:
           #GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -95,7 +101,7 @@ jobs:
           NAVER_DEV_CLIENT_SECRET: ${{ secrets.NAVER_DEV_CLIENT_SECRET }}
           NAVER_DEV_REDIRECT_URI: ${{ secrets.NAVER_DEV_REDIRECT_URI }}
           GOOGLE_DEV_CLIENT_ID: ${{ secrets.GOOGLE_DEV_CLIENT_ID }}
-          GOOGLE_DEV_CLIENT_SECRET: ${{ secrets.GOOGLE_DEV_CLIENT_SECRET }}r
+          GOOGLE_DEV_CLIENT_SECRET: ${{ secrets.GOOGLE_DEV_CLIENT_SECRET }}
           GOOGLE_DEV_REDIRECT_URI: ${{ secrets.GOOGLE_DEV_REDIRECT_URI }}
           KAKAO_DEV_CLIENT_ID: ${{ secrets.KAKAO_DEV_CLIENT_ID }}
           KAKAO_DEV_CLIENT_SECRET: ${{ secrets.KAKAO_DEV_CLIENT_SECRET }}

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

@@ -0,0 +1,38 @@
+package com.example.log4u.common.config.redis;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
+
+public class ObjectMapperFactory {
+
+    public static ObjectMapper objectMapper = new ObjectMapper()
+            .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
+            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            .registerModule(new JavaTimeModule())
+            .registerModule(new ParameterNamesModule())
+            .registerModule(new Jdk8Module());
+
+    public static String writeValueAsString(Object value) {
+        try {
+            return objectMapper.writeValueAsString(value);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static <T> T readValue(String value, TypeReference<T> typeReference) {
+        try {
+            return objectMapper.readValue(value, typeReference);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

src/main/java/com/example/log4u/common/config/redis/ObjectMapperFactory.java

@@ -0,0 +1,34 @@
+package com.example.log4u.common.config.redis;
+
+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.StringRedisSerializer;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+import lombok.RequiredArgsConstructor;
+
+@Configuration
+@RequiredArgsConstructor
+public class RedisConfig {
+
+	private final RedisConnectionFactory redisConnectionFactory;
+
+	@Bean
+	public RedisTemplate<String, String> redisTemplate() {
+		RedisTemplate<String, String> template = new RedisTemplate<>();
+		template.setConnectionFactory(redisConnectionFactory);
+		template.setKeySerializer(new StringRedisSerializer());
+		template.setValueSerializer(new StringRedisSerializer());
+		return template;
+	}
+
+	@Bean
+	public ObjectMapper objectMapper() {
+		return ObjectMapperFactory.objectMapper;
+	}
+}

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

@@ -0,0 +1,12 @@
+package com.example.log4u.common.infra.cache;
+
+import java.time.Duration;
+
+public interface CacheManager {
+
+    void cache(String key, String value, Duration ttl);
+
+    String get(String key);
+
+    void evict(String key);
+}

src/main/java/com/example/log4u/common/infra/cache/CacheManager.java

@@ -0,0 +1,30 @@
+package com.example.log4u.common.infra.cache;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Objects;
+
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class RedisCacheManagerImpl implements CacheManager {
+
+    private final RedisTemplate<String, String> redisTemplate;
+
+    public void cache(String key, String value, Duration ttl) {
+        redisTemplate.opsForValue().set(key, value, ttl);
+    }
+
+    public String get(String key) {
+        return redisTemplate.opsForValue().get(key);
+    }
+
+    public void evict(String key) {
+        redisTemplate.delete(key);
+    }
+}

src/main/java/com/example/log4u/common/infra/cache/RedisCacheManagerImpl.java

@@ -38,10 +38,9 @@ public class DiaryFacade {
 
 	/**
 	 * 다이어리 생성 use case
-	 * <ul><li>호출 과정</li></ul>
-	 * 1. mediaService: 섬네일 이미지 url 생성<br>
-	 * 2. diaryService: 다이어리 생성<br>
-	 * 2. mediaService: 해당 다이어리의 이미지 저장<br>
+	 * 1. mediaService: 섬네일 이미지 url 생성
+	 * 2. diaryService: 다이어리 생성
+	 * 2. mediaService: 해당 다이어리의 이미지 저장
 	 * 3. mapService: 해당 구역 카운트 증가
 	 * 4. diaryGeohashService: 해당 다이어리 위치가 포함되어있는 geoHash 문자열 저장
 	 * */
@@ -60,30 +59,29 @@ public void createDiary(Long userId, DiaryRequestDto request) {
 
 	/**
 	 * 다이어리 삭제 use case
-	 * <ul><li>호출 과정</li></ul>
 	 * 1. diaryService: 다이어리 검증
-	 * 2. mediaService: 해당 다이어리 이미지 삭제<br>
-	 * 3. mapService: 해당 구역 카운트 감소
-	 * 4. diaryGeohashService: 캐싱 되어있는 id, 데이터 삭제
-	 * 5. diaryService: 다이어리 삭제<br>
-	 *
+	 * 2. mediaService: 해당 다이어리 이미지 삭제
+	 * 3. mapService: 시/도, 시/군/구 지역 다이어리 개수 감소 및 클러스터 캐싱 키 삭제
+	 * 4. diaryGeohashService: 다이어리 Goehash 문자열 및 마커 캐싱 키 삭제
+	 * 5. diaryService: 다이어리 삭제
 	 * */
 	@Transactional
 	public void deleteDiary(Long userId, Long diaryId) {
 		Diary diary = diaryService.getDiaryAfterValidateOwnership(diaryId, userId);
 		mediaService.deleteMediaByDiaryId(diaryId);
 		hashtagService.deleteHashtagsByDiaryId(diaryId);
-		mapService.decreaseRegionDiaryCount(diary.getLocation().getLatitude(), diary.getLocation().getLongitude());
 
-		diaryGeohashService.deleteGeohashAndCache(diaryId);
+		double lat = diary.getLocation().getLatitude();
+		double lon = diary.getLocation().getLongitude();
+		mapService.decreaseRegionDiaryCount(lat, lon);
+		diaryGeohashService.deleteGeohash(diaryId);
 		diaryService.deleteDiary(diary);
 	}
 
 	/**
 	 * 다이어리 수정 use case
-	 * <ul><li>호출 과정</li></ul>
-	 * 1. diaryService: 다이어리 검증<br>
-	 * 2. mediaService: 해당 다이어리 이미지 삭제<br>
+	 * 1. diaryService: 다이어리 검증
+	 * 2. mediaService: 해당 다이어리 이미지 삭제
 	 * 3. diaryService: 다이어리 수정
 	 * 4. mapService: 해당 구역 카운트 감소
 	 * 5. mapService: 해당 구역 카운트 증가
@@ -93,10 +91,13 @@ public void updateDiary(Long userId, Long diaryId, DiaryRequestDto request) {
 		Diary diary = diaryService.getDiaryAfterValidateOwnership(diaryId, userId);
 		mediaService.updateMediaByDiaryId(diary.getDiaryId(), request.mediaList());
 		hashtagService.saveOrUpdateHashtag(diary.getDiaryId(), request.hashtagList());
-		mapService.decreaseRegionDiaryCount(diary.getLocation().getLatitude(), diary.getLocation().getLongitude());
-		mapService.increaseRegionDiaryCount(request.location().latitude(), request.location().longitude());
-
 		String newThumbnailUrl = mediaService.extractThumbnailUrl(request.mediaList());
+
+		double oldLat = diary.getLocation().getLatitude();
+		double oldLon = diary.getLocation().getLongitude();
+		double newLat = request.location().latitude();
+		double newLon = request.location().longitude();
+		mapService.updateRegionDiaryCount(oldLat, oldLon, newLat, newLon);
 		diaryService.updateDiary(diary, request, newThumbnailUrl);
 	}
 

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

@@ -15,4 +15,14 @@ public interface DiaryGeoHashRepository extends JpaRepository<DiaryGeoHash, Long
 	List<Long> findDiaryIdByGeohash(@Param("geohash") String geohash);
 
 	DiaryGeoHash findByDiaryId(Long diaryId);
+
+	@Query(value = """
+		SELECT g.*
+		FROM diarygeohash g
+		JOIN diary d ON d.diaryId = g.diaryId
+		WHERE d.latitude = :lat
+		  AND d.longitude = :lon
+		""",
+		nativeQuery = true)
+	DiaryGeoHash findByLatLon(@Param("lat") double lat, @Param("lon") double lon);
 }

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

@@ -7,7 +7,7 @@
 
 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 com.example.log4u.domain.map.cache.dao.MarkerCacheDao;
 
 import ch.hsr.geohash.GeoHash;
 import lombok.RequiredArgsConstructor;
@@ -19,7 +19,7 @@
 public class DiaryGeohashService {
 
 	private final DiaryGeoHashRepository diaryGeoHashRepository;
-	private final DiaryCacheDao diaryCacheDao;
+	private final MarkerCacheDao markerCacheDao;
 
 	@Transactional
 	public void saveGeohash(Long diaryId, double lat, double lon) {
@@ -32,15 +32,17 @@ public void saveGeohash(Long diaryId, double lat, double lon) {
 	}
 
 	@Transactional
-	public void deleteGeohashAndCache(Long diaryId) {
+	public void deleteGeohash(Long diaryId) {
 		DiaryGeoHash geoHash = diaryGeoHashRepository.findByDiaryId(diaryId);
-		diaryCacheDao.evictDiaryIdFromCache(geoHash.getGeohash(), diaryId);
-		diaryCacheDao.evictDiaryFromCache(diaryId);
-
+		markerCacheDao.evict(geoHash.getGeohash());
 		diaryGeoHashRepository.deleteById(diaryId);
 	}
 
 	public List<Long> getDiaryIdsByGeohash(String geohash) {
 		return diaryGeoHashRepository.findDiaryIdByGeohash(geohash);
 	}
+
+	public DiaryGeoHash getGeohashByLatLon(double lat, double lon) {
+		return diaryGeoHashRepository.findByLatLon(lat, lon);
+	}
 }

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

@@ -2,20 +2,14 @@
 
 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:";
+	private static final String CLUSTER_CACHE_KEY = "cluster:geohash:%s:level:%d";
+	private static final String MARKER_CACHE_KEY = "marker:geohash:";
 
 	public static String clusterCacheKey(String geohash, int level) {
-		return String.format(CLUSTER_CACHE_KEY_FORMAT, geohash, level);
+		return String.format(CLUSTER_CACHE_KEY, 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;
+	public static String markerCacheKey(String geohash) {
+		return MARKER_CACHE_KEY + geohash;
 	}
 }
-