From 08ab359db735dc1c5bac76104ce65352d78f2269 Mon Sep 17 00:00:00 2001 From: yummygyudon Date: Fri, 5 Apr 2024 16:22:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FIX]=20iOS=20=EC=8B=9C=EB=AE=AC=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EA=B8=B0=EA=B8=B0=20=ED=86=A0=ED=81=B0=20?= =?UTF-8?q?=EB=8C=80=EC=83=81=20=EC=95=8C=EB=A6=BC=20=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?Error=20=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - dev 환경에서 iOS 시뮬레이션 기기 토큰이기 때문에 알림 서버 통신에 에러가 발생하였고 해당 에러에 대한 예외 처리 추가했습니다. (`HttpServerErrorException`) --- .../sopt/makers/operation/client/alarm/AlarmSenderImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); } } From e39d0ef442af62f95e3c6adadf9f8faddeb814d9 Mon Sep 17 00:00:00 2001 From: yummygyudon Date: Fri, 5 Apr 2024 16:24:17 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[CHORE]=20Failure=20Response=20DTO=20`data`?= =?UTF-8?q?=20=ED=95=84=EB=93=9C=20Nullable=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 휴먼 이슈인 듯 합니다만 "2차 출석..." 문구에서 `2`가 빠졌던 문구에 `2`추가했습니다. --- .../operation/code/failure/lecture/LectureFailureCode.java | 2 +- .../main/java/org/sopt/makers/operation/dto/BaseResponse.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) 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 ) {