diff --git a/operation-common/src/main/java/org/sopt/makers/operation/code/failure/lecture/LectureFailureCode.java b/operation-common/src/main/java/org/sopt/makers/operation/code/failure/lecture/LectureFailureCode.java index ef9d4d23..0f1060a0 100644 --- a/operation-common/src/main/java/org/sopt/makers/operation/code/failure/lecture/LectureFailureCode.java +++ b/operation-common/src/main/java/org/sopt/makers/operation/code/failure/lecture/LectureFailureCode.java @@ -14,7 +14,7 @@ public enum LectureFailureCode implements FailureCode { INVALID_ATTENDANCE(BAD_REQUEST,"존재하지 않는 출석 세션입니다."), ENDED_ATTENDANCE(BAD_REQUEST, "차 출석이 이미 종료되었습니다."), ENDED_FIRST_ATTENDANCE(BAD_REQUEST, "1차 출석이 이미 종료되었습니다."), - ENDED_SECOND_ATTENDANCE(BAD_REQUEST, "차 출석이 이미 종료되었습니다."), + ENDED_SECOND_ATTENDANCE(BAD_REQUEST, "2차 출석이 이미 종료되었습니다."), INVALID_COUNT_SESSION(BAD_REQUEST,"세션의 개수가 올바르지 않습니다."), INVALID_LECTURE(BAD_REQUEST,"존재하지 않는 세션입니다."), NO_SESSION(BAD_REQUEST,"오늘 세션이 없습니다."), diff --git a/operation-common/src/main/java/org/sopt/makers/operation/dto/BaseResponse.java b/operation-common/src/main/java/org/sopt/makers/operation/dto/BaseResponse.java index 4fb2c888..d9fa672a 100644 --- a/operation-common/src/main/java/org/sopt/makers/operation/dto/BaseResponse.java +++ b/operation-common/src/main/java/org/sopt/makers/operation/dto/BaseResponse.java @@ -1,8 +1,6 @@ package org.sopt.makers.operation.dto; -import static com.fasterxml.jackson.annotation.JsonInclude.Include.*; -import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AccessLevel; import lombok.Builder; @@ -11,7 +9,7 @@ public record BaseResponse ( boolean success, String message, - @JsonInclude(value = NON_NULL) +// @JsonInclude(value = NON_NULL) T data ) { diff --git a/operation-external/src/main/java/org/sopt/makers/operation/client/alarm/AlarmSenderImpl.java b/operation-external/src/main/java/org/sopt/makers/operation/client/alarm/AlarmSenderImpl.java index 8f3e59f4..ccd74f39 100644 --- a/operation-external/src/main/java/org/sopt/makers/operation/client/alarm/AlarmSenderImpl.java +++ b/operation-external/src/main/java/org/sopt/makers/operation/client/alarm/AlarmSenderImpl.java @@ -16,6 +16,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Component; import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.RestTemplate; import lombok.RequiredArgsConstructor; @@ -34,7 +35,7 @@ public void send(AlarmSenderRequest request) { val host = valueConfig.getNOTIFICATION_URL(); val entity = getEntity(request); restTemplate.postForEntity(host, entity, AlarmSenderRequest.class); - } catch (HttpClientErrorException e) { + } catch (HttpServerErrorException | HttpClientErrorException e) { throw new AlarmException(FAIL_SEND_ALARM); } }