Skip to content

Commit f777dd5

Browse files
authored
Merge pull request Kernel360#302 from Kernel360/develop
Merge develop to main
2 parents 1c86abd + 72ddfac commit f777dd5

File tree

70 files changed

+2101
-29
lines changed

Some content is hidden

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

70 files changed

+2101
-29
lines changed

admin-api/src/main/java/com/kernelsquare/adminapi/domain/notice/dto/NoticeDto.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.time.LocalDateTime;
44

55
import com.fasterxml.jackson.annotation.JsonFormat;
6+
import com.kernelsquare.core.constants.TimeResponseFormat;
67
import com.kernelsquare.core.validation.annotations.EnumValue;
78
import com.kernelsquare.domainmysql.domain.notice.entity.Notice;
89

@@ -66,9 +67,9 @@ public record FindResponse(
6667
String noticeToken,
6768
String noticeContent,
6869
Notice.NoticeCategory noticeCategory,
69-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'")
70+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = TimeResponseFormat.PATTERN)
7071
LocalDateTime createdDate,
71-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'")
72+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = TimeResponseFormat.PATTERN)
7273
LocalDateTime modifiedDate
7374
) {
7475
}
@@ -78,9 +79,9 @@ public record FindAllResponse(
7879
String noticeTitle,
7980
String noticeToken,
8081
Notice.NoticeCategory noticeCategory,
81-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'")
82+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = TimeResponseFormat.PATTERN)
8283
LocalDateTime createdDate,
83-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'")
84+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = TimeResponseFormat.PATTERN)
8485
LocalDateTime modifiedDate
8586
) {
8687
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.kernelsquare.core.common_response.error.code;
2+
3+
import com.kernelsquare.core.common_response.service.code.CodingMeetingCommentServiceStatus;
4+
import com.kernelsquare.core.common_response.service.code.ServiceStatus;
5+
import lombok.RequiredArgsConstructor;
6+
import org.springframework.http.HttpStatus;
7+
8+
@RequiredArgsConstructor
9+
public enum CodingMeetingCommentErrorCode implements ErrorCode{
10+
CODIMG_MEETING_COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, CodingMeetingCommentServiceStatus.CODING_MEETING_COMMENT_NOT_FOUND,
11+
"모각코 댓글을 찾을 수 없습니다.");
12+
13+
private final HttpStatus httpStatus;
14+
private final ServiceStatus serviceStatus;
15+
private final String msg;
16+
17+
@Override
18+
public HttpStatus getStatus() {
19+
return httpStatus;
20+
}
21+
22+
@Override
23+
public Integer getCode() {
24+
return serviceStatus.getServiceStatus();
25+
}
26+
27+
@Override
28+
public String getMsg() {
29+
return msg;
30+
}
31+
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package com.kernelsquare.core.common_response.error.code;
2+
3+
import com.kernelsquare.core.common_response.service.code.CodingMeetingServiceStatus;
4+
import com.kernelsquare.core.common_response.service.code.ServiceStatus;
5+
import lombok.RequiredArgsConstructor;
6+
import org.springframework.http.HttpStatus;
7+
8+
@RequiredArgsConstructor
9+
public enum CodingMeetingErrorCode implements ErrorCode {
10+
CODING_MEETING_NOT_FOUND(HttpStatus.NOT_FOUND, CodingMeetingServiceStatus.CODING_MEETING_NOT_FOUND,
11+
"모각코 게시글을 찾을 수 없습니다."),
12+
CODING_MEETING_ALREADY_EXIST(HttpStatus.BAD_REQUEST, CodingMeetingServiceStatus.CODING_MEETING_ALREADY_EXIST,
13+
"진행중인 모각코가 이미 존재합니다."),
14+
FILTER_PARAMETER_NOT_VALID(HttpStatus.BAD_REQUEST, CodingMeetingServiceStatus.FILTER_PARAMETER_NOT_VALID,
15+
"유효하지 않은 필터 파라미터 입니다.");
16+
17+
private final HttpStatus httpStatus;
18+
private final ServiceStatus serviceStatus;
19+
private final String msg;
20+
21+
@Override
22+
public HttpStatus getStatus() {
23+
return httpStatus;
24+
}
25+
26+
@Override
27+
public Integer getCode() {
28+
return serviceStatus.getServiceStatus();
29+
}
30+
31+
@Override
32+
public String getMsg() {
33+
return msg;
34+
}
35+
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.kernelsquare.core.common_response.response.code;
2+
3+
import com.kernelsquare.core.common_response.service.code.CodingMeetingCommentServiceStatus;
4+
import com.kernelsquare.core.common_response.service.code.ServiceStatus;
5+
import lombok.RequiredArgsConstructor;
6+
import org.springframework.http.HttpStatus;
7+
8+
@RequiredArgsConstructor
9+
public enum CodingMeetingCommentResponseCode implements ResponseCode {
10+
CODING_MEETING_COMMENT_ALL_FOUND(HttpStatus.OK, CodingMeetingCommentServiceStatus.CODING_MEETING_COMMENT_ALL_FOUND, "모든 모각코 댓글 조회 성공"),
11+
CODING_MEETING_COMMENT_CREATED(HttpStatus.OK, CodingMeetingCommentServiceStatus.CODING_MEETING_COMMENT_CREATED, "모각코 댓글 생성 성공"),
12+
CODING_MEETING_COMMENT_UPDATED(HttpStatus.OK, CodingMeetingCommentServiceStatus.CODING_MEETING_COMMENT_UPDATED, "모각코 댓글 수정 성공"),
13+
CODING_MEETING_COMMENT_DELETED(HttpStatus.OK, CodingMeetingCommentServiceStatus.CODIMG_MEETING_COMMENT_DELETED, "모각코 댓글 삭제 성공");
14+
15+
private final HttpStatus httpStatus;
16+
private final ServiceStatus serviceStatus;
17+
private final String msg;
18+
19+
@Override
20+
public HttpStatus getStatus() {
21+
return httpStatus;
22+
}
23+
24+
@Override
25+
public Integer getCode() {
26+
return serviceStatus.getServiceStatus();
27+
}
28+
29+
@Override
30+
public String getMsg() {
31+
return msg;
32+
}
33+
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package com.kernelsquare.core.common_response.response.code;
2+
3+
import com.kernelsquare.core.common_response.service.code.CodingMeetingServiceStatus;
4+
import com.kernelsquare.core.common_response.service.code.ServiceStatus;
5+
import lombok.RequiredArgsConstructor;
6+
import org.springframework.http.HttpStatus;
7+
8+
@RequiredArgsConstructor
9+
public enum CodingMeetingResponseCode implements ResponseCode{
10+
CODING_MEETING_FOUND(HttpStatus.OK, CodingMeetingServiceStatus.CODING_MEETING_FOUND, "모각코 조회 성공"),
11+
CODING_MEETING_ALL_FOUND(HttpStatus.OK, CodingMeetingServiceStatus.CODING_MEETING_ALL_FOUND, "모각코 전체 조회 성공"),
12+
CODING_MEETING_UPDATED(HttpStatus.OK, CodingMeetingServiceStatus.CODING_MEETING_UPDATED, "모각코 수정 성공"),
13+
CODING_MEETING_DELETED(HttpStatus.OK, CodingMeetingServiceStatus.CODING_MEETING_DELETED, "모각코 삭제 성공"),
14+
CODING_MEETING_CREATED(HttpStatus.OK, CodingMeetingServiceStatus.CODING_MEETING_CREATED, "모각코 생성 성공"),
15+
CODING_MEETING_CLOSED(HttpStatus.OK, CodingMeetingServiceStatus.CODING_MEETING_CLOSED, "모각코 마감 성공");
16+
17+
private final HttpStatus httpStatus;
18+
private final ServiceStatus serviceStatus;
19+
private final String msg;
20+
21+
@Override
22+
public HttpStatus getStatus() {
23+
return httpStatus;
24+
}
25+
26+
@Override
27+
public Integer getCode() {
28+
return serviceStatus.getServiceStatus();
29+
}
30+
31+
@Override
32+
public String getMsg() {
33+
return msg;
34+
}
35+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.kernelsquare.core.common_response.service.code;
2+
3+
import lombok.RequiredArgsConstructor;
4+
5+
@RequiredArgsConstructor
6+
public enum CodingMeetingCommentServiceStatus implements ServiceStatus {
7+
//error
8+
CODING_MEETING_COMMENT_NOT_FOUND(5200),
9+
10+
//success
11+
CODING_MEETING_COMMENT_ALL_FOUND(5240),
12+
CODING_MEETING_COMMENT_CREATED(5243),
13+
CODING_MEETING_COMMENT_UPDATED(5242),
14+
CODIMG_MEETING_COMMENT_DELETED(5241);
15+
16+
private final Integer code;
17+
18+
@Override
19+
public Integer getServiceStatus() {return code;}
20+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.kernelsquare.core.common_response.service.code;
2+
3+
import lombok.RequiredArgsConstructor;
4+
5+
@RequiredArgsConstructor
6+
public enum CodingMeetingServiceStatus implements ServiceStatus {
7+
//error
8+
CODING_MEETING_NOT_FOUND(5100),
9+
CODING_MEETING_ALREADY_EXIST(5101),
10+
FILTER_PARAMETER_NOT_VALID(5102),
11+
//success
12+
CODING_MEETING_FOUND(5140),
13+
CODING_MEETING_ALL_FOUND(5141),
14+
CODING_MEETING_UPDATED(5142),
15+
CODING_MEETING_DELETED(5143),
16+
CODING_MEETING_CREATED(5144),
17+
CODING_MEETING_CLOSED(5145);
18+
19+
private final Integer code;
20+
21+
@Override
22+
public Integer getServiceStatus() {return code;}
23+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.kernelsquare.core.constants;
2+
3+
public class TimeResponseFormat {
4+
public static final String PATTERN = "yyyy-MM-dd'T'HH:mm:ss'Z'";
5+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.kernelsquare.core.type;
2+
3+
import lombok.Getter;
4+
import lombok.RequiredArgsConstructor;
5+
6+
@RequiredArgsConstructor
7+
public enum CodingMeetingReadType {
8+
ALL("all"), OPEN("open"), CLOSED("closed");
9+
10+
private final String parameter;
11+
12+
public String getParameter() {
13+
return parameter;
14+
}
15+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.kernelsquare.core.util;
2+
3+
import org.springframework.beans.factory.annotation.Value;
4+
import org.springframework.stereotype.Component;
5+
6+
import lombok.Getter;
7+
8+
@Component
9+
public class ImageComponentCore {
10+
@Getter
11+
private static String baseUrl;
12+
13+
@Value("${custom.domain.image.base-url}")
14+
public void setBaseUrl(String baseUrl) {
15+
ImageComponentCore.baseUrl = baseUrl;
16+
}
17+
18+
}

0 commit comments

Comments
 (0)