Skip to content

Commit 75ebe9b

Browse files
bikoojubikooju
authored
♻️ 게시글 수정과 삭제시 본인 게시글만 수정, 삭제 가능하도록 수정
♻️ 게시글 수정과 삭제시 본인 게시글만 수정, 삭제 가능하도록 수정
2 parents 72abdd7 + 907276e commit 75ebe9b

File tree

208 files changed

+7694
-7134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+7694
-7134
lines changed

‎src/main/java/DC_square/spring/Application.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
public class
1010
Application {
1111

12-
public static void main(String[] args) {
13-
SpringApplication.run(Application.class, args);
14-
}
12+
public static void main(String[] args) {
13+
SpringApplication.run(Application.class, args);
14+
}
1515

1616
}

‎src/main/java/DC_square/spring/apiPayload/ApiResponse.java‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,32 @@
1313
@JsonPropertyOrder({"isSuccess", "code", "message", "result"})
1414
public class ApiResponse<T> {
1515

16-
@JsonProperty("isSuccess")
17-
private final Boolean isSuccess;
18-
private final String code;
19-
private final String message;
20-
@JsonInclude(JsonInclude.Include.NON_NULL)
21-
private T result;
22-
23-
24-
// 성공한 경우 응답 생성
25-
public static <T> ApiResponse<T> onSuccess(T result){
26-
return new ApiResponse<>(true, SuccessStatus._OK.getCode() , SuccessStatus._OK.getMessage(), result);
27-
}
28-
29-
public static <T> ApiResponse<T> of(BaseCode code, T result){
30-
return new ApiResponse<>(true, code.getReasonHttpStatus().getCode() , code.getReasonHttpStatus().getMessage(), result);
31-
}
32-
33-
public static <T> ApiResponse<T> onSuccess(T result, String message) {
34-
return new ApiResponse<>(true, SuccessStatus._OK.getCode(), message, result);
35-
}
36-
37-
38-
39-
// 실패한 경우 응답 생성
40-
public static <T> ApiResponse<T> onFailure(String code, String message, T data){
41-
return new ApiResponse<>(false, code, message, data);
42-
}
16+
@JsonProperty("isSuccess")
17+
private final Boolean isSuccess;
18+
private final String code;
19+
private final String message;
20+
@JsonInclude(JsonInclude.Include.NON_NULL)
21+
private T result;
22+
23+
24+
// 성공한 경우 응답 생성
25+
public static <T> ApiResponse<T> onSuccess(T result) {
26+
return new ApiResponse<>(true, SuccessStatus._OK.getCode(), SuccessStatus._OK.getMessage(),
27+
result);
28+
}
29+
30+
public static <T> ApiResponse<T> of(BaseCode code, T result) {
31+
return new ApiResponse<>(true, code.getReasonHttpStatus().getCode(),
32+
code.getReasonHttpStatus().getMessage(), result);
33+
}
34+
35+
public static <T> ApiResponse<T> onSuccess(T result, String message) {
36+
return new ApiResponse<>(true, SuccessStatus._OK.getCode(), message, result);
37+
}
38+
39+
40+
// 실패한 경우 응답 생성
41+
public static <T> ApiResponse<T> onFailure(String code, String message, T data) {
42+
return new ApiResponse<>(false, code, message, data);
43+
}
4344
}

‎src/main/java/DC_square/spring/apiPayload/code/BaseCode.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public interface BaseCode {
44

5-
ReasonDTO getReason();
5+
ReasonDTO getReason();
66

7-
ReasonDTO getReasonHttpStatus();
7+
ReasonDTO getReasonHttpStatus();
88
}

‎src/main/java/DC_square/spring/apiPayload/code/BaseErrorCode.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public interface BaseErrorCode {
44

5-
ErrorReasonDTO getReason();
5+
ErrorReasonDTO getReason();
66

7-
ErrorReasonDTO getReasonHttpStatus();
7+
ErrorReasonDTO getReasonHttpStatus();
88
}

‎src/main/java/DC_square/spring/apiPayload/code/ErrorCode.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,32 @@
99
@AllArgsConstructor
1010
public enum ErrorCode implements BaseErrorCode {
1111

12-
// 유저 관련 에러
13-
USER_NOT_FOUND(HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 유저입니다."),
14-
DUPLICATE_EMAIL(HttpStatus.CONFLICT, "USER_409_1", "이미 존재하는 이메일입니다."),
15-
DUPLICATE_NICKNAME(HttpStatus.CONFLICT, "USER_409_2", "이미 존재하는 닉네임입니다."),
16-
INVALID_PASSWORD(HttpStatus.UNAUTHORIZED, "USER_401", "비밀번호가 일치하지 않습니다.");
12+
// 유저 관련 에러
13+
USER_NOT_FOUND(HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 유저입니다."),
14+
DUPLICATE_EMAIL(HttpStatus.CONFLICT, "USER_409_1", "이미 존재하는 이메일입니다."),
15+
DUPLICATE_NICKNAME(HttpStatus.CONFLICT, "USER_409_2", "이미 존재하는 닉네임입니다."),
16+
INVALID_PASSWORD(HttpStatus.UNAUTHORIZED, "USER_401", "비밀번호가 일치하지 않습니다.");
1717

18-
private final HttpStatus httpStatus;
19-
private final String code;
20-
private final String message;
18+
private final HttpStatus httpStatus;
19+
private final String code;
20+
private final String message;
2121

22-
@Override
23-
public ErrorReasonDTO getReason() {
24-
return ErrorReasonDTO.builder()
25-
.message(message)
26-
.code(code)
27-
.isSuccess(false)
28-
.build();
29-
}
22+
@Override
23+
public ErrorReasonDTO getReason() {
24+
return ErrorReasonDTO.builder()
25+
.message(message)
26+
.code(code)
27+
.isSuccess(false)
28+
.build();
29+
}
3030

31-
@Override
32-
public ErrorReasonDTO getReasonHttpStatus() {
33-
return ErrorReasonDTO.builder()
34-
.message(message)
35-
.code(code)
36-
.isSuccess(false)
37-
.httpStatus(httpStatus)
38-
.build();
39-
}
31+
@Override
32+
public ErrorReasonDTO getReasonHttpStatus() {
33+
return ErrorReasonDTO.builder()
34+
.message(message)
35+
.code(code)
36+
.isSuccess(false)
37+
.httpStatus(httpStatus)
38+
.build();
39+
}
4040
}

‎src/main/java/DC_square/spring/apiPayload/code/ErrorReasonDTO.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
@Builder
99
public class ErrorReasonDTO {
1010

11-
private HttpStatus httpStatus;
11+
private HttpStatus httpStatus;
1212

13-
private final boolean isSuccess;
14-
private final String code;
15-
private final String message;
13+
private final boolean isSuccess;
14+
private final String code;
15+
private final String message;
1616

17-
public boolean getIsSuccess() {return isSuccess;}
17+
public boolean getIsSuccess() {
18+
return isSuccess;
19+
}
1820

1921
}

‎src/main/java/DC_square/spring/apiPayload/code/ReasonDTO.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
@Builder
99
public class ReasonDTO {
1010

11-
private HttpStatus httpStatus;
11+
private HttpStatus httpStatus;
1212

13-
private final boolean isSuccess;
14-
private final String code;
15-
private final String message;
13+
private final boolean isSuccess;
14+
private final String code;
15+
private final String message;
1616

17-
public boolean getIsSuccess() {return isSuccess;}
17+
public boolean getIsSuccess() {
18+
return isSuccess;
19+
}
1820
}

‎src/main/java/DC_square/spring/apiPayload/code/status/ErrorStatus.java‎

Lines changed: 46 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,50 @@
1010
@AllArgsConstructor
1111
public enum ErrorStatus implements BaseErrorCode {
1212

13-
//가장 일반적인 응답
14-
_INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON500", "서버 에러, 관리자에게 문의 바랍니다."),
15-
_BAD_REQUEST(HttpStatus.BAD_REQUEST,"COMMON400","잘못된 요청입니다."),
16-
_UNAUTHORIZED(HttpStatus.UNAUTHORIZED,"COMMON401","인증이 필요합니다."),
17-
_FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."),
18-
19-
// 토큰 관련 에러
20-
TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "TOKEN401", "만료된 토큰입니다."),
21-
TOKEN_INVALID(HttpStatus.UNAUTHORIZED, "TOKEN401", "유효하지 않은 토큰입니다."),
22-
TOKEN_REFRESH_FAILED(HttpStatus.UNAUTHORIZED, "TOKEN401", "토큰 갱신에 실패했습니다."),
23-
24-
25-
26-
// 멤버 관려 에러
27-
MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER4001", "사용자가 없습니다."),
28-
NICKNAME_NOT_EXIST(HttpStatus.BAD_REQUEST, "MEMBER4002", "닉네임은 필수 입니다."),
29-
30-
// 예시,,,
31-
ARTICLE_NOT_FOUND(HttpStatus.NOT_FOUND, "ARTICLE4001", "게시글이 없습니다."),
32-
33-
// For test
34-
TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "이거는 테스트");
35-
36-
37-
38-
39-
40-
private final HttpStatus httpStatus;
41-
private final String code;
42-
private final String message;
43-
44-
45-
@Override
46-
public ErrorReasonDTO getReason() {
47-
return ErrorReasonDTO.builder()
48-
.message(message)
49-
.code(code)
50-
.isSuccess(false)
51-
.build();
52-
}
53-
54-
@Override
55-
public ErrorReasonDTO getReasonHttpStatus() {
56-
return ErrorReasonDTO.builder()
57-
.message(message)
58-
.code(code)
59-
.isSuccess(false)
60-
.httpStatus(httpStatus)
61-
.build();
62-
}
13+
//가장 일반적인 응답
14+
_INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON500", "서버 에러, 관리자에게 문의 바랍니다."),
15+
_BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON400", "잘못된 요청입니다."),
16+
_UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "COMMON401", "인증이 필요합니다."),
17+
_FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."),
18+
19+
// 토큰 관련 에러
20+
TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "TOKEN401", "만료된 토큰입니다."),
21+
TOKEN_INVALID(HttpStatus.UNAUTHORIZED, "TOKEN401", "유효하지 않은 토큰입니다."),
22+
TOKEN_REFRESH_FAILED(HttpStatus.UNAUTHORIZED, "TOKEN401", "토큰 갱신에 실패했습니다."),
23+
24+
25+
// 멤버 관려 에러
26+
MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER4001", "사용자가 없습니다."),
27+
NICKNAME_NOT_EXIST(HttpStatus.BAD_REQUEST, "MEMBER4002", "닉네임은 필수 입니다."),
28+
29+
// 예시,,,
30+
ARTICLE_NOT_FOUND(HttpStatus.NOT_FOUND, "ARTICLE4001", "게시글이 없습니다."),
31+
32+
// For test
33+
TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "이거는 테스트");
34+
35+
36+
private final HttpStatus httpStatus;
37+
private final String code;
38+
private final String message;
39+
40+
41+
@Override
42+
public ErrorReasonDTO getReason() {
43+
return ErrorReasonDTO.builder()
44+
.message(message)
45+
.code(code)
46+
.isSuccess(false)
47+
.build();
48+
}
49+
50+
@Override
51+
public ErrorReasonDTO getReasonHttpStatus() {
52+
return ErrorReasonDTO.builder()
53+
.message(message)
54+
.code(code)
55+
.isSuccess(false)
56+
.httpStatus(httpStatus)
57+
.build();
58+
}
6359
}

‎src/main/java/DC_square/spring/apiPayload/code/status/SuccessStatus.java‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,30 @@
1010
@AllArgsConstructor
1111
public enum SuccessStatus implements BaseCode {
1212

13-
// 일반적인 응답
14-
_OK(HttpStatus.OK, "COMMON200","성공입니다.");
15-
16-
private final HttpStatus httpstatus;
17-
private final String code;
18-
private final String message;
19-
20-
21-
22-
@Override
23-
public ReasonDTO getReason() {
24-
return ReasonDTO.builder()
25-
.message(message)
26-
.code(code)
27-
.isSuccess(true)
28-
.build();
29-
}
30-
31-
@Override
32-
public ReasonDTO getReasonHttpStatus() {
33-
return ReasonDTO.builder()
34-
.message(message)
35-
.code(code)
36-
.isSuccess(true)
37-
.httpStatus(httpstatus)
38-
.build();
39-
}
13+
// 일반적인 응답
14+
_OK(HttpStatus.OK, "COMMON200", "성공입니다.");
15+
16+
private final HttpStatus httpstatus;
17+
private final String code;
18+
private final String message;
19+
20+
21+
@Override
22+
public ReasonDTO getReason() {
23+
return ReasonDTO.builder()
24+
.message(message)
25+
.code(code)
26+
.isSuccess(true)
27+
.build();
28+
}
29+
30+
@Override
31+
public ReasonDTO getReasonHttpStatus() {
32+
return ReasonDTO.builder()
33+
.message(message)
34+
.code(code)
35+
.isSuccess(true)
36+
.httpStatus(httpstatus)
37+
.build();
38+
}
4039
}

0 commit comments

Comments
 (0)