feat: (#317) 마감된 게시글은 무조건 투표 결과가 보이게 하도록 구현

woowacourse-teams · Aug 11, 2023 · 6b82e58 · 6b82e58
1 parent 33b4a3b
commit 6b82e58
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/backend/src/main/java/com/votogether/domain/post/dto/response/PostResponse.java b/backend/src/main/java/com/votogether/domain/post/dto/response/PostResponse.java
@@ -40,7 +40,7 @@ public static PostResponse of(final Post post, final Member loginMember) {
  post.getCreatedAt(),
  post.getDeadline(),
  VoteResponse.of(
- post.getPostOptions().getSelectedOptionId(loginMember),
+ post.getSelectedOptionId(loginMember),
  post.getFinalTotalVoteCount(loginMember),
  getOptions(post, loginMember)
  )

diff --git a/backend/src/main/java/com/votogether/domain/post/dto/response/detail/PostDetailResponse.java b/backend/src/main/java/com/votogether/domain/post/dto/response/detail/PostDetailResponse.java
@@ -47,7 +47,7 @@ public static PostDetailResponse of(final Post post, final Member loginMember) {
  post.getCreatedAt(),
  post.getDeadline(),
  VoteDetailResponse.of(
- post.getPostOptions().getSelectedOptionId(loginMember),
+ post.getSelectedOptionId(loginMember),
  post.getFinalTotalVoteCount(loginMember),
  getOptions(post, loginMember)
  )

diff --git a/backend/src/main/java/com/votogether/domain/post/entity/Post.java b/backend/src/main/java/com/votogether/domain/post/entity/Post.java
@@ -125,6 +125,10 @@ public void validateWriter(final Member member) {
  }
  }
 
+ public long getSelectedOptionId(final Member member) {
+ return this.postOptions.getSelectedOptionId(member);
+ }
+
  public Vote makeVote(final Member voter, final PostOption postOption) {
  validateDeadLine();
  validateVoter(voter);
@@ -181,7 +185,9 @@ public long getFinalTotalVoteCount(final Member loginMember) {
  }
 
  public boolean isVisibleVoteResult(final Member member) {
- return this.postOptions.getSelectedOptionId(member) != 0 || this.writer.equals(member);
+ return this.postOptions.getSelectedOptionId(member) != 0
+ || this.writer.equals(member)
+ || isClosed();
  }
 
  public void blind() {