diff --git a/src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java b/src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java index 934c374..0a785c4 100644 --- a/src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java +++ b/src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java @@ -35,7 +35,6 @@ public CafeteriaControllerV2( this.cafeteriaServiceV2 = cafeteriaServiceV2; } - // 사용자 존재 여부에 따라 응답 @PostMapping("/cafeteria") public String responseCafeteriaOrCampusListCard(@RequestBody RequestDto requestDto) { @@ -44,27 +43,6 @@ public String responseCafeteriaOrCampusListCard(@RequestBody RequestDto requestD int campusId = userServiceV2.getUserCampusId(userId); int sysCampusId = requestDto.getAction().getClientExtra().getSys_campus_id(); - return campusOrCafeteria(campusId, sysCampusId); - } - - - // 반환 조건 설정 - private String campusOrCafeteria(int campusId, int sysCampusId) { - // 더보기 버튼 누른 경우 - if (sysCampusId == -1) { - return campusServiceV2.makeCampusListCard(); - } - - // 사용자가 원하는 캠퍼스가 있을 때 - if (sysCampusId > 0) { - return cafeteriaServiceV2.makeCafeteriaListCard(sysCampusId); - } - - // 사용자가 원하는 캠퍼스가 없을 때 - return (campusId != -1) - ? cafeteriaServiceV2.makeCafeteriaListCard(campusId) - : campusServiceV2.makeCampusListCard(); + return cafeteriaServiceV2.campusOrCafeteria(campusId, sysCampusId); } - - } diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaServiceV2.java b/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaServiceV2.java index 0341672..c4b01be 100644 --- a/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaServiceV2.java +++ b/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaServiceV2.java @@ -41,6 +41,24 @@ public String getImgUrl(int cafeteriaId) { return cafeteriaRepositoryV2.findImgUrlByCafeteriaId(cafeteriaId); } + // 반환 조건 설정 + public String campusOrCafeteria(int campusId, int sysCampusId) { + // 더보기 버튼 누른 경우 + if (sysCampusId == -1) { + return campusServiceV2.makeCampusListCard(); + } + + // 사용자가 원하는 캠퍼스가 있을 때 + if (sysCampusId > 0) { + return makeCafeteriaListCard(sysCampusId); + } + + // 사용자가 원하는 캠퍼스가 없을 때 + return (campusId != -1) + ? makeCafeteriaListCard(campusId) + : campusServiceV2.makeCampusListCard(); + } + // 식당 리스트 반환 메소드 public String makeCafeteriaListCard(int campusId) { String campusName = campusServiceV2.getUserCampusName(campusId); diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/CampusServiceV2.java b/src/main/java/com/example/Jinus/service/v2/cafeteria/CampusServiceV2.java index e82fd8c..a0a3532 100644 --- a/src/main/java/com/example/Jinus/service/v2/cafeteria/CampusServiceV2.java +++ b/src/main/java/com/example/Jinus/service/v2/cafeteria/CampusServiceV2.java @@ -58,7 +58,6 @@ public List mappingCampusList(List campusList) { String imageUrl = campus.getThumbnailUrl(); Map extra = new HashMap<>(); extra.put("sys_campus_id", campus.getId()); - System.out.println("campusId: " + campus.getId()); // 캠퍼스 아이템 객체 생성 ListItemDto listItem = new ListItemDto(campusName, imageUrl, "block", "66067167cdd882158c759fc2", extra);