refactor: add field to response

JNU-econovation · Nov 26, 2024 · 302fbf8 · 302fbf8
1 parent 35091c9
commit 302fbf8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/src/main/java/gymmi/photoboard/controller/PhotoBoardController.java b/src/main/java/gymmi/photoboard/controller/PhotoBoardController.java
@@ -31,9 +31,10 @@ public ResponseEntity<IdResponse> createPhotoFeed(
 
     @GetMapping("/photos/{photoId}")
     public ResponseEntity<PhotoFeedDetailResponse> seePhotoFeed(
+            @Logined User user,
             @PathVariable(name = "photoId") Long photoFeedId
     ) {
-        PhotoFeedDetailResponse response = photoFeedService.getPhotoFeed(photoFeedId);
+        PhotoFeedDetailResponse response = photoFeedService.getPhotoFeed(user, photoFeedId);
         return ResponseEntity.ok().body(response);
     }
 

diff --git a/src/main/java/gymmi/photoboard/domain/entity/PhotoFeed.java b/src/main/java/gymmi/photoboard/domain/entity/PhotoFeed.java
@@ -53,4 +53,8 @@ public void checkWriter(User user) {
             throw new NotHavePermissionException(ErrorCode.NOT_PHOTO_FEED_WRITER);
         }
     }
+
+    public boolean isWriter(User user) {
+        return this.user.equals(user);
+    }
 }
diff --git a/src/main/java/gymmi/photoboard/response/PhotoFeedDetailResponse.java b/src/main/java/gymmi/photoboard/response/PhotoFeedDetailResponse.java
@@ -15,16 +15,19 @@ public class PhotoFeedDetailResponse {
     private final LocalDateTime createdAt;
     private final Boolean isModified;
     private final String nickname;
+    private final Boolean isMine;
+    private final Boolean hasMyThumbsUp;
 
-    public PhotoFeedDetailResponse(PhotoFeed photoFeed, String photoImageUrl) {
+    public PhotoFeedDetailResponse(PhotoFeed photoFeed, String photoImageUrl, boolean isMine, boolean hasMyThumbsUp) {
         this.profileImageUrl = photoFeed.getUser().getProfileImageName();
         this.photoImageUrl = photoImageUrl;
         this.comment = photoFeed.getComment();
         this.thumpsUpCount = photoFeed.getThumpsUpCount();
         this.createdAt = photoFeed.getCreatedAt();
         this.isModified = photoFeed.isModified();
         this.nickname = photoFeed.getUser().getNickname();
+        this.isMine = isMine;
+        this.hasMyThumbsUp = hasMyThumbsUp;
     }
-
 }
 
diff --git a/src/main/java/gymmi/photoboard/service/PhotoFeedService.java b/src/main/java/gymmi/photoboard/service/PhotoFeedService.java
@@ -43,12 +43,14 @@ public Long createPhotoFeed(User loginedUser, CreatePhotoFeedRequest request) {
     }
 
     @Transactional(readOnly = true)
-    public PhotoFeedDetailResponse getPhotoFeed(Long photoFeedId) {
+    public PhotoFeedDetailResponse getPhotoFeed(User loginedUser, Long photoFeedId) {
         PhotoFeed photoFeed = photoFeedRepository.getByPhotoFeedId(photoFeedId);
         PhotoFeedImage photoFeedImage = photoFeedImageRepository.getByPhotoFeedId(photoFeedId);
-
         String photoImagePresignedUrl = s3Service.getPresignedUrl(PhotoFeedImage.IMAGE_USE, photoFeedImage.getFilename());
-        return new PhotoFeedDetailResponse(photoFeed, photoImagePresignedUrl);
+        if (thumbsUpRepository.findByUserId(loginedUser.getId()).isEmpty()) {
+            return new PhotoFeedDetailResponse(photoFeed, photoImagePresignedUrl, photoFeed.isWriter(loginedUser), false);
+        }
+        return new PhotoFeedDetailResponse(photoFeed, photoImagePresignedUrl, photoFeed.isWriter(loginedUser), true);
     }
 
     @Transactional

diff --git a/src/test/java/gymmi/photoboard/service/PhotoFeedServiceTest.java b/src/test/java/gymmi/photoboard/service/PhotoFeedServiceTest.java
@@ -64,7 +64,7 @@ class PhotoFeedServiceTest extends IntegrationTest {
         PhotoFeedImage photoFeedImage = persister.persistPhotoFeedImage(photoFeed);
 
         // when
-        PhotoFeedDetailResponse result = photoFeedService.getPhotoFeed(photoFeed.getId());
+        PhotoFeedDetailResponse result = photoFeedService.getPhotoFeed(user, photoFeed.getId());
 
         // then
         assertThat(result.getIsModified()).isFalse();
@@ -73,6 +73,8 @@ class PhotoFeedServiceTest extends IntegrationTest {
         assertThat(result.getProfileImageUrl()).isEqualTo(user.getProfileImageName());
         assertThat(result.getComment()).isEqualTo(photoFeed.getComment());
         assertThat(result.getNickname()).isEqualTo(user.getNickname());
+        assertThat(result.getIsMine()).isEqualTo(true);
+        assertThat(result.getHasMyThumbsUp()).isEqualTo(false);
     }
 
     @Test