Skip to content

[feat/#32] 사용자 위치 정보 업데이트 예외 처리 추가 #33

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
so1eeee merged 1 commit into from
May 20, 2025
Merged

[feat/#32] 사용자 위치 정보 업데이트 예외 처리 추가 #33

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
13 changes: 8 additions & 5 deletions src/main/java/server/gooroomi/domain/bus/application/BusService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,20 @@ public BaseResponse<List<BusArrivalResponse>> getBusArrivals(Long userId) {

String userBusNumber = user.getBusNumber();
BusStation nearestBusStation = user.getBusStation();

if (nearestBusStation == null) {
throw new BaseException(BaseResponseStatus.LOCATION_NOT_UPDATED);
}

List<BusArrival> busArrivals = nearestBusStation.getBusArrivals();

List<BusArrivalResponse> responseList = busArrivals.stream()
.map(BusConverter::toBusArrivalResponse)
.toList();
List<BusArrivalResponse> responseList = busArrivals.stream().map(BusConverter::toBusArrivalResponse).toList();

boolean isUserBusArriving = busArrivals.stream()
.anyMatch(busArrival -> busArrival.getBusNumber().equals(userBusNumber));

if(isUserBusArriving) {
return BaseResponse.success(BaseResponseStatus.USER_BUS_ARRIVING ,responseList);
if (isUserBusArriving) {
return BaseResponse.success(BaseResponseStatus.USER_BUS_ARRIVING, responseList);
}

return BaseResponse.success(responseList);
Expand Down
34 changes: 17 additions & 17 deletions src/main/java/server/gooroomi/global/handler/response/BaseResponseStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,17 @@ public enum BaseResponseStatus {
STATION_NOT_FOUND(true, 20001, HttpStatus.OK, "주변에 버스 정류소가 존재하지 않습니다."),
USER_BUS_ARRIVING(true, 20002, HttpStatus.OK, "등록된 버스가 곧 도착합니다."),


/**
* 400 BAD_REQUEST 잘못된 요청
*/
BAD_REQUEST(false, 400, HttpStatus.BAD_REQUEST,"잘못된 요청"),
VALIDATION_ERROR(false,40001, HttpStatus.BAD_REQUEST, "입력값을 확인해주세요."),
MISSING_PATH_VARIABLE(false,40002, HttpStatus.BAD_REQUEST,"경로 변수가 누락되었습니다."),
MISSING_REQUEST_PARAM(false,40003, HttpStatus.BAD_REQUEST,"쿼리 파라미터가 누락되었습니다."),
MISSING_REQUEST_PART(false,40004, HttpStatus.BAD_REQUEST,"multipart/form-data 파일이 누락되었습니다."),
REQ_BINDING_FAIL(false,40005, HttpStatus.BAD_REQUEST, "잘못된 request 입니다."),
MISMATCH_PARAM_TYPE(false,40006, HttpStatus.BAD_REQUEST, "잘못된 파라미터 타입입니다."),
FAILED_VALIDATION(false, 40007, HttpStatus.BAD_REQUEST,"입력값이 누락되었거나, 부적절한 입력 값이 있습니다."),
BAD_REQUEST(false, 400, HttpStatus.BAD_REQUEST, "잘못된 요청"),
VALIDATION_ERROR(false, 40001, HttpStatus.BAD_REQUEST, "입력값을 확인해주세요."),
MISSING_PATH_VARIABLE(false, 40002, HttpStatus.BAD_REQUEST, "경로 변수가 누락되었습니다."),
MISSING_REQUEST_PARAM(false, 40003, HttpStatus.BAD_REQUEST, "쿼리 파라미터가 누락되었습니다."),
MISSING_REQUEST_PART(false, 40004, HttpStatus.BAD_REQUEST, "multipart/form-data 파일이 누락되었습니다."),
REQ_BINDING_FAIL(false, 40005, HttpStatus.BAD_REQUEST, "잘못된 request 입니다."),
MISMATCH_PARAM_TYPE(false, 40006, HttpStatus.BAD_REQUEST, "잘못된 파라미터 타입입니다."),
FAILED_VALIDATION(false, 40007, HttpStatus.BAD_REQUEST, "입력값이 누락되었거나, 부적절한 입력 값이 있습니다."),

/**
* 401 UNAUTHORIZED 권한없음(인증 실패)
Expand All @@ -40,24 +39,25 @@ public enum BaseResponseStatus {
/**
* 403 FORBIDDEN 권한없음
*/
FORBIDDEN(false,403, HttpStatus.FORBIDDEN, "접근 권한이 없음"),
FORBIDDEN(false, 403, HttpStatus.FORBIDDEN, "접근 권한이 없음"),

/**
* 404 NOT_FOUND 잘못된 리소스 접근
*/
NOT_FOUND( false,404, HttpStatus.NOT_FOUND,"Not Found"),
NOT_FOUND_USER(false,40401, HttpStatus.NOT_FOUND,"해당 User를 찾을 수 없습니다."),
NOT_FOUND_STATION(false,40402, HttpStatus.NOT_FOUND,"주변에 정류장이 없습니다."),
NOT_FOUND(false, 404, HttpStatus.NOT_FOUND, "Not Found"),
NOT_FOUND_USER(false, 40401, HttpStatus.NOT_FOUND, "해당 User를 찾을 수 없습니다."),
NOT_FOUND_STATION(false, 40402, HttpStatus.NOT_FOUND, "주변에 정류장이 없습니다."),
LOCATION_NOT_UPDATED(false, 40403, HttpStatus.NOT_FOUND, "사용자 위치 정보가 아직 업데이트되지 않았습니다."),

/**
* 405 METHOD_NOT_ALLOWED 지원하지 않은 method 호출
*/
METHOD_NOT_ALLOWED(false,405, HttpStatus.METHOD_NOT_ALLOWED,"해당 매서드는 지원하지 않는 메서드입니다."),
METHOD_NOT_ALLOWED(false, 405, HttpStatus.METHOD_NOT_ALLOWED, "해당 매서드는 지원하지 않는 메서드입니다."),

/**
* 406 NOT_ACCEPTABLE 인식할 수 없는 content type
*/
NOT_ACCEPTABLE(false,406, HttpStatus.NOT_ACCEPTABLE, "인식할 수 없는 미디어 타입입니다."),
NOT_ACCEPTABLE(false, 406, HttpStatus.NOT_ACCEPTABLE, "인식할 수 없는 미디어 타입입니다."),

/**
* 409 CONFLICT 중복된 리소스
Expand All @@ -67,12 +67,12 @@ public enum BaseResponseStatus {
/**
* 415 UNSUPPORTED_MEDIA_TYPE 지원하지 않는 content type
*/
UNSUPPORTED_MEDIA_TYPE(false,415, HttpStatus.UNSUPPORTED_MEDIA_TYPE, "지원하지 않는 미디어 타입입니다."),
UNSUPPORTED_MEDIA_TYPE(false, 415, HttpStatus.UNSUPPORTED_MEDIA_TYPE, "지원하지 않는 미디어 타입입니다."),

/**
* 5XX Error
*/
INTERNAL_SERVER_ERROR( false,500, HttpStatus.INTERNAL_SERVER_ERROR,"서버 내부 에러");
INTERNAL_SERVER_ERROR(false, 500, HttpStatus.INTERNAL_SERVER_ERROR, "서버 내부 에러");

private final boolean isSuccess;
private final int code;
Expand Down
Loading