Skip to content

Commit 0709655

Browse files
committed
[Refactor]CafeteriaControllerV2 서비스 로직 CafeteriaServiceV2로 이동
1 parent fc94d61 commit 0709655

File tree

3 files changed

+19
-24
lines changed

3 files changed

+19
-24
lines changed

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

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public CafeteriaControllerV2(
3535
this.cafeteriaServiceV2 = cafeteriaServiceV2;
3636
}
3737

38-
3938
// 사용자 존재 여부에 따라 응답
4039
@PostMapping("/cafeteria")
4140
public String responseCafeteriaOrCampusListCard(@RequestBody RequestDto requestDto) {
@@ -44,27 +43,6 @@ public String responseCafeteriaOrCampusListCard(@RequestBody RequestDto requestD
4443
int campusId = userServiceV2.getUserCampusId(userId);
4544
int sysCampusId = requestDto.getAction().getClientExtra().getSys_campus_id();
4645

47-
return campusOrCafeteria(campusId, sysCampusId);
48-
}
49-
50-
51-
// 반환 조건 설정
52-
private String campusOrCafeteria(int campusId, int sysCampusId) {
53-
// 더보기 버튼 누른 경우
54-
if (sysCampusId == -1) {
55-
return campusServiceV2.makeCampusListCard();
56-
}
57-
58-
// 사용자가 원하는 캠퍼스가 있을 때
59-
if (sysCampusId > 0) {
60-
return cafeteriaServiceV2.makeCafeteriaListCard(sysCampusId);
61-
}
62-
63-
// 사용자가 원하는 캠퍼스가 없을 때
64-
return (campusId != -1)
65-
? cafeteriaServiceV2.makeCafeteriaListCard(campusId)
66-
: campusServiceV2.makeCampusListCard();
46+
return cafeteriaServiceV2.campusOrCafeteria(campusId, sysCampusId);
6747
}
68-
69-
7048
}

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,24 @@ public String getImgUrl(int cafeteriaId) {
4141
return cafeteriaRepositoryV2.findImgUrlByCafeteriaId(cafeteriaId);
4242
}
4343

44+
// 반환 조건 설정
45+
public String campusOrCafeteria(int campusId, int sysCampusId) {
46+
// 더보기 버튼 누른 경우
47+
if (sysCampusId == -1) {
48+
return campusServiceV2.makeCampusListCard();
49+
}
50+
51+
// 사용자가 원하는 캠퍼스가 있을 때
52+
if (sysCampusId > 0) {
53+
return makeCafeteriaListCard(sysCampusId);
54+
}
55+
56+
// 사용자가 원하는 캠퍼스가 없을 때
57+
return (campusId != -1)
58+
? makeCafeteriaListCard(campusId)
59+
: campusServiceV2.makeCampusListCard();
60+
}
61+
4462
// 식당 리스트 반환 메소드
4563
public String makeCafeteriaListCard(int campusId) {
4664
String campusName = campusServiceV2.getUserCampusName(campusId);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public List<ListItemDto> mappingCampusList(List<CampusEntity> campusList) {
5858
String imageUrl = campus.getThumbnailUrl();
5959
Map<String, Object> extra = new HashMap<>();
6060
extra.put("sys_campus_id", campus.getId());
61-
System.out.println("campusId: " + campus.getId());
6261

6362
// 캠퍼스 아이템 객체 생성
6463
ListItemDto listItem = new ListItemDto(campusName, imageUrl, "block", "66067167cdd882158c759fc2", extra);

0 commit comments

Comments
 (0)