Skip to content

Commit f8a0146

Browse files
committed
[fix]dietServiceV2 코드 수정-가독성 위한 메소드 분리
1 parent b23501b commit f8a0146

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ dependencies {
4545
implementation 'org.springframework.boot:spring-boot-starter-web'
4646
implementation 'org.springframework.boot:spring-boot-starter-data-redis'
4747

48+
// actuator
49+
implementation 'org.springframework.boot:spring-boot-starter-actuator'
50+
4851
implementation 'io.sentry:sentry-spring-boot-starter-jakarta:8.3.0'
4952
implementation 'javax.enterprise:cdi-api:2.0'
5053
developmentOnly 'org.springframework.boot:spring-boot-devtools'

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

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -64,29 +64,26 @@ public String requestHandler(RequestDto requestDto) {
6464
public String makeResponse(HandleRequestDto parameters) {
6565
int campusId = campusServiceV2.getCampusId(parameters.getCampusName());
6666
int cafeteriaId = cafeteriaServiceV2.getCafeteriaId(parameters.getCafeteriaName(), campusId);
67-
// 캠퍼스에 식당이 존재하는 경우
68-
if (checkIsThereCafeteria(parameters) != -1) {
69-
// 식당 메뉴가 존재하는 경우
70-
if (checkThereIsDiet(parameters, cafeteriaId) != -1) {
71-
// 메뉴 찾기
72-
MultiValueMap<String, String> dietList = getDiets(parameters, cafeteriaId);
73-
StringBuilder diets = processDietList(dietList);
74-
return makeContents(parameters, cafeteriaId, diets);
75-
} else { // 메뉴 존재하지 않는 경우
76-
StringBuilder diets = new StringBuilder("\n메뉴가 존재하지 않습니다.");
77-
return makeContents(parameters, cafeteriaId, diets);
78-
}
79-
} else { // 식당 존재하지 않는 경우
67+
68+
// 캠퍼스에 식당이 존재하지 않는 경우
69+
if (cafeteriaId == -1) {
8070
return errorMsgThereIsNoCafeteria();
8171
}
82-
}
8372

73+
// 캠퍼스에 식당이 존재하는 경우
74+
String diets = getDietResponse(parameters, cafeteriaId);
75+
return makeContents(parameters, cafeteriaId, diets);
76+
}
8477

85-
// 캠퍼스에 식당 존재여부 확인 -> cafeteriaId 찾기
86-
// cafeteriaId가 -1이면 존재하지 않음
87-
private int checkIsThereCafeteria(HandleRequestDto parameters) {
88-
int campusId = campusServiceV2.getCampusId(parameters.getCampusName());
89-
return cafeteriaServiceV2.getCafeteriaId(parameters.getCafeteriaName(), campusId);
78+
// 메뉴 존재 여부 확인
79+
private String getDietResponse(HandleRequestDto parameters, int cafeteriaId) {
80+
// 메뉴 존재하는 경우
81+
if (checkThereIsDiet(parameters, cafeteriaId) != -1) {
82+
// 메뉴 찾기
83+
MultiValueMap<String, String> dietList = getDiets(parameters, cafeteriaId);
84+
return processDietList(dietList).toString();
85+
}
86+
return "\n메뉴가 존재하지 않습니다."; // 메뉴가 없는 경우
9087
}
9188

9289

@@ -138,24 +135,24 @@ public StringBuilder processDietList(MultiValueMap<String, String> dietList) {
138135

139136

140137
// 응답 내용 초기화
141-
private String makeContents(HandleRequestDto parameters, int cafeteriaId, StringBuilder diets) {
138+
private String makeContents(HandleRequestDto parameters, int cafeteriaId, String diets) {
142139
// 식당 img 찾기
143140
String imgUrl = cafeteriaServiceV2.getImgUrl(cafeteriaId);
144141

145142
// title 데이터 연결
146-
StringBuilder title = new StringBuilder("\uD83C\uDF71 ")
147-
.append(parameters.getCafeteriaName()).append("(")
148-
.append(parameters.getCampusName(), 0, 2).append(") 메뉴");
143+
String title = "\uD83C\uDF71 " +
144+
parameters.getCafeteriaName() + "(" +
145+
parameters.getCampusName().substring(0, 2) + ") 메뉴";
149146

150147
// 식단 날짜
151148
Date dietDate = parameters.getDietDate();
152149
String day = DateUtils.getDayOfWeekInKorean(dietDate);
153150

154151
// 메뉴 연결
155-
StringBuilder description = new StringBuilder(String.valueOf(dietDate)).append("(").append(day).append(") ")
156-
.append(parameters.getPeriod()).append("\n").append(diets);
152+
String description = dietDate + "(" + day + ") " +
153+
parameters.getPeriod() + "\n" + diets;
157154

158-
return mappingResponse(parameters, imgUrl, title.toString(), description.toString());
155+
return mappingResponse(parameters, imgUrl, title, description);
159156
}
160157

161158
// 응답 객체 매핑

0 commit comments

Comments
 (0)