Skip to content

Commit a5704cb

Browse files
hykim02hykim02
committed
[Fix]파일명 수정
1 parent 17ab978 commit a5704cb

38 files changed

+143
-173
lines changed

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
package com.example.Jinus.controller.v2;
1+
package com.example.Jinus.controller;
22

33
import com.example.Jinus.dto.request.RequestDto;
4-
import com.example.Jinus.service.v2.cafeteria.CafeteriaServiceV2;
5-
import com.example.Jinus.service.v2.userInfo.UserServiceV2;
6-
import com.fasterxml.jackson.core.JsonProcessingException;
7-
import com.fasterxml.jackson.databind.ObjectMapper;
4+
import com.example.Jinus.service.cafeteria.CafeteriaService;
5+
import com.example.Jinus.service.userInfo.UserService;
86
import lombok.RequiredArgsConstructor;
9-
import org.springframework.beans.factory.annotation.Autowired;
107
import org.springframework.web.bind.annotation.PostMapping;
118
import org.springframework.web.bind.annotation.RequestBody;
129
import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,10 +12,10 @@
1512
@RestController
1613
@RequiredArgsConstructor
1714
@RequestMapping("/api/spring")
18-
public class CafeteriaControllerV2 {
15+
public class CafeteriaController {
1916

20-
private final UserServiceV2 userServiceV2;
21-
private final CafeteriaServiceV2 cafeteriaServiceV2;
17+
private final UserService userServiceV2;
18+
private final CafeteriaService cafeteriaServiceV2;
2219

2320
// 사용자 존재 여부에 따라 응답
2421
@PostMapping("/v2/cafeteria")

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.example.Jinus.controller.v2;
1+
package com.example.Jinus.controller;
22

33
import com.example.Jinus.dto.request.RequestDto;
4-
import com.example.Jinus.service.v2.cafeteria.DietServiceV2;
4+
import com.example.Jinus.service.diet.DietService;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.web.bind.annotation.PostMapping;
77
import org.springframework.web.bind.annotation.RequestBody;
@@ -11,8 +11,8 @@
1111
@RestController
1212
@RequestMapping("/api/spring")
1313
@RequiredArgsConstructor
14-
public class DietControllerV2 {
15-
private final DietServiceV2 dietServiceV2;
14+
public class DietController {
15+
private final DietService dietServiceV2;
1616

1717
@PostMapping("/v2/dish")
1818
public String handleRequest(@RequestBody RequestDto requestDto) {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.example.Jinus.controller.v2;
1+
package com.example.Jinus.controller;
22

33
import com.example.Jinus.dto.request.RequestDto;
4-
import com.example.Jinus.service.v2.notice.NoticeServiceV2;
5-
import com.example.Jinus.service.v2.userInfo.DepartmentServiceV2;
6-
import com.example.Jinus.service.v2.userInfo.UserServiceV2;
4+
import com.example.Jinus.service.notice.NoticeService;
5+
import com.example.Jinus.service.userInfo.DepartmentService;
6+
import com.example.Jinus.service.userInfo.UserService;
77
import com.fasterxml.jackson.databind.ObjectMapper;
88
import lombok.RequiredArgsConstructor;
99
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,11 +15,11 @@
1515
@RestController
1616
@RequiredArgsConstructor
1717
@RequestMapping("/api/spring")
18-
public class NoticeControllerV2 {
18+
public class NoticeController {
1919

20-
private final NoticeServiceV2 noticeServiceV2;
21-
private final DepartmentServiceV2 departmentServiceV2;
22-
private final UserServiceV2 userServiceV2;
20+
private final NoticeService noticeServiceV2;
21+
private final DepartmentService departmentServiceV2;
22+
private final UserService userServiceV2;
2323
@Autowired
2424
private ObjectMapper objectMapper;
2525

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
package com.example.Jinus.repository.v2.cafeteria;
1+
package com.example.Jinus.repository.cafeteria;
22

33
import com.example.Jinus.dto.data.CafeteriaDto;
44
import com.example.Jinus.entity.cafeteria.CafeteriaEntity;
55
import org.springframework.data.jpa.repository.JpaRepository;
66
import org.springframework.data.jpa.repository.Query;
77
import org.springframework.data.repository.query.Param;
88

9-
import java.util.HashMap;
109
import java.util.List;
1110
import java.util.Optional;
1211

13-
public interface CafeteriaRepositoryV2 extends JpaRepository<CafeteriaEntity, Integer> {
12+
public interface CafeteriaRepository extends JpaRepository<CafeteriaEntity, Integer> {
1413
// 사용자 campusId와 동일한 식당이름과 url 찾기
1514
@Query(
1615
"SELECT new com.example.Jinus.dto.data.CafeteriaDto(c.cafeteriaNameKo, c.thumbnailUrl) " +

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.Jinus.repository.v2.cafeteria;
1+
package com.example.Jinus.repository.cafeteria;
22

33
import com.example.Jinus.entity.cafeteria.CampusEntity;
44
import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,7 +9,7 @@
99
import java.util.List;
1010

1111
@Repository
12-
public interface CampusRepositoryV2 extends JpaRepository<CampusEntity, Integer> {
12+
public interface CampusRepository extends JpaRepository<CampusEntity, Integer> {
1313
// 사용자 campusId로 캠퍼스 이름 찾기
1414
@Query("SELECT c.campusNameKo FROM CampusEntity c WHERE c.id = :campusId")
1515
String findCampusNameByCampusId(@Param("campusId") int campusId);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.Jinus.repository.v2.cafeteria;
1+
package com.example.Jinus.repository.cafeteria;
22

33
import com.example.Jinus.dto.data.DietDto;
44
import com.example.Jinus.entity.cafeteria.CafeteriaDietEntity;
@@ -11,7 +11,7 @@
1111
import java.util.List;
1212

1313
@Repository
14-
public interface DietRepositoryV2 extends JpaRepository<CafeteriaDietEntity, Integer> {
14+
public interface DietRepository extends JpaRepository<CafeteriaDietEntity, Integer> {
1515
@Query("SELECT new com.example.Jinus.dto.data.DietDto(c.dishCategory, c.dishName, c.dishType) " +
1616
"FROM CafeteriaDietEntity c " +
1717
"WHERE c.dietDate = :dietDate " +

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.Jinus.repository.v2.notice;
1+
package com.example.Jinus.repository.notice;
22

33
import com.example.Jinus.entity.notice.NoticeCategoryEntity;
44
import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,7 +7,7 @@
77

88
import java.util.List;
99

10-
public interface CategoryRepositoryV2 extends JpaRepository<NoticeCategoryEntity, Integer> {
10+
public interface CategoryRepository extends JpaRepository<NoticeCategoryEntity, Integer> {
1111
@Query("SELECT n FROM NoticeCategoryEntity n" +
1212
" WHERE n.departmentId = :departmentId AND n.lastNttSn != 0")
1313
List<NoticeCategoryEntity> findCategoryListByDepartmentId(@Param("departmentId")int departmentId);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.Jinus.repository.v2.notice;
1+
package com.example.Jinus.repository.notice;
22

33
import com.example.Jinus.entity.notice.NoticeEntity;
44
import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,7 +7,7 @@
77

88
import java.util.List;
99

10-
public interface NoticeRepositoryV2 extends JpaRepository<NoticeEntity, Integer> {
10+
public interface NoticeRepository extends JpaRepository<NoticeEntity, Integer> {
1111
@Query("SELECT n FROM NoticeEntity n WHERE n.categoryId = :categoryId " +
1212
"ORDER BY n.createdAt DESC LIMIT 4")
1313
List<NoticeEntity> findNoticeListByCategoryId(@Param("categoryId")int categoryId);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.Jinus.repository.v2.userInfo;
1+
package com.example.Jinus.repository.userInfo;
22

33
import com.example.Jinus.entity.userInfo.DepartmentEntity;
44
import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,7 +7,7 @@
77
import org.springframework.stereotype.Repository;
88

99
@Repository
10-
public interface DepartmentRepositoryV2 extends JpaRepository<DepartmentEntity, Integer> {
10+
public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer> {
1111
// 학과 영문명 찾기
1212
@Query("SELECT d.departmentEn FROM DepartmentEntity d WHERE d.id = :id")
1313
String findDepartmentEngById(@Param("id")Integer id);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.Jinus.repository.v2.userInfo;
1+
package com.example.Jinus.repository.userInfo;
22

33
import com.example.Jinus.entity.userInfo.UserEntity;
44
import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,7 +9,7 @@
99
import java.util.Optional;
1010

1111
@Repository
12-
public interface UserRepositoryV2 extends JpaRepository<UserEntity, String> {
12+
public interface UserRepository extends JpaRepository<UserEntity, String> {
1313
// 사용자 등록여부 확인(존재한다면 campusId 찾기)
1414
@Query("SELECT u.campusId FROM UserEntity u WHERE u.kakaoId = :kakaoId")
1515
Optional<Integer> findCampusIdById(@Param("kakaoId") String id);

0 commit comments

Comments
 (0)