Cacheable 주석 처리 (#33)

* [Fix]Test 코드 수정

* [Refactor]CafeteriaServiceV2 단일 책임 원칙 적용하여 클래스 분리

* Update Java CI-CD.yml

dependency submission code removed

* [Refactor]CampusServiceV2 클래스 분리

* [Refactor]DietServiceV2 서비스 클래스 분리

Author: hykim02

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

@@ -3,7 +3,10 @@
 import com.example.Jinus.dto.request.RequestDto;
 import com.example.Jinus.service.v2.cafeteria.CafeteriaServiceV2;
 import com.example.Jinus.service.v2.userInfo.UserServiceV2;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,5 +30,4 @@ public String responseCafeteriaOrCampusListCard(@RequestBody RequestDto requestD
 
         return cafeteriaServiceV2.campusOrCafeteria(userCampusId, sysCampusId);
     }
-
-}
+}

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

@@ -2,7 +2,9 @@
 
 import com.example.Jinus.dto.request.RequestDto;
 import com.example.Jinus.service.v2.cafeteria.DietServiceV2;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,6 +16,9 @@
 public class DietControllerV2 {
     private final DietServiceV2 dietServiceV2;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
     @PostMapping("/v2/dish")
     public String handleRequest(@RequestBody RequestDto requestDto) {
         return dietServiceV2.requestHandler(requestDto);

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

@@ -1,11 +1,12 @@
 package com.example.Jinus.controller.v2;
 
 import com.example.Jinus.dto.request.RequestDto;
-import com.example.Jinus.service.v2.notice.CategoryServiceV2;
 import com.example.Jinus.service.v2.notice.NoticeServiceV2;
 import com.example.Jinus.service.v2.userInfo.DepartmentServiceV2;
 import com.example.Jinus.service.v2.userInfo.UserServiceV2;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +20,8 @@ public class NoticeControllerV2 {
     private final NoticeServiceV2 noticeServiceV2;
     private final DepartmentServiceV2 departmentServiceV2;
     private final UserServiceV2 userServiceV2;
+    @Autowired
+    private ObjectMapper objectMapper;
 
     // 학교 공지사항 조회
     @PostMapping("/v2/main-notice")
@@ -32,6 +35,7 @@ public String getMainNotice() {
     @PostMapping("/v2/department-notice")
     public String responseDepartmentNotice(@RequestBody RequestDto requestDto) {
         String userId = requestDto.getUserRequest().getUser().getId();
+
         int departmentId = userServiceV2.getUserDepartmentId(userId);
         // 학과 영문명 찾기
         String departmentEng = departmentServiceV2.getDepartmentEng(departmentId);

src/main/java/com/example/Jinus/service/v2/cafeteria/CacheServiceV2.java

@@ -18,12 +18,12 @@ public class CacheServiceV2 {
     private final DietRepositoryV2 dietRepositoryV2;
     private final CafeteriaRepositoryV2 cafeteriaRepositoryV2;
 
-    @Cacheable(
-            value = "dietList",
-            key = "#parameters.dietDate + '::' + #parameters.period + '::' + #cafeteriaId",
-            unless = "#result == null || #result.isEmpty()",
-            cacheManager = "contentCacheManager"
-    )
+//    @Cacheable(
+//            value = "dietList",
+//            key = "#parameters?.dietDate?.toString() + '::' + #parameters?.period + '::' + #cafeteriaId",
+//            unless = "#result == null || #result.isEmpty()",
+//            cacheManager = "contentCacheManager"
+//    )
     // 식단 데이터 가져오기
     public List<DietDto> getDietList(HandleRequestDto parameters, int cafeteriaId) {
         // 오늘, 내일 문자열로 날짜 설정하기
@@ -34,7 +34,7 @@ public List<DietDto> getDietList(HandleRequestDto parameters, int cafeteriaId) {
 
 
     // Redis에서 조회 (없으면 DB에서 가져옴)
-    @Cacheable(value = "cafeteriaList", key = "#campusId", cacheManager = "contentCacheManager")
+//    @Cacheable(value = "cafeteriaList", key = "#campusId", cacheManager = "contentCacheManager")
     public List<CafeteriaDto> getCafeteriaList(int campusId) {
         return cafeteriaRepositoryV2.findCafeteriaListByCampusId(campusId);
     }

src/main/java/com/example/Jinus/service/v2/cafeteria/DietServiceV2.java

@@ -20,8 +20,8 @@
 public class DietServiceV2 {
 
     private final CampusServiceV2 campusServiceV2;
-    private final CafeteriaQueryServiceV2 queryServiceV2;
-    private final DietParameterServiceV2 parameterServiceV2;
+    private final CafeteriaQueryServiceV2 cafeteriaQueryServiceV2;
+    private final DietParameterServiceV2 dietParameterServiceV2;
     private final DietResponseServiceV2 dietResponseServiceV2;
     private final DietQueryServiceV2 dietQueryServiceV2;
 
@@ -31,15 +31,15 @@ public String requestHandler(RequestDto requestDto) {
         // 현재 시간 파악
         LocalTime time = getCurrentTime();
         // 사용자 발화에서 파라미터 추출 및 객체 생성
-        HandleRequestDto parameters = parameterServiceV2.setParameters(kakaoId, time, requestDto);
+        HandleRequestDto parameters = dietParameterServiceV2.setParameters(kakaoId, time, requestDto);
 
         return checkIsCafeteriaInCampus(parameters);
     }
 
     // 식당 존재 여부에 따른 메뉴 조회 로직
     private String checkIsCafeteriaInCampus(HandleRequestDto parameters) {
         int campusId = campusServiceV2.getCampusId(parameters.getCampusName());
-        int cafeteriaId = queryServiceV2.getCafeteriaId(parameters.getCafeteriaName(), campusId);
+        int cafeteriaId = cafeteriaQueryServiceV2.getCafeteriaId(parameters.getCafeteriaName(), campusId);
 
         // 캠퍼스에 식당이 존재하지 않는 경우
         if (cafeteriaId == -1) {
@@ -54,7 +54,7 @@ private String checkIsCafeteriaInCampus(HandleRequestDto parameters) {
     // 응답 내용 생성
     private String makeContents(HandleRequestDto parameters, int cafeteriaId, String diets) {
         // 식당 img 찾기
-        String imgUrl = queryServiceV2.getImgUrl(cafeteriaId);
+        String imgUrl = cafeteriaQueryServiceV2.getImgUrl(cafeteriaId);
 
         // title 데이터 연결
         String title = "\uD83C\uDF71 " +

src/main/java/com/example/Jinus/utility/JsonUtils.java

@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class JsonUtils {
-    private static final ObjectMapper objectMapper = new ObjectMapper();
+    public static final ObjectMapper objectMapper = new ObjectMapper();
 
     static {
         // null 값 무시 설정