Skip to content

[fix#94] 혼잡도 그래프 에러처리 #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ssamssamukja merged 1 commit into from
Dec 8, 2024
Merged

[fix#94] 혼잡도 그래프 에러처리 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/B1G4/bookmark/apiPayload/code/status/ErrorStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public enum ErrorStatus implements BaseErrorCode {
UNBOOKMARK_FAILED(HttpStatus.BAD_REQUEST, "PLACE_010", "해당 공간 북마크 해제에 실패하였습니다."),
USERPLACE_NOT_FOUND(HttpStatus.BAD_REQUEST, "PLACE_011", "해당 유저의 저장 공간이 존재하지 않습니다."),
PLACE_NOT_FOUND(HttpStatus.BAD_REQUEST, "PLACE_012", "해당 공간이 존재하지 않습니다."),
PLACE_CLOSED(HttpStatus.BAD_REQUEST, "PLACE_013", "해당 공간은 오늘 휴무일입니다."),

;

Expand Down
8 changes: 8 additions & 0 deletions src/main/java/B1G4/bookmark/converter/CongestionConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package B1G4.bookmark.converter;

import B1G4.bookmark.apiPayload.code.status.ErrorStatus;
import B1G4.bookmark.apiPayload.exception.handler.PlaceHandler;
import B1G4.bookmark.domain.Congestion;
import B1G4.bookmark.domain.Place;
import B1G4.bookmark.web.dto.CongestionDTO.CongestionResponseDTO;
Expand Down Expand Up @@ -102,6 +104,12 @@ private static Congestion.CongestionBuilder setCongestionLevel(Congestion.Conges
public static List<CongestionResponseDTO.HourValueDTO> filterAndRoundCongestion(Congestion congestion, LocalTime openTime, LocalTime closeTime) {
List<CongestionResponseDTO.HourValueDTO> congestionData = new ArrayList<>();

try{
int hour = openTime.getHour();
}catch (Exception e){
throw new PlaceHandler(ErrorStatus.PLACE_CLOSED);
}

for (int hour = openTime.getHour(); hour <= closeTime.getHour(); hour++) {
float congestionLevel = getCongestionLevel(congestion, hour);
int roundedValue = Math.round(congestionLevel);
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/B1G4/bookmark/service/CongestionService/CongestionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package B1G4.bookmark.service.CongestionService;

import B1G4.bookmark.apiPayload.code.status.ErrorStatus;
import B1G4.bookmark.apiPayload.exception.handler.PlaceHandler;
import B1G4.bookmark.converter.CongestionConverter;
import B1G4.bookmark.domain.Congestion;
import B1G4.bookmark.domain.OperatingTime;
Expand Down Expand Up @@ -38,8 +40,14 @@ public CongestionResponseDTO getCongestionGraph(Long placeId) {

OperatingTime operatingTime = operatingTimeRepository.findByPlaceAndDayOfWeek(place, currentDay);

LocalTime openTime = operatingTime.getOpenTime();
LocalTime closeTime = operatingTime.getCloseTime();
LocalTime openTime;
LocalTime closeTime;
try {
openTime = operatingTime.getOpenTime();
closeTime = operatingTime.getCloseTime();
}catch (Exception e){
throw new PlaceHandler(ErrorStatus.PLACE_CLOSED);
}

Congestion congestion = place.getCongestion();
if (congestion == null) {
Expand Down
Loading