[deploy] 운영서버로 배포 25/08/16

.github/workflows/cd-workflow-prod.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'main'
+      - 'develop'
 
 permissions:
   contents: read

Dockerfile

@@ -1,6 +1,7 @@
 FROM openjdk:17
 
 ARG PORT=8000
+ENV JAVA_TOOL_OPTIONS="-Xms512m -Xmx2g -XX:+ExitOnOutOfMemoryError"
 
 EXPOSE ${PORT}
 

src/main/java/konkuk/thip/comment/adapter/in/web/response/CommentForSinglePostResponse.java

@@ -19,6 +19,7 @@ public record RootCommentDto(
             int likeCount,
             boolean isLike,
             boolean isDeleted,  // 삭제된 댓글인지 아닌지
+            boolean isWriter,
             List<ReplyDto> replyList
     ) {
         public record ReplyDto(
@@ -32,7 +33,8 @@ public record ReplyDto(
                 String postDate,        // 댓글 작성 시각 (~ 전 형식)
                 String content,
                 int likeCount,
-                boolean isLike
+                boolean isLike,
+                boolean isWriter
         ) {}
 
         /**
@@ -52,6 +54,7 @@ public static RootCommentDto createDeletedRootCommentDto(List<ReplyDto> replyLis
                     0,
                     false,
                     true,       // true
+                    false,
                     replyList);
         }
     }

src/main/java/konkuk/thip/comment/application/mapper/CommentQueryMapper.java

@@ -24,37 +24,45 @@ public interface CommentQueryMapper {
     @Mapping(target = "isDeleted", constant = "false")
     @Mapping(target = "postDate", expression = "java(DateUtil.formatBeforeTime(root.createdAt()))")
     @Mapping(target = "aliasName", source = "root.alias")
-    CommentForSinglePostResponse.RootCommentDto toRoot(CommentQueryDto root, @Context Set<Long> likedCommentIds);
+    @Mapping(target = "isWriter", source = "root.creatorId", qualifiedByName = "isWriter")
+    CommentForSinglePostResponse.RootCommentDto toRoot(CommentQueryDto root, @Context Set<Long> likedCommentIds, @Context Long userId);
 
     /**
      * 개별 답글 매핑
      */
     @Mapping(target = "isLike", expression = "java(likedCommentIds.contains(child.commentId()))")
     @Mapping(target = "postDate", expression = "java(DateUtil.formatBeforeTime(child.createdAt()))")
     @Mapping(target = "aliasName", source = "child.alias")
-    CommentForSinglePostResponse.RootCommentDto.ReplyDto toReply(CommentQueryDto child, @Context Set<Long> likedCommentIds);
+    @Mapping(target = "isWriter", source = "child.creatorId", qualifiedByName = "isWriter")
+    CommentForSinglePostResponse.RootCommentDto.ReplyDto toReply(CommentQueryDto child, @Context Set<Long> likedCommentIds, @Context Long userId);
 
     /**
      * 답글 리스트 헬퍼
      */
-    default List<CommentForSinglePostResponse.RootCommentDto.ReplyDto> mapReplies(List<CommentQueryDto> children, @Context Set<Long> likedCommentIds) {
+    default List<CommentForSinglePostResponse.RootCommentDto.ReplyDto> mapReplies(List<CommentQueryDto> children, @Context Set<Long> likedCommentIds, @Context Long userId) {
         if (children == null || children.isEmpty()) {
             return Collections.emptyList();
         }
         return children.stream()
-                .map(child -> toReply(child, likedCommentIds))
+                .map(child -> toReply(child, likedCommentIds, userId))
                 .toList();
     }
 
-    default CommentForSinglePostResponse.RootCommentDto toRootCommentResponseWithChildren(CommentQueryDto root, List<CommentQueryDto> children, @Context Set<Long> likedCommentIds) {
-        List<CommentForSinglePostResponse.RootCommentDto.ReplyDto> replyDtos = mapReplies(children, likedCommentIds);
+    default CommentForSinglePostResponse.RootCommentDto toRootCommentResponseWithChildren(
+            CommentQueryDto root, List<CommentQueryDto> children, @Context Set<Long> likedCommentIds, @Context Long userId) {
+        List<CommentForSinglePostResponse.RootCommentDto.ReplyDto> replyDtos = mapReplies(children, likedCommentIds, userId);
 
         if (root.isDeleted()) {     // 삭제된 루트 & children 이 존재하는 경우
             return CommentForSinglePostResponse.RootCommentDto.createDeletedRootCommentDto(replyDtos);
         }
 
-        CommentForSinglePostResponse.RootCommentDto rootDto = toRoot(root, likedCommentIds);
+        CommentForSinglePostResponse.RootCommentDto rootDto = toRoot(root, likedCommentIds, userId);
         rootDto.replyList().addAll(replyDtos);
         return rootDto;
     }
+
+    @Named("isWriter")
+    default boolean isWriter(Long creatorId, @Context Long userId) {
+        return creatorId != null && creatorId.equals(userId);
+    }
 }

src/main/java/konkuk/thip/comment/application/service/CommentShowAllService.java

@@ -44,7 +44,7 @@ public CommentForSinglePostResponse showAllCommentsOfPost(CommentShowAllQuery qu
         Set<Long> likedCommentIds = commentLikeQueryPort.findCommentIdsLikedByUser(allCommentIds, query.userId());
 
         // 4. response 매핑
-        List<CommentForSinglePostResponse.RootCommentDto> rootCommentResponses = buildRootCommentResponses(rootsInOrder, childrenMap, likedCommentIds);
+        List<CommentForSinglePostResponse.RootCommentDto> rootCommentResponses = buildRootCommentResponses(rootsInOrder, childrenMap, likedCommentIds, query.userId());
 
         return new CommentForSinglePostResponse(
                 rootCommentResponses,
@@ -66,15 +66,16 @@ private Set<Long> parseAllCommentIds(Map<Long, List<CommentQueryDto>> childrenMa
     private List<CommentForSinglePostResponse.RootCommentDto> buildRootCommentResponses(
             List<CommentQueryDto> roots,
             Map<Long, List<CommentQueryDto>> childrenMap,
-            Set<Long> likedCommentIds) {
+            Set<Long> likedCommentIds,
+            Long userId) {
         List<CommentForSinglePostResponse.RootCommentDto> responses = new ArrayList<>();
         for (CommentQueryDto root : roots) {
             List<CommentQueryDto> children = childrenMap.getOrDefault(root.commentId(), Collections.emptyList());
             // 삭제된 루트 댓글이면서 자식이 없는 경우 건너뛰기
             if (root.isDeleted() && children.isEmpty()) {
                 continue;
             }
-            responses.add(commentQueryMapper.toRootCommentResponseWithChildren(root, children, likedCommentIds));
+            responses.add(commentQueryMapper.toRootCommentResponseWithChildren(root, children, likedCommentIds, userId));
         }
         return responses;
     }

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -99,6 +99,8 @@ public enum ErrorCode implements ResponseCode {
     VOTE_NOT_FOUND(HttpStatus.NOT_FOUND, 110000, "존재하지 않는 VOTE 입니다."),
     VOTE_CANNOT_BE_OVERVIEW(HttpStatus.BAD_REQUEST, 110001, "총평이 될 수 없는 VOTE 입니다."),
     INVALID_VOTE_PAGE_RANGE(HttpStatus.BAD_REQUEST, 110002, "VOTE의 page 값이 유효하지 않습니다."),
+    VOTE_ACCESS_FORBIDDEN(HttpStatus.FORBIDDEN, 110003, "투표 접근 권한이 없습니다."),
+
 
     /**
      * 120000 : voteItem error
@@ -189,6 +191,11 @@ public enum ErrorCode implements ResponseCode {
     COMMENT_DELETE_FORBIDDEN(HttpStatus.FORBIDDEN, 190005, "댓글 삭제 권한이 없습니다."),
     COMMENT_COUNT_UNDERFLOW(HttpStatus.BAD_REQUEST, 190007, "댓글 수는 0 이하로 감소할 수 없습니다."),
 
+    /**
+     * 195000 : AttendanceCheck error
+     */
+    ATTENDANCE_CHECK_WRITE_LIMIT_EXCEEDED(HttpStatus.BAD_REQUEST, 195000, "오늘의 한마디 작성 가능 횟수를 초과하였습니다."),
+
     ;
 
     private final HttpStatus httpStatus;

src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java

@@ -75,7 +75,8 @@ public enum SwaggerResponseDescription {
     ))),
 
     ROOM_SEARCH(new LinkedHashSet<>(Set.of(
-                INVALID_ROOM_SEARCH_SORT
+            INVALID_ROOM_SEARCH_SORT,
+            CATEGORY_NOT_MATCH
     ))),
     ROOM_PASSWORD_CHECK(new LinkedHashSet<>(Set.of(
             ROOM_NOT_FOUND,
@@ -159,6 +160,11 @@ public enum SwaggerResponseDescription {
             VOTE_ITEM_NOT_VOTED_CANNOT_CANCEL,
             VOTE_ITEM_COUNT_CANNOT_BE_NEGATIVE
     ))),
+    VOTE_DELETE(new LinkedHashSet<>(Set.of(
+            ROOM_ACCESS_FORBIDDEN,
+            VOTE_NOT_FOUND,
+            VOTE_ACCESS_FORBIDDEN
+    ))),
 
 
     // FEED
@@ -281,6 +287,14 @@ public enum SwaggerResponseDescription {
             RECENT_SEARCH_NOT_ADDED_BY_USER
     ))),
 
+    // Attendance Check
+    ATTENDANCE_CHECK_CREATE(new LinkedHashSet<>(Set.of(
+            ROOM_ACCESS_FORBIDDEN,
+            ROOM_NOT_FOUND,
+            USER_NOT_FOUND,
+            ATTENDANCE_CHECK_WRITE_LIMIT_EXCEEDED
+    ))),
+
   ;
     private final Set<ErrorCode> errorCodeList;
     SwaggerResponseDescription(Set<ErrorCode> errorCodeList) {

src/main/java/konkuk/thip/config/OpenApiConfig.java

@@ -46,14 +46,24 @@ public class OpenApiConfig {
 
     @Value("${server.http-url}") private String httpUrl;
 
+    @Value(("${server.profile}")) private String profile;
+
     @Bean
     public OpenAPI openAPI() {
+        List<Server> serverList = switch (profile) {
+            case "prod" -> List.of(new Server().url(httpsUrl).description("HTTPS 배포 서버"));
+            case "dev" -> List.of(
+                    new Server().url(httpUrl).description("HTTP 개발 서버"),
+                    new Server().url(httpsUrl).description("HTTPS 배포 서버"),
+                    new Server().url("http://localhost:8080").description("로컬 개발 서버")
+            );
+            default -> List.of(
+                    new Server().url("http://localhost:8080").description("로컬 개발 서버")
+            );
+        };
+
         return new OpenAPI()
-                .servers(List.of(
-                        new Server().url(httpsUrl).description("HTTPS 배포 서버"),
-                        new Server().url(httpUrl).description("HTTP IP"),
-                        new Server().url("http://localhost:8080").description("로컬 개발 서버")
-                ))
+                .servers(serverList)
                 .components(setComponents())
                 .addSecurityItem(setSecurityItems());
     }

src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowAllResponse.java

@@ -23,6 +23,7 @@ public record FeedDto(
             int likeCount,
             int commentCount,
             boolean isSaved,
-            boolean isLiked
+            boolean isLiked,
+            boolean isWriter
     ) { }
 }

src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowByUserResponse.java

@@ -28,6 +28,7 @@ public record FeedDto(
             int commentCount,
             boolean isPublic,
             boolean isSaved,
-            boolean isLiked
+            boolean isLiked,
+            boolean isWriter
     ) { }
 }

src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedShowMineResponse.java

@@ -17,6 +17,7 @@ public record FeedDto(
             String[] contentUrls,
             int likeCount,
             int commentCount,
-            boolean isPublic
+            boolean isPublic,
+            boolean isWriter
     ) { }
 }