Merge branch 'main' into main

Author: hykim02

src/main/java/com/example/Jinus/service/cafeteria/CacheService.java

@@ -55,10 +55,10 @@ private long calculateTtlUntilNextMidnight(Date dietDate) {
 
 
     // Redis에서 조회 (없으면 DB에서 가져옴)
-    @Cacheable(
-            value = "cafeteriaList",
-            key = "#p0",
-            cacheManager = "contentCacheManager")
+//    @Cacheable(
+//            value = "cafeteriaList",
+//            key = "#p0",
+//            cacheManager = "contentCacheManager")
     public List<CafeteriaDto> getCafeteriaList(int campusId) {
         return cafeteriaRepositoryV2.findCafeteriaListByCampusId(campusId);
     }

src/main/java/com/example/Jinus/service/cafeteria/CafeteriaQueryService.java

@@ -12,19 +12,19 @@
 public class CafeteriaQueryService {
     private final CafeteriaRepository cafeteriaRepositoryV2;
 
-    @Cacheable(
-            value = "cafeteriaId",
-            key = "#p0 + '::' + #p1",
-            unless = "#result == -1",
-            cacheManager = "contentCacheManager")
+//    @Cacheable(
+//            value = "cafeteriaId",
+//            key = "#p0 + '::' + #p1",
+//            unless = "#result == -1",
+//            cacheManager = "contentCacheManager")
     public int getCafeteriaId(String cafeteriaName, int campusId) {
         return cafeteriaRepositoryV2.findCafeteriaId(cafeteriaName, campusId).orElse(-1);
     }
 
-    @Cacheable(
-            value = "cafeteriaUrl",
-            key = "#p0",
-            cacheManager = "contentCacheManager")
+//    @Cacheable(
+//            value = "cafeteriaUrl",
+//            key = "#p0",
+//            cacheManager = "contentCacheManager")
     public String getImgUrl(int cafeteriaId) {
         return cafeteriaRepositoryV2.findImgUrlByCafeteriaId(cafeteriaId);
     }

src/main/java/com/example/Jinus/service/cafeteria/CampusService.java

@@ -15,10 +15,10 @@
 public class CampusService {
     private final CampusRepository campusRepositoryV2;
 
-    @Cacheable(
-            value = "campusId",
-            key = "#p0",
-            cacheManager = "contentCacheManager")
+//    @Cacheable(
+//            value = "campusId",
+//            key = "#p0",
+//            cacheManager = "contentCacheManager")
     // 사용자의 campusId 받아 캠퍼스 이름 찾기
     public String getUserCampusName(int campusId) {
         return campusRepositoryV2.findCampusNameByCampusId(campusId);
@@ -29,10 +29,10 @@ public List<CampusEntity> getCampusList() {
         return campusRepositoryV2.findCampusList();
     }
 
-    @Cacheable(
-            value = "campusName",
-            key = "#p0",
-            cacheManager = "contentCacheManager")
+//    @Cacheable(
+//            value = "campusName",
+//            key = "#p0",
+//            cacheManager = "contentCacheManager")
     // 캠퍼스 이름으로 id 찾기
     public int getCampusId(String campusName) {
         return campusRepositoryV2.findCampusIdByName(campusName);