Merge pull request #122 from Codiary-UMC-6th/feature/#111-set-post-re…

…presentation-image Feat: post 대표 이미지 설정 기능 구현
Codiary-UMC-6th · Aug 9, 2024 · e3d2e22 · e3d2e22
2 parents 9dd808d + d41261d
commit e3d2e22
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 4 deletions.
diff --git a/src/main/java/com/codiary/backend/global/converter/MemberConverter.java b/src/main/java/com/codiary/backend/global/converter/MemberConverter.java
@@ -94,9 +94,9 @@ public static MemberResponseDTO.BookmarkDTO toBookmarkDTO(Bookmark bookmark) {
                 .memberId(bookmark.getMember().getMemberId())
                 .bookmarkId(bookmark.getId())
                 .postId(bookmark.getPost().getPostId())
-                // Post의 첫 번째 사진을 가져온다
-                // 나중에 postFile이 존재하지 않을 경우 나오는 기본 사진 처리를 해줘야 한다
-                .photoUrl(bookmark.getPost().getPostFileList().get(0).getFileUrl())
+                .thumbnailImageUrl((bookmark.getPost().getThumbnailImage() != null)
+                        ? bookmark.getPost().getThumbnailImage().getFileUrl()
+                        : "")
                 .postTitle(bookmark.getPost().getPostTitle())
                 .nickname(bookmark.getPost().getMember().getNickname())
                 .postBody(bookmark.getPost().getPostBody())

diff --git a/src/main/java/com/codiary/backend/global/converter/PostConverter.java b/src/main/java/com/codiary/backend/global/converter/PostConverter.java
@@ -21,6 +21,7 @@ public static Post toPost(PostRequestDTO.CreatePostRequestDTO request) {
                 .postStatus(request.getPostStatus())
                 //.categoriesList(categories)
                 .postAccess(request.getPostAccess())
+                .thumbnailImage(null)
                 .build();
     }
 
@@ -41,6 +42,9 @@ public static PostResponseDTO.CreatePostResultDTO toCreateResultDTO(Post post) {
                         .map(author -> author.getMember().getMemberId())
                         .collect(Collectors.toSet()))
                 .postAccess(post.getPostAccess())
+                .thumbnailImageUrl((post.getThumbnailImage() != null)
+                        ? post.getThumbnailImage().getFileUrl()
+                        : "")
                 .postFileList(PostFileConverter.toPostFileListDTO(post.getPostFileList()))
                 .build();
     }
@@ -63,6 +67,9 @@ public static PostResponseDTO.UpdatePostResultDTO toUpdatePostResultDTO(Post pos
                         .map(author -> author.getMember().getMemberId())
                         .collect(Collectors.toSet()))
                 .postAccess(post.getPostAccess())
+                .thumbnailImageUrl((post.getThumbnailImage() != null)
+                        ? post.getThumbnailImage().getFileUrl()
+                        : "")
                 .postFileList(PostFileConverter.toPostFileListDTO(post.getPostFileList()))
                 .build();
     }
@@ -86,6 +93,9 @@ public static PostResponseDTO.PostPreviewDTO toPostPreviewDTO(Post post) {
                         .map(author -> author.getMember().getMemberId())
                         .collect(Collectors.toSet()))
                 .postAccess(post.getPostAccess())
+                .thumbnailImageUrl((post.getThumbnailImage() != null)
+                        ? post.getThumbnailImage().getFileUrl()
+                        : "")
                 .postFileList(PostFileConverter.toPostFileListDTO(post.getPostFileList()))
                 .createdAt(post.getCreatedAt())
                 .updatedAt(post.getUpdatedAt())
@@ -127,6 +137,9 @@ public static PostResponseDTO.MemberPostPreviewDTO toMemberPostPreviewDTO(Post p
                         .map(author -> author.getMember().getMemberId())
                         .collect(Collectors.toSet()))
                 .postAccess(post.getPostAccess())
+                .thumbnailImageUrl((post.getThumbnailImage() != null)
+                        ? post.getThumbnailImage().getFileUrl()
+                        : "")
                 .postFileList(PostFileConverter.toPostFileListDTO(post.getPostFileList()))
                 .createdAt(post.getCreatedAt())
                 .updatedAt(post.getUpdatedAt())
@@ -168,6 +181,9 @@ public static PostResponseDTO.TeamPostPreviewDTO toTeamPostPreviewDTO(Post post)
                         .map(author -> author.getMember().getMemberId())
                         .collect(Collectors.toSet()))
                 .postAccess(post.getPostAccess())
+                .thumbnailImageUrl((post.getThumbnailImage() != null)
+                        ? post.getThumbnailImage().getFileUrl()
+                        : "")
                 .postFileList(PostFileConverter.toPostFileListDTO(post.getPostFileList()))
                 .createdAt(post.getCreatedAt())
                 .updatedAt(post.getUpdatedAt())
@@ -210,6 +226,9 @@ public static PostResponseDTO.MemberPostInProjectPreviewDTO toMemberPostInProjec
                         .map(author -> author.getMember().getMemberId())
                         .collect(Collectors.toSet()))
                 .postAccess(post.getPostAccess())
+                .thumbnailImageUrl((post.getThumbnailImage() != null)
+                        ? post.getThumbnailImage().getFileUrl()
+                        : "")
                 .postFileList(PostFileConverter.toPostFileListDTO(post.getPostFileList()))
                 .createdAt(post.getCreatedAt())
                 .updatedAt(post.getUpdatedAt())
@@ -251,6 +270,9 @@ public static PostResponseDTO.TeamPostInProjectPreviewDTO toTeamPostInProjectPre
                         .map(author -> author.getMember().getMemberId())
                         .collect(Collectors.toSet()))
                 .postAccess(post.getPostAccess())
+                .thumbnailImageUrl((post.getThumbnailImage() != null)
+                        ? post.getThumbnailImage().getFileUrl()
+                        : "")
                 .postFileList(PostFileConverter.toPostFileListDTO(post.getPostFileList()))
                 .createdAt(post.getCreatedAt())
                 .updatedAt(post.getUpdatedAt())
@@ -292,6 +314,9 @@ public static PostResponseDTO.MemberPostInTeamPreviewDTO toMemberPostInTeamPrevi
                         .map(author -> author.getMember().getMemberId())
                         .collect(Collectors.toSet()))
                 .postAccess(post.getPostAccess())
+                .thumbnailImageUrl((post.getThumbnailImage() != null)
+                        ? post.getThumbnailImage().getFileUrl()
+                        : "")
                 .postFileList(PostFileConverter.toPostFileListDTO(post.getPostFileList()))
                 .createdAt(post.getCreatedAt())
                 .updatedAt(post.getUpdatedAt())
@@ -335,6 +360,9 @@ public static PostResponseDTO.PostAdjacentDTO.PostAdjacentPreviewDTO toPostAdjac
                         .map(author -> author.getMember().getMemberId())
                         .collect(Collectors.toSet()))
                 .postAccess(post.getPostAccess())
+                .thumbnailImageUrl((post.getThumbnailImage() != null)
+                        ? post.getThumbnailImage().getFileUrl()
+                        : "")
                 .postFileList(PostFileConverter.toPostFileListDTO(post.getPostFileList()))
                 .createdAt(post.getCreatedAt())
                 .updatedAt(post.getUpdatedAt())
@@ -369,6 +397,9 @@ public static PostResponseDTO.UpdatePostResultDTO toSetPostCategoriesResultDTO(P
                         .map(author -> author.getMember().getMemberId())
                         .collect(Collectors.toSet()))
                 .postAccess(post.getPostAccess())
+                .thumbnailImageUrl((post.getThumbnailImage() != null)
+                        ? post.getThumbnailImage().getFileUrl()
+                        : "")
                 .postFileList(PostFileConverter.toPostFileListDTO(post.getPostFileList()))
                 .build();
     }

diff --git a/src/main/java/com/codiary/backend/global/domain/entity/Post.java b/src/main/java/com/codiary/backend/global/domain/entity/Post.java
@@ -43,6 +43,10 @@ public class Post extends BaseEntity {
   @Column(name = "post_body", nullable = false, columnDefinition = "varchar(500)")
   private String postBody;
 
+  @OneToOne
+  @JoinColumn(name = "thumbnail_image_id")
+  private PostFile thumbnailImage;
+
   @Builder.Default
   @Enumerated(EnumType.STRING)
   @Column(name = "post_access", nullable = false, columnDefinition = "varchar(500)")

diff --git a/src/main/java/com/codiary/backend/global/service/PostService/PostCommandServiceImpl.java b/src/main/java/com/codiary/backend/global/service/PostService/PostCommandServiceImpl.java
@@ -74,6 +74,17 @@ public Post createPost(PostRequestDTO.CreatePostRequestDTO request) {
             }
         }
 
+        // 대표 사진 설정
+        String thumbnailImageName = request.getThumbnailImageName();
+        for (PostFile postFile : tempPost.getPostFileList()) {
+            if (postFile.getFileName().equals(thumbnailImageName)) {
+                tempPost.setThumbnailImage(postFile);
+            }
+        }
+        if (tempPost.getPostFileList().size() != 0 && tempPost.getThumbnailImage() == null) {
+            tempPost.setThumbnailImage(tempPost.getPostFileList().get(0));
+        }
+
         Post savedPost = postRepository.save(tempPost);
         return savedPost;
     }
@@ -101,6 +112,17 @@ public Post updatePost(Long postId, PostRequestDTO.UpdatePostDTO request) {
             }
         }
 
+        // 대표 사진 설정
+        String thumbnailImageName = request.getThumbnailImageName();
+        for (PostFile postFile : updatePost.getPostFileList()) {
+            if (postFile.getFileName() == thumbnailImageName) {
+                updatePost.setThumbnailImage(postFile);
+            }
+        }
+        if (updatePost.getPostFileList().size() != 0 && updatePost.getThumbnailImage() == null) {
+            updatePost.setThumbnailImage(updatePost.getPostFileList().get(0));
+        }
+
         return postRepository.save(updatePost);
     }
 

diff --git a/src/main/java/com/codiary/backend/global/web/dto/Member/MemberResponseDTO.java b/src/main/java/com/codiary/backend/global/web/dto/Member/MemberResponseDTO.java
@@ -43,7 +43,7 @@ public static class BookmarkDTO {
         Long memberId;
         Long bookmarkId;
         Long postId;
-        String photoUrl;
+        String thumbnailImageUrl;
         String postTitle;
         String nickname;
         String postBody;

diff --git a/src/main/java/com/codiary/backend/global/web/dto/Post/PostRequestDTO.java b/src/main/java/com/codiary/backend/global/web/dto/Post/PostRequestDTO.java
@@ -22,6 +22,7 @@ public static class CreatePostRequestDTO {
         private Boolean postStatus;
         //private Set<String> postCategory;
         private PostAccess postAccess;
+        private String thumbnailImageName;
         private List<MultipartFile> postFiles;
     }
 
@@ -36,6 +37,7 @@ public static class UpdatePostDTO {
         private Boolean postStatus;
         //private Set<String> postCategory;
         private PostAccess postAccess;
+        private String thumbnailImageName;
         private List<MultipartFile> addedPostFiles;
     }
 

diff --git a/src/main/java/com/codiary/backend/global/web/dto/Post/PostResponseDTO.java b/src/main/java/com/codiary/backend/global/web/dto/Post/PostResponseDTO.java
@@ -25,6 +25,7 @@ public static class CreatePostResultDTO {
         Long projectId;
         String postTitle;
         String postBody;
+        String thumbnailImageUrl;
         Boolean postStatus;
         String postCategory;
         Set<Long> coauthorIds;
@@ -43,6 +44,7 @@ public static class UpdatePostResultDTO {
         Long projectId;
         String postTitle;
         String postBody;
+        String thumbnailImageUrl;
         Boolean postStatus;
         String postCategory;
         Set<Long> coauthorIds;
@@ -61,6 +63,7 @@ public static class PostPreviewDTO { // Post 조회
         Long projectId;
         String postTitle;
         String postBody;
+        String thumbnailImageUrl;
         Boolean postStatus;
         String postCategory;
         Set<Long> coauthorIds;
@@ -94,6 +97,7 @@ public static class MemberPostPreviewDTO { // 저자별 Post 조회
         Long projectId;
         String postTitle;
         String postBody;
+        String thumbnailImageUrl;
         Boolean postStatus;
         String postCategory;
         Set<Long> coauthorIds;
@@ -128,6 +132,7 @@ public static class TeamPostPreviewDTO { // 팀별 Post 조회
         Long projectId;
         String postTitle;
         String postBody;
+        String thumbnailImageUrl;
         Boolean postStatus;
         String postCategory;
         Set<Long> coauthorIds;
@@ -161,6 +166,7 @@ public static class MemberPostInProjectPreviewDTO { // 프로젝트별 저자의
         Long teamId;
         String postTitle;
         String postBody;
+        String thumbnailImageUrl;
         Boolean postStatus;
         String postCategory;
         Set<Long> coauthorIds;
@@ -194,6 +200,7 @@ public static class TeamPostInProjectPreviewDTO { // 프로젝트별 팀의 Post
         Long memberId;
         String postTitle;
         String postBody;
+        String thumbnailImageUrl;
         Boolean postStatus;
         String postCategory;
         Set<Long> coauthorIds;
@@ -227,6 +234,7 @@ public static class MemberPostInTeamPreviewDTO { // 팀별 멤버의 Post 조회
         Long projectId;
         String postTitle;
         String postBody;
+        String thumbnailImageUrl;
         Boolean postStatus;
         String postCategory;
         Set<Long> coauthorIds;
@@ -271,6 +279,7 @@ public static class PostAdjacentPreviewDTO {
             Long projectId;
             String postTitle;
             String postBody;
+            String thumbnailImageUrl;
             Boolean postStatus;
             String postCategory;
             Set<Long> coauthorIds;