Merge pull request #17 from hykim02/main

학식 데이터, 캠퍼스별 식당 데이터 Cache 처리

Author: JangDongHo

build.gradle

@@ -41,6 +41,7 @@ jar {
 dependencies {
 	// 캐싱 redis 설정
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-cache'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 

src/main/java/com/example/Jinus/config/RedisCacheConfig.java

@@ -0,0 +1,63 @@
+package com.example.Jinus.config;
+
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+@EnableCaching
+public class RedisCacheManager {
+    @Bean
+    public CacheManager contentCacheManager(RedisConnectionFactory cf) {
+        Map<String, RedisCacheConfiguration> cacheConfigurations = new HashMap<>();
+
+        // 1. 식당 리스트 캐시 (불변 데이터, 7일 유지)
+        cacheConfigurations.put("cafeteriaList",
+                RedisCacheConfiguration.defaultCacheConfig()
+                        .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer())) // Key Serializer
+                        .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer())) // Value Serializer
+                        .entryTtl(Duration.ofDays(7)) // 7일 유지
+                        .disableCachingNullValues()); // null 캐싱 방지
+
+
+        // 2. 식단 데이터 캐시 (하루 단위로 갱신)
+        cacheConfigurations.put("dietList",
+                RedisCacheConfiguration.defaultCacheConfig()
+                        .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer())) // Key Serializer
+                        .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer())) // Value Serializer
+                        .entryTtl(Duration.ofHours(12)) // 12시간 유지
+                        .disableCachingNullValues());
+
+        // 3. 캠퍼스 이름별 캠퍼스 id 캐시 (불변 데이터, 7일 유지)
+        cacheConfigurations.put("campusName",
+                RedisCacheConfiguration.defaultCacheConfig()
+                        .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer())) // Key Serializer
+                        .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer())) // Value Serializer
+                        .entryTtl(Duration.ofDays(7)) // 7일 유지
+                        .disableCachingNullValues()); // null 캐싱 방지
+
+        // 3. 식당별 식당 id 캐시 (불변 데이터, 7일 유지)
+        cacheConfigurations.put("cafeteriaId",
+                RedisCacheConfiguration.defaultCacheConfig()
+                        .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer())) // Key Serializer
+                        .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer())) // Value Serializer
+                        .entryTtl(Duration.ofDays(7)) // 7일 유지
+                        .disableCachingNullValues()); // null 캐싱 방지
+
+
+        return org.springframework.data.redis.cache.RedisCacheManager.RedisCacheManagerBuilder
+                .fromConnectionFactory(cf)
+                .withInitialCacheConfigurations(cacheConfigurations) // 캐시별 설정 적용
+                .build();
+    }
+}

src/main/java/com/example/Jinus/config/RedisCacheManager.java

@@ -9,6 +9,7 @@
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 @Configuration
@@ -29,17 +30,22 @@ public class RedisConfig {
     public RedisConnectionFactory redisConnectionFactory() {
         RedisStandaloneConfiguration configuration = new RedisStandaloneConfiguration(host, port);
         configuration.setPassword(RedisPassword.of(password));
-
         return new LettuceConnectionFactory(configuration);
     }
 
-    // redis 데이터에 접근
+    // redis에 접근
     @Bean
     public RedisTemplate<String, Object> redisTemplate() {
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-        // spring-redis간 데이터 직렬화를 위해 설정, 설정하지 않아도 동작에 문제는 없음.
+
+        // key를 문자열로 저장
         redisTemplate.setKeySerializer(new StringRedisSerializer());
-        redisTemplate.setValueSerializer(new StringRedisSerializer());
+        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+
+        // value를 JSON 형태로 저장 (Integer도 가능)
+        redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+        redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
+
         redisTemplate.setConnectionFactory(redisConnectionFactory());
         return redisTemplate;
     }

src/main/java/com/example/Jinus/config/RedisConfig.java

@@ -3,14 +3,26 @@
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.BufferingClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
+import java.nio.charset.StandardCharsets;
+
 @Configuration
 public class RestTemplateConfig {
     @Bean
     public RestTemplate restTemplate(RestTemplateBuilder builder) {
         return builder
-                .defaultMessageConverters() // 기본 메시지 컨버터 설정
-                .build();
+                .requestFactory(
+                        () -> new BufferingClientHttpRequestFactory(
+                                new SimpleClientHttpRequestFactory()
+                        )
+                ).additionalMessageConverters(
+                        new StringHttpMessageConverter(
+                                StandardCharsets.UTF_8
+                        )
+                ).build();
     }
 }

src/main/java/com/example/Jinus/config/RestTemplateConfig.java

@@ -115,7 +115,7 @@ public String cafeteriaResponse(List<Object[]> cafeteriaList, String campusName)
         ComponentDto cardTypeDto = new ComponentDto(carouselComponent);
         outputs.add(cardTypeDto);
 
-        TemplateDto template = new TemplateDto(outputs);
+        TemplateDto template = new TemplateDto(outputs, null);
         ResponseDto responseDto = new ResponseDto("2.0", template);
 
         return JsonUtils.toJsonResponse(responseDto);
@@ -144,7 +144,7 @@ public String campusResponse(List<CampusEntity> campusList) {
         ComponentDto cardTypeDto = new ComponentDto(carouselComponent);
         outputs.add(cardTypeDto);
 
-        TemplateDto template = new TemplateDto(outputs);
+        TemplateDto template = new TemplateDto(outputs, null);
         ResponseDto responseDto = new ResponseDto("2.0", template);
 
         return JsonUtils.toJsonResponse(responseDto);

src/main/java/com/example/Jinus/controller/CafeteriaController.java

@@ -1,40 +1,22 @@
 package com.example.Jinus.controller.v2;
 
 import com.example.Jinus.dto.request.RequestDto;
-import com.example.Jinus.dto.response.*;
-import com.example.Jinus.entity.cafeteria.CampusEntity;
 import com.example.Jinus.service.v2.cafeteria.CafeteriaServiceV2;
-import com.example.Jinus.service.v2.cafeteria.CampusServiceV2;
 import com.example.Jinus.service.v2.userInfo.UserServiceV2;
-import com.example.Jinus.utility.JsonUtils;
-import com.example.Jinus.utility.ListCardResponse;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 @RestController
+@RequiredArgsConstructor
 @RequestMapping("/api/spring")
 public class CafeteriaControllerV2 {
 
     private final UserServiceV2 userServiceV2;
-    private final CampusServiceV2 campusServiceV2;
     private final CafeteriaServiceV2 cafeteriaServiceV2;
 
-    public CafeteriaControllerV2(
-            UserServiceV2 userServiceV2,
-            CampusServiceV2 campusServiceV2,
-            CafeteriaServiceV2 cafeteriaServiceV2) {
-        this.userServiceV2 = userServiceV2;
-        this.campusServiceV2 = campusServiceV2;
-        this.cafeteriaServiceV2 = cafeteriaServiceV2;
-    }
-
     // 사용자 존재 여부에 따라 응답
     @PostMapping("/v2/cafeteria")
     public String responseCafeteriaOrCampusListCard(@RequestBody RequestDto requestDto) {
@@ -45,4 +27,5 @@ public String responseCafeteriaOrCampusListCard(@RequestBody RequestDto requestD
 
         return cafeteriaServiceV2.campusOrCafeteria(campusId, sysCampusId);
     }
+
 }

src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java

@@ -18,4 +18,5 @@ public class DietControllerV2 {
     public String handleRequest(@RequestBody RequestDto requestDto) {
         return dietServiceV2.requestHandler(requestDto);
     }
+
 }

src/main/java/com/example/Jinus/controller/v2/DietControllerV2.java

@@ -0,0 +1,13 @@
+package com.example.Jinus.dto.data;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class CafeteriaDto {
+    private String cafeteriaNameKo;
+    private String thumbnailUrl;
+}

src/main/java/com/example/Jinus/dto/data/CafeteriaDto.java

@@ -0,0 +1,14 @@
+package com.example.Jinus.dto.data;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class DietDto {
+    private String dishCategory;
+    private String dishName;
+    private String dishType;
+}