Deploy: 운영 서버 배포

src/main/java/space/space_spring/domain/discord/adapter/in/discord/MessageUpdateEventListener.java

@@ -1,6 +1,7 @@
 package space.space_spring.domain.discord.adapter.in.discord;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
@@ -18,6 +19,7 @@
 import java.util.Optional;
 @Component
 @RequiredArgsConstructor
+@Slf4j
 public class MessageUpdateEventListener extends ListenerAdapter {
     private final DiscordUtil discordUtil;
     private final LoadBoardCachePort loadBoardCachePort;
@@ -48,7 +50,7 @@ public void onMessageUpdate(MessageUpdateEvent event){
             //log.info("not in cache. ignore");
             return;
         }
-
+        //log.info("edit message discord id:"+event.getMessageId().toString());
         if(isComment(event)){
             //Todo map comment update command
             //Todo update comment UseCase call
@@ -57,6 +59,7 @@ public void onMessageUpdate(MessageUpdateEvent event){
                     .content(event.getMessage().getContentRaw())
                     .build();
             updateCommentUseCase.updateCommentFromDiscord(command);
+            return;
         }
 
         //Todo map post update command

src/main/java/space/space_spring/domain/discord/adapter/in/discord/TestTextCommandEventListener.java

@@ -142,11 +142,17 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
                     return;
                 }
 
-                if (msg.getContentRaw().equals("!forumping")) {
+                if (msg.getContentRaw().startsWith("!forumping:")) {
+                    Long channelId = Long.parseLong(msg.getContentRaw().split(":")[1]);
+                    if(!discordUtil.isForumChannel(channelId)){
+                        event.getMessage().reply("is not forum channel").queue();
+                        System.out.println("is not forum channel");
+                        return ;
+                    }
                     CreateDiscordThreadCommand command = CreateDiscordThreadCommand.builder()
-                            .channelDiscordId(1326507142286544957L)
+                            .channelDiscordId(channelId)
                             .guildDiscordId(event.getGuild().getIdLong())
-                            .webHookUrl("https://discordapp.com/api/webhooks/1341258654082404403/SnSx0qzymTEkwuEeVfXMPsUbSj_yiQ0tlCSOX4WOalSKBrdDlBXbz_TMFqnWIyIBy60m")
+                            .webHookUrl(webHookPort.getOrCreate(event.getGuild().getForumChannelById(channelId).getIdLong()))
                             .contentMessage("spring server message test success\nhi\ncontent")
                             .avatarUrl(event.getMember().getEffectiveAvatarUrl())
                             .userName(event.getMember().getEffectiveName())
@@ -232,10 +238,19 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
             String[] commands = msg.getContentRaw().split(":");
             Long msgId = Long.parseLong(commands[1]);
             Long originChannelId=discordUtil.getRootChannelId(event.getChannel());
-            deleteDiscordWebHookMessagePort.deleteInThread(webHookPort.getOrCreate(originChannelId),
+            deleteDiscordWebHookMessagePort.delete(webHookPort.getOrCreate(originChannelId),
                     event.getGuild().getIdLong()
             ,event.getChannel().getIdLong(),msgId);
 
+        }
+        if(msg.getContentRaw().startsWith("!deleteforum:")) {
+            String[] commands = msg.getContentRaw().split(":");
+            Long msgId = Long.parseLong(commands[1]);
+            Long originChannelId=discordUtil.getRootChannelId(event.getChannel());
+            deleteDiscordWebHookMessagePort.deleteThread(webHookPort.getOrCreate(originChannelId),
+                    event.getGuild().getIdLong()
+                    ,event.getChannel().getIdLong(),msgId);
+
         }
         if(msg.getContentRaw().startsWith("!editcomment:")) {
             String[] commands = msg.getContentRaw().split(":");

src/main/java/space/space_spring/domain/discord/adapter/in/discord/TitleAndContentParser.java

@@ -8,6 +8,7 @@
 public class TitleAndContentParser {
     private String title;
     private String content;
+    private static final String EVERYONE_MENTION = "@everyone";
 
     private TitleAndContentParser(String title,String content){
         this.title=title;
@@ -25,12 +26,12 @@ public static TitleAndContentParser parse(String input){
         int index = 0;
 
         // 첫 줄이 비어있으면 다음 줄로 이동
-        while (index < lines.length && lines[index].isBlank()) {
+        while (index < lines.length && !validateTitle(lines[index])) {
             index++;
         }
 
         if (index < lines.length) {
-            title = lines[index]; // 첫 번째 유효한 줄을 title로 설정
+            title = deleteMention(lines[index]); // 첫 번째 유효한 줄을 title로 설정
             index++;
         }
 
@@ -40,5 +41,20 @@ public static TitleAndContentParser parse(String input){
         return new TitleAndContentParser(title,content);
     }
 
+    private static boolean validateTitle(String line){
+        if(line.isEmpty()||line.isBlank()){return false;}
+        if(line.trim().equalsIgnoreCase(EVERYONE_MENTION)){return false;}
 
+        return true;
+    }
+
+    private static String deleteMention(String input){
+        if(input==null){
+            return null;
+        }
+        if(input.contains(EVERYONE_MENTION)){
+            return input.replace(EVERYONE_MENTION, "");
+        }
+        return input;
+    }
 }

src/main/java/space/space_spring/domain/discord/adapter/out/deleteWeHookMessage/DeleteWebHookMessageAdapter.java

@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.entities.WebhookClient;
 import net.dv8tion.jda.api.exceptions.ErrorResponseException;
 import org.springframework.stereotype.Component;
+import space.space_spring.domain.discord.adapter.in.discord.DiscordUtil;
 import space.space_spring.domain.discord.application.port.out.deleteWebHookMessage.DeleteDiscordWebHookMessagePort;
 import space.space_spring.global.exception.CustomException;
 
@@ -20,16 +21,24 @@
 @Slf4j
 public class DeleteWebHookMessageAdapter implements DeleteDiscordWebHookMessagePort {
     private final JDA jda;
+    private final DiscordUtil discordUtil;
     @Override
     public void delete(String webHook,Long guildDiscordId, Long channelDiscordId,Long messageId){
         try {
+            if(discordUtil.isForumChannel(channelDiscordId)){
+                deleteThread(webHook,guildDiscordId,channelDiscordId,messageId);
+                return;
+            }
             WebhookClient.createClient(jda, webHook).deleteMessageById(messageId).complete();
         }catch(ErrorResponseException e){
             if(e.getErrorCode()==10008){
                 throw new CustomException(NOT_PROVIDE_CROSS_DELETE);
             }
         }
     }
+    public void deleteThread(String webHook,Long guildDiscordId, Long channelDiscordId,Long messageId){
+        jda.getThreadChannelById(messageId).delete().complete();
+    }
 
     public void deleteInThread(String webHook,Long guildDiscordId, Long threadDiscordId,Long messageId){
         try {

src/main/java/space/space_spring/domain/discord/application/port/out/deleteWebHookMessage/DeleteDiscordWebHookMessagePort.java

@@ -3,4 +3,5 @@
 public interface DeleteDiscordWebHookMessagePort {
     void delete(String webHook,Long guildDiscordId,Long channelDiscordId,Long messageId);
     void deleteInThread(String webHook,Long guildDiscordId, Long threadDiscordId,Long messageId);
+    void deleteThread(String webHook,Long guildDiscordId,Long channelDiscordId,Long messageId);
 }

src/main/java/space/space_spring/domain/discord/application/service/CreatePostInDiscordService.java

@@ -9,7 +9,6 @@
 //import space.space_spring.domain.discord.application.port.out.CreateDiscordThreadPort;
 import space.space_spring.domain.discord.application.port.out.CreateDiscordWebHookMessageCommand;
 import space.space_spring.domain.discord.application.port.out.CreateDiscordWebHookMessagePort;
-import space.space_spring.domain.post.application.port.in.Tag.LoadTagUseCase;
 import space.space_spring.domain.post.application.port.out.LoadBoardPort;
 import space.space_spring.domain.post.application.port.out.LoadTagPort;
 import space.space_spring.domain.post.domain.AttachmentType;
@@ -21,7 +20,6 @@
 
 import java.util.Comparator;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
 
 import static space.space_spring.global.common.response.status.BaseExceptionResponseStatus.BOARD_NOT_EXIST;
 import static space.space_spring.global.common.response.status.BaseExceptionResponseStatus.DISCORD_THREAD_CREATE_FAIL;
@@ -83,7 +81,7 @@ private CreateDiscordWebHookMessageCommand mapToWebHookMessage(CreatePostInDisco
                                 .map(attachment->attachment.getAttachmentUrl()).toList()
                 )
                 .discordTags(
-                        loadTagPort.loadById(command.getTagIds()).stream().map(tag->tag.getDiscordId()).toList()
+                        loadTagPort.loadAllByIds(command.getTagIds()).stream().map(tag->tag.getDiscordId()).toList()
                 )
                 .build();
     }

src/main/java/space/space_spring/domain/home/adapter/in/web/NoticeSummary.java

@@ -9,9 +9,11 @@
 @AllArgsConstructor
 public class NoticeSummary {
 
+    private Long boardId;
+
     private Long postId;
 
-    private String content;
+    private String title;
 
     private String timePassed;
 }

src/main/java/space/space_spring/domain/home/adapter/in/web/SubscriptionSummary.java

@@ -13,7 +13,9 @@ public class SubscriptionSummary {
 
     private String boardName;
 
-    private String boardTitle;
+    private String postTitle;
+
+    private Long tagId;
 
     private String tagName;
 }

src/main/java/space/space_spring/domain/home/application/service/ReadHomeService.java

@@ -63,8 +63,9 @@ public ReadHomeResult readHome(Long spaceMemberId, Long spaceId) {
 
             for (Post post : noticePosts) {
                 notices.add(new NoticeSummary(
+                        post.getBoardId(),
                         post.getId(),
-                        post.getContent().getValue(),
+                        post.getTitle(),
                         ConvertCreatedDate.setCreatedDate(post.getBaseInfo().getCreatedAt())
                 ));
             }
@@ -75,16 +76,17 @@ public ReadHomeResult readHome(Long spaceMemberId, Long spaceId) {
         List<SubscriptionSummary> subscriptions = new ArrayList<>();
         List<Subscription> subscribedBoards = loadSubscriptionPort.loadBySpaceMember(spaceMemberId);
         for (Subscription subscription : subscribedBoards) {
-            Board board = loadBoardPort.loadById(subscription.getBoardId());
-            Optional<Tag> tag = loadTagPort.loadByBoardId(board.getId());
-
-            // 각 게시판에서 제일 최신 게시물 정보 가져오기
             Optional<Post> latestPost;
             String postTitle = "";
             String tagName = "";
-            if (tag.isPresent()) {
-                tagName = tag.get().getTagName();
-                latestPost = loadPostPort.loadLatestPostByBoardIdAndTagId(board.getId(), tag.get().getId());
+
+            Board board = loadBoardPort.loadById(subscription.getBoardId());
+            Long tagId = subscription.getTagId();
+
+            if (tagId != null) {
+                Tag tag = loadTagPort.loadById(subscription.getTagId());
+                tagName = tag.getTagName();
+                latestPost = loadPostPort.loadLatestPostByBoardIdAndTagId(board.getId(), tag.getId());
                 if (latestPost.isPresent()) postTitle = latestPost.get().getTitle();
             } else {
                 latestPost = loadPostPort.loadLatestPostsByBoardIds(List.of(board.getId()), 1)
@@ -93,7 +95,7 @@ public ReadHomeResult readHome(Long spaceMemberId, Long spaceId) {
                 if (latestPost.isPresent()) postTitle = latestPost.get().getTitle();
             }
 
-            subscriptions.add(new SubscriptionSummary(board.getId(), board.getBoardName(), postTitle, tagName));
+            subscriptions.add(new SubscriptionSummary(board.getId(), board.getBoardName(), postTitle, tagId, tagName));
         }
         result.addSubscription(subscriptions);
 

src/main/java/space/space_spring/domain/post/adapter/in/web/readPostDetail/ResponseOfReadPostDetail.java

@@ -27,12 +27,14 @@ public class ResponseOfReadPostDetail {
 
     private Boolean isLiked;
 
+    private Boolean isPostOwner;
+
     private List<ResponseOfCommentDetail> responseOfCommentDetails;
 
     @Builder
     private ResponseOfReadPostDetail(String creatorName, String creatorProfileImageUrl, String createdAt, String lastModifiedAt,
                                      String title, String content, List<String> attachmentUrls, int likeCount, Boolean isLiked,
-                                     List<ResponseOfCommentDetail> responseOfCommentDetails) {
+                                     Boolean isPostOwner, List<ResponseOfCommentDetail> responseOfCommentDetails) {
         this.creatorName = creatorName;
         this.creatorProfileImageUrl = creatorProfileImageUrl;
         this.createdAt = createdAt;
@@ -42,6 +44,7 @@ private ResponseOfReadPostDetail(String creatorName, String creatorProfileImageU
         this.attachmentUrls = attachmentUrls;
         this.likeCount = likeCount;
         this.isLiked = isLiked;
+        this.isPostOwner = isPostOwner;
         this.responseOfCommentDetails = responseOfCommentDetails;
     }
 
@@ -56,6 +59,7 @@ public static ResponseOfReadPostDetail of(ResultOfReadPostDetail result) {
                 .attachmentUrls(result.getAttachmentUrls())
                 .likeCount(result.getLikeCount())
                 .isLiked(result.getIsLiked())
+                .isPostOwner(result.getIsPostOwner())
                 .responseOfCommentDetails(
                         result.getInfoOfCommentDetails().stream()
                                 .map(ResponseOfCommentDetail::of)

src/main/java/space/space_spring/domain/post/adapter/in/web/readPostList/ReadPostListController.java

@@ -12,6 +12,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import space.space_spring.domain.post.application.port.in.readPostList.ListOfPostSummary;
 import space.space_spring.domain.post.application.port.in.readPostList.ReadPostListUseCase;
+import space.space_spring.global.argumentResolver.jwtLogin.JwtLoginAuth;
 import space.space_spring.global.common.response.BaseResponse;
 
 
@@ -29,13 +30,14 @@ public class ReadPostListController {
             """)
     @GetMapping("/space/{spaceId}/board/{boardId}/post")
     public BaseResponse<ResponseOfReadPostList> readPostList(
+            @JwtLoginAuth Long spaceMemberId,
             @PathVariable Long spaceId,
             @PathVariable Long boardId,
             @RequestParam(required = false) Long tagId,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int size) {
         Pageable pageable = PageRequest.of(page, size, Sort.by("postBase.createdAt").descending());
-        ListOfPostSummary postSummaries = readPostListUseCase.readPostList(boardId, tagId, pageable);
+        ListOfPostSummary postSummaries = readPostListUseCase.readPostList(spaceMemberId, boardId, tagId, pageable);
         return new BaseResponse<>(ResponseOfReadPostList.of(postSummaries));
     }
 }

src/main/java/space/space_spring/domain/post/adapter/in/web/readPostList/ResponseOfPostSummary.java

@@ -23,7 +23,10 @@ public class ResponseOfPostSummary {
 
     private String postImageUrl;
 
-    private ResponseOfPostSummary(Long postId, String title, String content, int likeCount, int commentCount, String createdAt, String creatorNickname, String postImageUrl){
+    private Boolean isPostOwner;
+
+    private ResponseOfPostSummary(Long postId, String title, String content, int likeCount, int commentCount,
+                                  String createdAt, String creatorNickname, String postImageUrl, Boolean isPostOwner){
         this.postId = postId;
         this.title = title;
         this.content = content;
@@ -32,6 +35,7 @@ private ResponseOfPostSummary(Long postId, String title, String content, int lik
         this.createdAt = createdAt;
         this.creatorNickname = creatorNickname;
         this.postImageUrl = postImageUrl;
+        this.isPostOwner = isPostOwner;
     }
 
     public static ResponseOfPostSummary of(PostSummary summaryOfPost) {
@@ -43,7 +47,8 @@ public static ResponseOfPostSummary of(PostSummary summaryOfPost) {
                 summaryOfPost.getCommentCount(),
                 ConvertCreatedDate.setCreatedDate(summaryOfPost.getCreatedAt()),
                 summaryOfPost.getCreatorNickname(),
-                summaryOfPost.getPostImageUrl()
+                summaryOfPost.getPostImageUrl(),
+                summaryOfPost.getIsPostOwner()
         );
     }
 }

src/main/java/space/space_spring/domain/post/adapter/out/persistence/post/PostQueryAdapter.java

@@ -1,6 +1,5 @@
 package space.space_spring.domain.post.adapter.out.persistence.post;
 
-import com.querydsl.core.group.GroupBy;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.JPAExpressions;
@@ -75,7 +74,12 @@ public PostDetailView loadPostDetail(Long postId, Long spaceMemberId) {
                                         .and(postLike.spaceMember.id.eq(spaceMemberId))
                                         .and(postLike.isLiked.eq(true))
                                         .and(postLike.status.eq(BaseStatusType.ACTIVE)))
-                                .exists()
+                                .exists(),
+                        // 스페이스 멤버가 해당 게시글 작성자인지
+                        Expressions.booleanTemplate(
+                                "CASE WHEN {0} = {1} THEN true ELSE false END",
+                                postCreator.id,
+                                spaceMemberId)
                 ))
                 .from(post)
                 .leftJoin(post.postBase, postBase)
@@ -106,6 +110,7 @@ public PostDetailView loadPostDetail(Long postId, Long spaceMemberId) {
                 .attachmentUrls(attachmentUrls)
                 .likeCount(detail.getLikeCount())
                 .isLiked(detail.getIsLiked())
+                .isPostOwner(detail.getIsPostOwner())
                 .build();
     }
 }

src/main/java/space/space_spring/domain/post/adapter/out/persistence/post/custom/PostRepositoryImpl.java

@@ -36,7 +36,8 @@ public Optional<PostJpaEntity> findLatestByBoardIdAndTagId(Long boardId, Long ta
         return Optional.ofNullable(jpaQueryFactory.selectFrom(postJpaEntity)
                 .join(postJpaEntity.postBase, postBaseJpaEntity)
                 .join(postBaseJpaEntity.board, boardJpaEntity)
-                .join(tagJpaEntity).on(tagJpaEntity.board.eq(boardJpaEntity))
+                .join(postTagJpaEntity).on(postTagJpaEntity.postBase.eq(postBaseJpaEntity))
+                .join(tagJpaEntity).on(postTagJpaEntity.tag.eq(tagJpaEntity))
                 .where(
                         boardJpaEntity.id.eq(boardId),
                         tagJpaEntity.id.eq(tagId),