Merge pull request #120 from FixLog/develop

Develop

Author: youngseo22

src/main/java/com/example/FixLog/dto/post/PostDto.java

@@ -10,6 +10,7 @@
 public class PostDto {
     private Long userId;
     private String nickname;
+    private String writerProfileImage;
     private String postTitle;
     private String coverImageUrl;
     private String problem;

src/main/java/com/example/FixLog/mock/TagMockDataInitializer.java

@@ -35,6 +35,7 @@ public void run(String... args) {
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(BIG_CATEGORY, "backend"));
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(BIG_CATEGORY, "machine-learning"));
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(BIG_CATEGORY, "web"));
+        addIfNotExist(tagsToInsert, existingTagNames, Tag.of(BIG_CATEGORY, "etc"));
 
         // MAJOR_CATEGORY
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MAJOR_CATEGORY, "django"));
@@ -46,6 +47,7 @@ public void run(String... args) {
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MAJOR_CATEGORY, "node.js"));
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MAJOR_CATEGORY, "react"));
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MAJOR_CATEGORY, "react-native"));
+        addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MAJOR_CATEGORY, "etc"));
 
         // MIDDLE_CATEGORY
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MIDDLE_CATEGORY, "css"));
@@ -56,6 +58,7 @@ public void run(String... args) {
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MIDDLE_CATEGORY, "haskell"));
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MIDDLE_CATEGORY, "python"));
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MIDDLE_CATEGORY, "c"));
+        addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MIDDLE_CATEGORY, "etc"));
 
         // MINOR_CATEGORY
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MINOR_CATEGORY, "null-pointer-exception", "NullPointerException"));
@@ -71,6 +74,7 @@ public void run(String... args) {
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MINOR_CATEGORY, "404-error", "404 Not Found"));
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MINOR_CATEGORY, "permission-error", "Permission Error"));
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MINOR_CATEGORY, "out-of-memory", "OutOfMemoryError"));
+        addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MINOR_CATEGORY, "etc", "보기에 없는 에러 태그를 선택합니다."));
 
 
         if (!tagsToInsert.isEmpty()) {

src/main/java/com/example/FixLog/service/PostService.java

@@ -241,6 +241,7 @@ public PostResponseDto viewPost(Long postId){
         PostDto postInfo = new PostDto(
                 currentPost.getUserId().getUserId(),
                 currentPost.getUserId().getNickname(),
+                currentPost.getUserId().getProfileImageUrl(),
                 currentPost.getPostTitle(),
                 getDefaultCover(currentPost.getCoverImage()),
                 currentPost.getProblem(),
@@ -256,28 +257,28 @@ public PostResponseDto viewPost(Long postId){
                         .collect(toList())
         );
 
-        String nickname; String profileImageUrl;
+        String nickname; String userProfileImage;
         boolean isLiked; boolean isMarked;
         if (optionalMember.isPresent()){
             Member member = optionalMember.get();
             nickname = member.getNickname();
             String imageUrl = member.getProfileImageUrl();
-            profileImageUrl = getDefaultProfile(imageUrl);
+            userProfileImage = getDefaultProfile(imageUrl);
 
             isLiked = currentPost.getPostLikes().stream()
                     .anyMatch(postLike -> postLike.getUserId().equals(member));
             isMarked = currentPost.getBookmarks().stream()
                     .anyMatch(bookmark -> bookmark.getFolderId().getUserId().equals(member));
         } else {
             nickname = "로그인하지 않았습니다.";
-            profileImageUrl = "https://fixlogsmwubucket.s3.ap-northeast-2.amazonaws.com/default/DefaultImage.png"; // 비로그인 기본 이미지
+            userProfileImage = "https://fixlogsmwubucket.s3.ap-northeast-2.amazonaws.com/default/DefaultImage.png"; // 비로그인 기본 이미지
             isLiked = false;
             isMarked = false;
         }
 
         LocalDate createdAt = currentPost.getCreatedAt().toLocalDate();
 
-        return new PostResponseDto(postInfo, createdAt, nickname, profileImageUrl, isLiked, isMarked);
+        return new PostResponseDto(postInfo, createdAt, nickname, userProfileImage, isLiked, isMarked);
     }
 
     // 게시글 좋아요