Skip to content

Commit 96a3e7c

Browse files
committed
[Fix] 칠암캠퍼스 식단이 안 나오는 버그 수정
1 parent 6f559d0 commit 96a3e7c

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

src/main/java/com/example/Jinus/service/cafeteria/CafeteriaDietService.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.example.Jinus.repository.cafeteria.CafeteriaDietRepository;
66
import com.example.Jinus.service.userInfo.UserService;
77
import com.example.Jinus.utility.JsonUtils;
8+
import com.example.Jinus.utility.SimpleTextResponse;
89
import org.slf4j.Logger;
910
import org.slf4j.LoggerFactory;
1011
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,11 +49,20 @@ public String processRequest(String userId,
4849
// 데이터 전처리
4950
String date = getCurrentDate(rawDate);
5051
int userCampusId = userService.getUserCampusId(userId);
51-
userCampusId = (userCampusId == -1) ? 1 : userCampusId;
52-
campusName = (campusName == null) ? campusService.getCampusName(userCampusId) : campusName;
53-
String period = (rawPeriod.isEmpty()) ? getPeriodOfDay() : rawPeriod;
52+
int cafeteriaId;
53+
54+
if (campusName == null) {
55+
campusName = userCampusId != -1 ? campusService.getCampusName(userCampusId) : "가좌캠퍼스";
56+
}
57+
58+
int campusId = campusService.getCampusIdByName(campusName);
59+
cafeteriaId = cafeteriaService.getCafeteriaIdByCampusId(cafeteriaName, campusId);
5460

55-
int cafeteriaId = cafeteriaService.getCafeteriaIdByCampusId(cafeteriaName, userCampusId);
61+
if (cafeteriaId == 0) {
62+
return SimpleTextResponse.simpleTextResponse("식당을 찾지 못했어!\n어떤 캠퍼스에 있는 식당인지 정확히 알려줘!");
63+
}
64+
65+
String period = (rawPeriod.isEmpty()) ? getPeriodOfDay() : rawPeriod;
5666

5767
HashMap<String, List<String>> categoryMenuMap = getCafeteriaDiet(LocalDate.parse(date), period, cafeteriaId);
5868

src/main/java/com/example/Jinus/service/cafeteria/CampusService.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,8 @@ public String getCampusName(int campusId) {
2929

3030
return campusName;
3131
}
32+
33+
public int getCampusIdByName(String campusName) {
34+
return campusRepository.findCampusIdByName(campusName);
35+
}
3236
}

0 commit comments

Comments
 (0)