Skip to content

Commit ca861a8

Browse files
committed
revert: 건강 데이터 기능 전체 롤백 (2차)
1 parent a9fa4cb commit ca861a8

18 files changed

Lines changed: 10 additions & 766 deletions

src/main/java/org/runnect/server/common/advice/ControllerExceptionAdvice.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.runnect.server.common.advice;
22

33
import io.sentry.Sentry;
4+
import java.io.IOException;
45
import java.util.Objects;
56
import javax.servlet.http.HttpServletRequest;
67
import javax.validation.ConstraintViolationException;
@@ -9,7 +10,6 @@
910
import org.runnect.server.common.dto.ApiResponseDto;
1011
import org.runnect.server.common.exception.BasicException;
1112
import org.runnect.server.config.slack.SlackApi;
12-
import lombok.extern.slf4j.Slf4j;
1313
import org.springframework.http.HttpStatus;
1414
import org.springframework.http.ResponseEntity;
1515
import org.springframework.stereotype.Component;
@@ -21,7 +21,6 @@
2121
import org.springframework.web.bind.annotation.ResponseStatus;
2222
import org.springframework.web.bind.annotation.RestControllerAdvice;
2323

24-
@Slf4j
2524
@RestControllerAdvice
2625
@Component
2726
@RequiredArgsConstructor
@@ -72,17 +71,9 @@ protected ApiResponseDto handleMissingRequestParameterException(final MissingSer
7271
*/
7372
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
7473
@ExceptionHandler(Exception.class)
75-
protected ApiResponseDto<Object> handleException(final Exception error, final HttpServletRequest request) {
76-
try {
77-
slackApi.sendAlert(error, request);
78-
} catch (Exception e) {
79-
log.error("Slack 알림 전송 실패", e);
80-
}
81-
try {
82-
Sentry.captureException(error);
83-
} catch (Exception e) {
84-
log.error("Sentry 전송 실패", e);
85-
}
74+
protected ApiResponseDto<Object> handleException(final Exception error, final HttpServletRequest request) throws IOException {
75+
slackApi.sendAlert(error, request);
76+
Sentry.captureException(error);
8677
return ApiResponseDto.error(ErrorStatus.INTERNAL_SERVER_ERROR);
8778
}
8879

src/main/java/org/runnect/server/common/constant/ErrorStatus.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ public enum ErrorStatus {
3131
NOT_FOUND_SCRAP_EXCEPTION(HttpStatus.BAD_REQUEST, "스크랩한 코스가 없습니다."),
3232
NOT_FOUND_IMAGE_EXCEPTION(HttpStatus.BAD_REQUEST, "잘못된 이미지 파일입니다"),
3333
NOT_FOUND_PUBLICCOURSE_EXCEPTION(HttpStatus.BAD_REQUEST, "존재하지 않는 public course id입니다."),
34-
INVALID_HEALTH_DATA_EXCEPTION(HttpStatus.BAD_REQUEST, "유효하지 않은 건강 데이터입니다"),
35-
INVALID_DATE_RANGE_EXCEPTION(HttpStatus.BAD_REQUEST, "유효하지 않은 날짜 범위입니다"),
36-
EXCEED_HEART_RATE_SAMPLES_EXCEPTION(HttpStatus.BAD_REQUEST, "심박수 샘플은 최대 5000건까지 허용됩니다"),
3734

3835
/**
3936
* 401 UNAUTHORIZED
@@ -54,7 +51,6 @@ public enum ErrorStatus {
5451
*/
5552
PERMISSION_DENIED_PUBLIC_COURSE_DELETE_EXCEPTION(HttpStatus.FORBIDDEN, "퍼블릭 코스를 삭제할 권한이 존재하지 않습니다."),
5653
PERMISSION_DENIED_RECORD_DELETE_EXCEPTION(HttpStatus.FORBIDDEN, "기록을 삭제할 권한이 존재하지 않습니다."),
57-
PERMISSION_DENIED_HEALTH_DATA_EXCEPTION(HttpStatus.FORBIDDEN, "건강 데이터에 대한 접근 권한이 없습니다"),
5854

5955
/**
6056
* 404 NOT FOUND
@@ -67,7 +63,6 @@ public enum ErrorStatus {
6763
ALREADY_EXIST_USER_EXCEPTION(HttpStatus.CONFLICT, "이미 존재하는 유저입니다"),
6864
ALREADY_EXIST_NICKNAME_EXCEPTION(HttpStatus.CONFLICT, "중복된 닉네임입니다."),
6965
ALREADY_UPLOAD_COURSE_EXCEPTION(HttpStatus.CONFLICT, "이미 업로드된 코스입니다."),
70-
ALREADY_EXIST_HEALTH_DATA_EXCEPTION(HttpStatus.CONFLICT, "이미 건강 데이터가 등록된 기록입니다"),
7166

7267
/**
7368
* 500 INTERNAL SERVER ERROR

src/main/java/org/runnect/server/common/constant/SuccessStatus.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ public enum SuccessStatus {
2929

3030
SEARCH_PUBLIC_COURSE_SUCCESS(HttpStatus.OK,"업로드된 코스 검색 성공"),
3131

32-
GET_HEALTH_DATA_SUCCESS(HttpStatus.OK, "건강 데이터 조회 성공"),
33-
GET_HEALTH_SUMMARY_SUCCESS(HttpStatus.OK, "건강 통계 조회 성공"),
34-
3532

3633
UPDATE_RECORD_SUCCESS(HttpStatus.OK, "활동 기록 수정 성공"),
3734
UPDATE_USER_NICKNAME_SUCCESS(HttpStatus.OK, "닉네임 변경에 성공했습니다."),
@@ -44,7 +41,6 @@ public enum SuccessStatus {
4441
DELETE_PUBLIC_COURSE_SUCCESS(HttpStatus.OK, "퍼블릭 코스 삭제에 성공했습니다."),
4542
DELETE_RECORD_SUCCESS(HttpStatus.OK, "기록 삭제에 성공했습니다."),
4643
DELETE_COURSES_SUCCESS(HttpStatus.OK, "코스 삭제 성공"),
47-
DELETE_HEALTH_DATA_SUCCESS(HttpStatus.OK, "건강 데이터 삭제 성공"),
4844

4945

5046
/**
@@ -56,7 +52,6 @@ public enum SuccessStatus {
5652
CREATE_PUBLIC_COURSE_SUCCESS(HttpStatus.CREATED, "코드 업로드에 성공했습니다."),
5753
CREATE_SCRAP_SUCCESS(HttpStatus.CREATED, "코스 스크랩 성공"),
5854
NEW_TOKEN_SUCCESS(HttpStatus.CREATED, "토큰 재발급에 성공했습니다."),
59-
CREATE_HEALTH_DATA_SUCCESS(HttpStatus.CREATED, "건강 데이터 저장 성공"),
6055
;
6156

6257
private final HttpStatus httpStatus;

src/main/java/org/runnect/server/config/slack/SlackApi.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public class SlackApi {
2727
private final static String NEW_LINE = "\n";
2828
private final static String DOUBLE_NEW_LINE = "\n\n";
2929

30+
private StringBuilder sb = new StringBuilder();
31+
3032
public void sendAlert(Exception error, HttpServletRequest request) throws IOException {
3133

3234
List<LayoutBlock> layoutBlocks = generateLayoutBlock(error, request);
@@ -51,15 +53,15 @@ private List<LayoutBlock> generateLayoutBlock(Exception error, HttpServletReques
5153
}
5254

5355
private String generateErrorMessage(Exception error) {
54-
StringBuilder sb = new StringBuilder();
56+
sb.setLength(0);
5557
sb.append("*[🔥 Exception]*" + NEW_LINE + error.toString() + DOUBLE_NEW_LINE);
5658
sb.append("*[📩 From]*" + NEW_LINE + readRootStackTrace(error) + DOUBLE_NEW_LINE);
5759

5860
return sb.toString();
5961
}
6062

6163
private String generateErrorPointMessage(HttpServletRequest request) {
62-
StringBuilder sb = new StringBuilder();
64+
sb.setLength(0);
6365
sb.append("*[🧾세부정보]*" + NEW_LINE);
6466
sb.append("Request URL : " + request.getRequestURL().toString() + NEW_LINE);
6567
sb.append("Request Method : " + request.getMethod() + NEW_LINE);
@@ -69,9 +71,6 @@ private String generateErrorPointMessage(HttpServletRequest request) {
6971
}
7072

7173
private String readRootStackTrace(Exception error) {
72-
if (error.getStackTrace() == null || error.getStackTrace().length == 0) {
73-
return "Unknown";
74-
}
7574
return error.getStackTrace()[0].toString();
7675
}
7776

src/main/java/org/runnect/server/health/controller/HealthController.java

Lines changed: 0 additions & 68 deletions
This file was deleted.

src/main/java/org/runnect/server/health/dto/request/HealthDataRequestDto.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/main/java/org/runnect/server/health/dto/request/HeartRateSampleRequestDto.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/main/java/org/runnect/server/health/dto/response/CreateHealthDataResponseDto.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/main/java/org/runnect/server/health/dto/response/GetHealthDataResponseDto.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/main/java/org/runnect/server/health/dto/response/GetHealthSummaryResponseDto.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)