feat: 비회원 게시글 조회 가능 및 selectedOptionId null 반환 구현

JECT-Study · Mar 19, 2024 · a192ef1 · a192ef1
1 parent 7e7fcca
commit a192ef1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/main/java/balancetalk/module/post/application/PostService.java b/src/main/java/balancetalk/module/post/application/PostService.java
@@ -70,11 +70,11 @@ private List<File> getImages(PostRequest postRequestDto) {
     public Page<PostResponse> findAll(String token, Pageable pageable) {
         // TODO: 검색, 정렬, 마감 기능 추가
         Page<Post> posts = postRepository.findAll(pageable);
-        Member member = getCurrentMember(memberRepository);
 
         if (token == null) {
-            return posts.map(post -> PostResponse.fromEntity(post, member, false, false, false));
+            return posts.map(post -> PostResponse.fromEntity(post, null, false, false, false));
         }
+        Member member = getCurrentMember(memberRepository);
 
         return posts.map(post -> PostResponse.fromEntity(post,
                 member,
@@ -86,13 +86,14 @@ public Page<PostResponse> findAll(String token, Pageable pageable) {
     @Transactional(readOnly = true)
     public PostResponse findById(Long postId, String token) {
         Post post = getCurrentPost(postId);
-        Member member = getCurrentMember(memberRepository);
 
         if (token == null) {
             post.increaseViews();
-            return PostResponse.fromEntity(post, member, false, false, false);
+            return PostResponse.fromEntity(post, null, false, false, false);
         }
 
+        Member member = getCurrentMember(memberRepository);
+
         if (member.getRole() == Role.USER) {
              post.increaseViews();
         }
@@ -143,14 +144,15 @@ private Post getCurrentPost(Long postId) {
     public List<PostResponse> findBestPosts(String token) {
         PageRequest limit = PageRequest.of(0, BEST_POSTS_SIZE);
         List<Post> posts = postRepository.findBestPosts(limit);
-        Member member = getCurrentMember(memberRepository);
 
         if (token == null) {
             return posts.stream()
-                    .map(post -> PostResponse.fromEntity(post, member, false, false, false))
+                    .map(post -> PostResponse.fromEntity(post, null, false, false, false))
                     .collect(Collectors.toList());
         }
 
+        Member member = getCurrentMember(memberRepository);
+
         return posts.stream()
                 .map(post -> PostResponse.fromEntity(post,
                         member,

diff --git a/src/main/java/balancetalk/module/post/dto/PostResponse.java b/src/main/java/balancetalk/module/post/dto/PostResponse.java
@@ -96,6 +96,10 @@ private static List<BalanceOptionDto> getBalanceOptions(Post post) {
     }
 
     private static Long getSelectedOptionId(Post post, Member member) {
+        if (member == null) {
+            return null;
+        }
+
         return post.getOptions().stream()
                 .filter(option -> Optional.ofNullable(option.getVotes())
                         .orElseGet(Collections::emptyList)