Skip to content
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

[FIX] iOS 무한로딩 원인 DTO 롤백 #250

Merged
merged 2 commits into from
Apr 5, 2024
Merged

[FIX] iOS 무한로딩 원인 DTO 롤백 #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08ab359
[FIX] iOS 시뮬레이션 기기 토큰 대상 알림 전송 Error 예외 처리
yummygyudon Apr 5, 2024
e39d0ef
[CHORE] Failure Response DTO `data` 필드 Nullable 롤백
yummygyudon Apr 5, 2024
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
2 changes: 1 addition & 1 deletion ...mmon/src/main/java/org/sopt/makers/operation/code/failure/lecture/LectureFailureCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,"오늘 세션이 없습니다."),
Expand Down
4 changes: 1 addition & 3 deletions operation-common/src/main/java/org/sopt/makers/operation/dto/BaseResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,7 +9,7 @@
public record BaseResponse<T> (
boolean success,
String message,
@JsonInclude(value = NON_NULL)
// @JsonInclude(value = NON_NULL)
T data
) {

Expand Down
3 changes: 2 additions & 1 deletion operation-external/src/main/java/org/sopt/makers/operation/client/alarm/AlarmSenderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
}
Expand Down
Loading