V2 파일명 수정

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

@@ -1,12 +1,9 @@
-package com.example.Jinus.controller.v2;
+package com.example.Jinus.controller;
 
 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 com.example.Jinus.service.cafeteria.CafeteriaService;
+import com.example.Jinus.service.userInfo.UserService;
 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;
@@ -15,10 +12,10 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/spring")
-public class CafeteriaControllerV2 {
+public class CafeteriaController {
 
-    private final UserServiceV2 userServiceV2;
-    private final CafeteriaServiceV2 cafeteriaServiceV2;
+    private final UserService userServiceV2;
+    private final CafeteriaService cafeteriaServiceV2;
 
     // 사용자 존재 여부에 따라 응답
     @PostMapping("/v2/cafeteria")

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

@@ -1,7 +1,7 @@
-package com.example.Jinus.controller.v2;
+package com.example.Jinus.controller;
 
 import com.example.Jinus.dto.request.RequestDto;
-import com.example.Jinus.service.v2.cafeteria.DietServiceV2;
+import com.example.Jinus.service.diet.DietService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,8 +11,8 @@
 @RestController
 @RequestMapping("/api/spring")
 @RequiredArgsConstructor
-public class DietControllerV2 {
-    private final DietServiceV2 dietServiceV2;
+public class DietController {
+    private final DietService dietServiceV2;
 
     @PostMapping("/v2/dish")
     public String handleRequest(@RequestBody RequestDto requestDto) {

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

@@ -1,9 +1,9 @@
-package com.example.Jinus.controller.v2;
+package com.example.Jinus.controller;
 
 import com.example.Jinus.dto.request.RequestDto;
-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.example.Jinus.service.notice.NoticeService;
+import com.example.Jinus.service.userInfo.DepartmentService;
+import com.example.Jinus.service.userInfo.UserService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,11 +15,11 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/spring")
-public class NoticeControllerV2 {
+public class NoticeController {
 
-    private final NoticeServiceV2 noticeServiceV2;
-    private final DepartmentServiceV2 departmentServiceV2;
-    private final UserServiceV2 userServiceV2;
+    private final NoticeService noticeServiceV2;
+    private final DepartmentService departmentServiceV2;
+    private final UserService userServiceV2;
     @Autowired
     private ObjectMapper objectMapper;
 

src/main/java/com/example/Jinus/repository/v2/cafeteria/CafeteriaRepositoryV2.java → src/main/java/com/example/Jinus/repository/cafeteria/CafeteriaRepository.java

@@ -1,16 +1,15 @@
-package com.example.Jinus.repository.v2.cafeteria;
+package com.example.Jinus.repository.cafeteria;
 
 import com.example.Jinus.dto.data.CafeteriaDto;
 import com.example.Jinus.entity.cafeteria.CafeteriaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 
-public interface CafeteriaRepositoryV2 extends JpaRepository<CafeteriaEntity, Integer> {
+public interface CafeteriaRepository extends JpaRepository<CafeteriaEntity, Integer> {
     // 사용자 campusId와 동일한 식당이름과 url 찾기
     @Query(
             "SELECT new com.example.Jinus.dto.data.CafeteriaDto(c.cafeteriaNameKo, c.thumbnailUrl) " +

src/main/java/com/example/Jinus/repository/v2/cafeteria/CampusRepositoryV2.java → src/main/java/com/example/Jinus/repository/cafeteria/CampusRepository.java

@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.cafeteria;
+package com.example.Jinus.repository.cafeteria;
 
 import com.example.Jinus.entity.cafeteria.CampusEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,7 +9,7 @@
 import java.util.List;
 
 @Repository
-public interface CampusRepositoryV2 extends JpaRepository<CampusEntity, Integer> {
+public interface CampusRepository extends JpaRepository<CampusEntity, Integer> {
     // 사용자 campusId로 캠퍼스 이름 찾기
     @Query("SELECT c.campusNameKo FROM CampusEntity c WHERE c.id = :campusId")
     String findCampusNameByCampusId(@Param("campusId") int campusId);

src/main/java/com/example/Jinus/repository/v2/cafeteria/DietRepositoryV2.java → src/main/java/com/example/Jinus/repository/cafeteria/DietRepository.java

@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.cafeteria;
+package com.example.Jinus.repository.cafeteria;
 
 import com.example.Jinus.dto.data.DietDto;
 import com.example.Jinus.entity.cafeteria.CafeteriaDietEntity;
@@ -11,7 +11,7 @@
 import java.util.List;
 
 @Repository
-public interface DietRepositoryV2 extends JpaRepository<CafeteriaDietEntity, Integer> {
+public interface DietRepository extends JpaRepository<CafeteriaDietEntity, Integer> {
     @Query("SELECT new com.example.Jinus.dto.data.DietDto(c.dishCategory, c.dishName, c.dishType) " +
             "FROM CafeteriaDietEntity c " +
             "WHERE c.dietDate = :dietDate " +

src/main/java/com/example/Jinus/repository/v2/notice/CategoryRepositoryV2.java → src/main/java/com/example/Jinus/repository/notice/CategoryRepository.java

@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.notice;
+package com.example.Jinus.repository.notice;
 
 import com.example.Jinus.entity.notice.NoticeCategoryEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,7 +7,7 @@
 
 import java.util.List;
 
-public interface CategoryRepositoryV2 extends JpaRepository<NoticeCategoryEntity, Integer> {
+public interface CategoryRepository extends JpaRepository<NoticeCategoryEntity, Integer> {
     @Query("SELECT n FROM NoticeCategoryEntity n" +
             " WHERE n.departmentId = :departmentId AND n.lastNttSn != 0")
     List<NoticeCategoryEntity> findCategoryListByDepartmentId(@Param("departmentId")int departmentId);

src/main/java/com/example/Jinus/repository/v2/notice/NoticeRepositoryV2.java → src/main/java/com/example/Jinus/repository/notice/NoticeRepository.java

@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.notice;
+package com.example.Jinus.repository.notice;
 
 import com.example.Jinus.entity.notice.NoticeEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,7 +7,7 @@
 
 import java.util.List;
 
-public interface NoticeRepositoryV2 extends JpaRepository<NoticeEntity, Integer> {
+public interface NoticeRepository extends JpaRepository<NoticeEntity, Integer> {
     @Query("SELECT n FROM NoticeEntity n WHERE n.categoryId = :categoryId " +
             "ORDER BY n.createdAt DESC LIMIT 4")
     List<NoticeEntity> findNoticeListByCategoryId(@Param("categoryId")int categoryId);

src/main/java/com/example/Jinus/repository/v2/userInfo/DepartmentRepositoryV2.java → src/main/java/com/example/Jinus/repository/userInfo/DepartmentRepository.java

@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.userInfo;
+package com.example.Jinus.repository.userInfo;
 
 import com.example.Jinus.entity.userInfo.DepartmentEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,7 +7,7 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface DepartmentRepositoryV2 extends JpaRepository<DepartmentEntity, Integer> {
+public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer> {
     // 학과 영문명 찾기
     @Query("SELECT d.departmentEn FROM DepartmentEntity d WHERE d.id = :id")
     String findDepartmentEngById(@Param("id")Integer id);

src/main/java/com/example/Jinus/repository/v2/userInfo/UserRepositoryV2.java → src/main/java/com/example/Jinus/repository/userInfo/UserRepository.java

@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.userInfo;
+package com.example.Jinus.repository.userInfo;
 
 import com.example.Jinus.entity.userInfo.UserEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,7 +9,7 @@
 import java.util.Optional;
 
 @Repository
-public interface UserRepositoryV2 extends JpaRepository<UserEntity, String> {
+public interface UserRepository extends JpaRepository<UserEntity, String> {
     // 사용자 등록여부 확인(존재한다면 campusId 찾기)
     @Query("SELECT u.campusId FROM UserEntity u WHERE u.kakaoId = :kakaoId")
     Optional<Integer> findCampusIdById(@Param("kakaoId") String id);

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

@@ -1,15 +1,14 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
 import com.example.Jinus.config.RedisConfig;
 import com.example.Jinus.dto.data.CafeteriaDto;
 import com.example.Jinus.dto.data.DietDto;
 import com.example.Jinus.dto.data.HandleRequestDto;
-import com.example.Jinus.repository.v2.cafeteria.CafeteriaRepositoryV2;
-import com.example.Jinus.repository.v2.cafeteria.DietRepositoryV2;
+import com.example.Jinus.repository.cafeteria.CafeteriaRepository;
+import com.example.Jinus.repository.cafeteria.DietRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.sql.Date;
@@ -20,9 +19,9 @@
 @Service
 @Slf4j
 @RequiredArgsConstructor
-public class CacheServiceV2 {
-    private final DietRepositoryV2 dietRepositoryV2;
-    private final CafeteriaRepositoryV2 cafeteriaRepositoryV2;
+public class CacheService {
+    private final DietRepository dietRepositoryV2;
+    private final CafeteriaRepository cafeteriaRepositoryV2;
     private final RedisConfig redisConfig;
 
     public List<DietDto> getDietList(HandleRequestDto parameters, int cafeteriaId) {

src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaQueryServiceV2.java → src/main/java/com/example/Jinus/service/cafeteria/CafeteriaQueryService.java

@@ -1,6 +1,6 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
-import com.example.Jinus.repository.v2.cafeteria.CafeteriaRepositoryV2;
+import com.example.Jinus.repository.cafeteria.CafeteriaRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
@@ -9,8 +9,8 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class CafeteriaQueryServiceV2 {
-    private final CafeteriaRepositoryV2 cafeteriaRepositoryV2;
+public class CafeteriaQueryService {
+    private final CafeteriaRepository cafeteriaRepositoryV2;
 
     @Cacheable(
             value = "cafeteriaId",

src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaResponseServiceV2.java → src/main/java/com/example/Jinus/service/cafeteria/CafeteriaResponseService.java

@@ -1,4 +1,4 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
 import com.example.Jinus.dto.data.CafeteriaDto;
 import com.example.Jinus.dto.response.ButtonDto;
@@ -16,7 +16,7 @@
 
 @Service
 @RequiredArgsConstructor
-public class CafeteriaResponseServiceV2 {
+public class CafeteriaResponseService {
 
     // 식당 리스트 카드 생성
     public String createCafeteriaListCard(String campusName, List<CafeteriaDto> cafeteriaList) {

src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaServiceV2.java → src/main/java/com/example/Jinus/service/cafeteria/CafeteriaService.java

@@ -1,4 +1,4 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
 import com.example.Jinus.dto.data.CafeteriaDto;
 import lombok.RequiredArgsConstructor;
@@ -8,12 +8,12 @@
 
 @Service
 @RequiredArgsConstructor
-public class CafeteriaServiceV2 {
+public class CafeteriaService {
 
-    private final CampusServiceV2 campusServiceV2;
-    private final CampusResponseServiceV2 campusResponseServiceV2;
-    private final CacheServiceV2 cacheServiceV2;
-    private final CafeteriaResponseServiceV2 cafeteriaResponseServiceV2;
+    private final CampusService campusServiceV2;
+    private final CampusResponseService campusResponseServiceV2;
+    private final CacheService cacheServiceV2;
+    private final CafeteriaResponseService cafeteriaResponseServiceV2;
 
     // 사용자가 선택한 블록 ID값에 따라 반환 조건 설정
     // campusId가 -1이면 사용자 정보가 존재하지 않는 경우임

src/main/java/com/example/Jinus/service/v2/cafeteria/CampusResponseServiceV2.java → src/main/java/com/example/Jinus/service/cafeteria/CampusResponseService.java

@@ -1,4 +1,4 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
 import com.example.Jinus.dto.response.ListItemDto;
 import com.example.Jinus.dto.response.ResponseDto;
@@ -15,9 +15,9 @@
 
 @Service
 @RequiredArgsConstructor
-public class CampusResponseServiceV2 {
+public class CampusResponseService {
 
-    private final CampusServiceV2 campusServiceV2;
+    private final CampusService campusServiceV2;
 
     // 캠퍼스 리스트 반환 메소드
     public String makeCampusListCard() {

src/main/java/com/example/Jinus/service/v2/cafeteria/CampusServiceV2.java → src/main/java/com/example/Jinus/service/cafeteria/CampusService.java

@@ -1,7 +1,7 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
 import com.example.Jinus.entity.cafeteria.CampusEntity;
-import com.example.Jinus.repository.v2.cafeteria.CampusRepositoryV2;
+import com.example.Jinus.repository.cafeteria.CampusRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
@@ -12,8 +12,8 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class CampusServiceV2 {
-    private final CampusRepositoryV2 campusRepositoryV2;
+public class CampusService {
+    private final CampusRepository campusRepositoryV2;
 
     @Cacheable(
             value = "campusId",

src/main/java/com/example/Jinus/service/v2/cafeteria/DietParameterServiceV2.java → src/main/java/com/example/Jinus/service/diet/DietParameterService.java

@@ -1,9 +1,10 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.diet;
 
 import com.example.Jinus.dto.data.HandleRequestDto;
 import com.example.Jinus.dto.request.DetailParamsItemFieldDto;
 import com.example.Jinus.dto.request.RequestDto;
-import com.example.Jinus.service.v2.userInfo.UserServiceV2;
+import com.example.Jinus.service.cafeteria.CampusService;
+import com.example.Jinus.service.userInfo.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -16,10 +17,10 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class DietParameterServiceV2 {
+public class DietParameterService {
 
-    private final UserServiceV2 userServiceV2;
-    private final CampusServiceV2 campusServiceV2;
+    private final UserService userServiceV2;
+    private final CampusService campusServiceV2;
 
     // 요청 파라미터 객체 생성
     public HandleRequestDto setParameters(String kakaoId, LocalTime time, RequestDto requestDto) {

src/main/java/com/example/Jinus/service/v2/cafeteria/DietQueryServiceV2.java → src/main/java/com/example/Jinus/service/diet/DietQueryService.java

@@ -1,26 +1,26 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.diet;
 
 import com.example.Jinus.dto.data.DietDto;
 import com.example.Jinus.dto.data.HandleRequestDto;
-import com.example.Jinus.repository.v2.cafeteria.DietRepositoryV2;
+import com.example.Jinus.repository.cafeteria.DietRepository;
+import com.example.Jinus.service.cafeteria.CacheService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
-import java.sql.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class DietQueryServiceV2 {
+public class DietQueryService {
 
-    private final CacheServiceV2 cacheServiceV2;
-    private final DietRepositoryV2 dietRepositoryV2;
+    private final CacheService cacheServiceV2;
+    private final DietRepository dietRepositoryV2;
 
     // 메뉴 존재 여부에 따른 반환값 처리 로직
     public String getDietResponse(HandleRequestDto parameters, int cafeteriaId) {

src/main/java/com/example/Jinus/service/v2/cafeteria/DietResponseServiceV2.java → src/main/java/com/example/Jinus/service/diet/DietResponseService.java

@@ -1,4 +1,4 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.diet;
 
 import com.example.Jinus.dto.data.HandleRequestDto;
 import com.example.Jinus.dto.response.*;
@@ -12,7 +12,7 @@
 
 @Service
 @RequiredArgsConstructor
-public class DietResponseServiceV2 {
+public class DietResponseService {
 
     // 응답 객체 매핑
     public String mappingResponse(HandleRequestDto parameters, String imgUrl, String title, String description) {