From 6b82e583cc983f88f8b440bf2f7a3c69e2c94762 Mon Sep 17 00:00:00 2001 From: JunH Date: Fri, 11 Aug 2023 10:06:38 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20(#317)=20=EB=A7=88=EA=B0=90=EB=90=9C=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=EC=9D=80=20=EB=AC=B4=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=ED=88=AC=ED=91=9C=20=EA=B2=B0=EA=B3=BC=EA=B0=80=20?= =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EA=B2=8C=20=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../votogether/domain/post/dto/response/PostResponse.java | 2 +- .../post/dto/response/detail/PostDetailResponse.java | 2 +- .../main/java/com/votogether/domain/post/entity/Post.java | 8 +++++++- 3 files changed, 9 insertions(+), 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 index 01aaa8af1..f561c3f2d 100644 --- 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 index 6ae5e98d7..11d1c9e80 100644 --- 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 index f1c2d129e..1919b7bd9 100644 --- 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() {