회원이 마감 완료된 게시글에 투표할 때 failed to Fetch가 나타나요, 마감된 게시글 투표 통계 보이도록 수정 (#401

) * fix: (#399) 마감된 게시글에 투표했을 때 사용자에게 투표할 수 없다는 문구 출력 * fix: (#399) 마감된 게시글은 투표 통계가 보이도록 수정 isWriter라는 변수명을 더 넓은 범위를 뜻하는 isStatisticsVisible로 변경
woowacourse-teams · Sep 12, 2023 · 14806c1 · 14806c1
1 parent 88f998c
commit 14806c1
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 23 deletions.
diff --git a/frontend/src/components/common/Post/index.tsx b/frontend/src/components/common/Post/index.tsx
@@ -45,12 +45,20 @@ export default function Post({ postInfo, isPreview }: PostProps) {
 
  const isActive = !checkClosedPost(deadline);
 
+ const isStatisticsVisible =
+ writer.id === loggedInfo.id || !isActive || voteInfo.selectedOptionId !== POST.NOT_VOTE;
+
  const handleVoteClick = (newOptionId: number) => {
  if (!loggedInfo.isLoggedIn) {
  openToast('투표를 하려면 로그인 후에 이용하실 수 있습니다.');
  return;
  }
 
+ if (!isActive) {
+ openToast('마감된 게시글에는 투표를 할 수 없습니다.');
+ return;
+ }
+
  if (writer.nickname === loggedInfo.userInfo?.nickname) return;
 
  if (voteInfo.selectedOptionId === newOptionId) return;
@@ -130,7 +138,7 @@ export default function Post({ postInfo, isPreview }: PostProps) {
  )}
  </S.DetailLink>
  <WrittenVoteOptionList
- isWriter={writer.id === loggedInfo.id}
+ isStatisticsVisible={isStatisticsVisible}
  selectedOptionId={voteInfo.selectedOptionId}
  handleVoteClick={handleVoteClick}
  isPreview={isPreview}

diff --git a/...mponents/optionList/WrittenVoteOptionList/WrittenVoteOption/WrittenVoteOption.stories.tsx b/...mponents/optionList/WrittenVoteOptionList/WrittenVoteOption/WrittenVoteOption.stories.tsx
@@ -26,7 +26,7 @@ export const Select: Story = {
  peopleCount={2}
  percent={70.9}
  isSelected={true}
- isVoted={true}
+ isStatisticsVisible={true}
  imageUrl=""
  />
  </WrittenVoteWrapper>
@@ -44,7 +44,7 @@ export const NotSelectAndLongText: Story = {
  percent={80}
  peopleCount={6}
  isSelected={false}
- isVoted={true}
+ isStatisticsVisible={true}
  imageUrl=""
  />
  </WrittenVoteWrapper>
@@ -63,7 +63,7 @@ export const ImageAndSelect: Story = {
  percent={80}
  peopleCount={6}
  isSelected={true}
- isVoted={true}
+ isStatisticsVisible={true}
  />
  </WrittenVoteWrapper>
  ),
@@ -80,7 +80,7 @@ export const NotVote: Story = {
  percent={0}
  peopleCount={0}
  isSelected={false}
- isVoted={false}
+ isStatisticsVisible={false}
  imageUrl=""
  />
  </WrittenVoteWrapper>
@@ -99,7 +99,7 @@ export const ImageAndNotVote: Story = {
  percent={0}
  peopleCount={0}
  isSelected={false}
- isVoted={false}
+ isStatisticsVisible={false}
  />
  </WrittenVoteWrapper>
  ),
@@ -117,7 +117,7 @@ export const PreviewContent: Story = {
  percent={0}
  peopleCount={0}
  isSelected={false}
- isVoted={false}
+ isStatisticsVisible={false}
  />
  </WrittenVoteWrapper>
  ),
@@ -135,7 +135,7 @@ export const DetailContent: Story = {
  percent={0}
  peopleCount={0}
  isSelected={false}
- isVoted={false}
+ isStatisticsVisible={false}
  />
  </WrittenVoteWrapper>
  ),
@@ -152,7 +152,7 @@ export const NoImageAndDetailContent: Story = {
  percent={60}
  peopleCount={8}
  isSelected={true}
- isVoted={true}
+ isStatisticsVisible={true}
  imageUrl=""
  />
  </WrittenVoteWrapper>
@@ -171,7 +171,7 @@ export const ImageAndSelectAndDetailContent: Story = {
  percent={60}
  peopleCount={8}
  isSelected={true}
- isVoted={true}
+ isStatisticsVisible={true}
  />
  </WrittenVoteWrapper>
  ),

diff --git a/frontend/src/components/optionList/WrittenVoteOptionList/WrittenVoteOption/index.tsx b/frontend/src/components/optionList/WrittenVoteOptionList/WrittenVoteOption/index.tsx
@@ -4,7 +4,7 @@ import * as S from './style';
 interface WrittenVoteOptionProps {
  handleVoteClick: () => void;
  text: string;
- isVoted: boolean;
+ isStatisticsVisible: boolean;
  peopleCount: number;
  percent: number;
  isSelected: boolean;
@@ -16,7 +16,7 @@ interface WrittenVoteOptionProps {
 export default function WrittenVoteOption({
  handleVoteClick,
  text,
- isVoted,
+ isStatisticsVisible,
  peopleCount,
  percent,
  isSelected,
@@ -40,7 +40,7 @@ export default function WrittenVoteOption({
  ) : (
  <S.DetailContent aria-label="선택지 내용">{text}</S.DetailContent>
  )}
- {isVoted && (
+ {isStatisticsVisible && (
  <>
  <S.ProgressContainer aria-label={''}>
  <ProgressBar percent={percent} isSelected={isSelected} />

diff --git a/frontend/src/components/optionList/WrittenVoteOptionList/WrittenVoteOptionList.stories.tsx b/frontend/src/components/optionList/WrittenVoteOptionList/WrittenVoteOptionList.stories.tsx
@@ -89,7 +89,7 @@ export const PreviewNotVoted: Story = {
  render: () => (
  <WrittenVoteWrapper>
  <WrittenVoteOptionList
- isWriter={true}
+ isStatisticsVisible={true}
  selectedOptionId={MOCK_NOT_VOTED_DATA.selectedOptionId}
  handleVoteClick={() => {}}
  isPreview={true}
@@ -103,7 +103,7 @@ export const PreviewVoted: Story = {
  render: () => (
  <WrittenVoteWrapper>
  <WrittenVoteOptionList
- isWriter={true}
+ isStatisticsVisible={true}
  selectedOptionId={MOCK_VOTED_DATA.selectedOptionId}
  handleVoteClick={() => {}}
  isPreview={true}
@@ -117,7 +117,7 @@ export const DetailNotVoted: Story = {
  render: () => (
  <WrittenVoteWrapper>
  <WrittenVoteOptionList
- isWriter={true}
+ isStatisticsVisible={true}
  selectedOptionId={MOCK_NOT_VOTED_DATA.selectedOptionId}
  handleVoteClick={() => {}}
  isPreview={false}
@@ -131,7 +131,7 @@ export const DetailVoted: Story = {
  render: () => (
  <WrittenVoteWrapper>
  <WrittenVoteOptionList
- isWriter={true}
+ isStatisticsVisible={true}
  selectedOptionId={MOCK_VOTED_DATA.selectedOptionId}
  handleVoteClick={() => {}}
  isPreview={false}

diff --git a/frontend/src/components/optionList/WrittenVoteOptionList/index.tsx b/frontend/src/components/optionList/WrittenVoteOptionList/index.tsx
@@ -1,21 +1,19 @@
 import { WrittenVoteOptionType } from '@type/post';
 
-import { POST } from '@constants/vote';
-
 import * as S from './style';
 import WrittenVoteOption from './WrittenVoteOption';
 
 interface WrittenVoteOptionListProps {
  isPreview: boolean;
- isWriter: boolean;
+ isStatisticsVisible: boolean;
  selectedOptionId: number;
  voteOptionList: WrittenVoteOptionType[];
  handleVoteClick: (newOptionId: number) => void;
 }
 
 export default function WrittenVoteOptionList({
  isPreview,
- isWriter,
+ isStatisticsVisible,
  voteOptionList,
  selectedOptionId,
  handleVoteClick,
@@ -28,7 +26,7 @@ export default function WrittenVoteOptionList({
  key={voteOption.id}
  {...voteOption}
  isPreview={isPreview}
- isVoted={selectedOptionId !== POST.NOT_VOTE || isWriter}
+ isStatisticsVisible={isStatisticsVisible}
  isSelected={selectedOptionId === voteOption.id}
  handleVoteClick={() => handleVoteClick(voteOption.id)}
  />

diff --git a/frontend/src/pages/VoteStatisticsPage/OptionStatistics/index.tsx b/frontend/src/pages/VoteStatisticsPage/OptionStatistics/index.tsx
@@ -50,7 +50,7 @@ export default function OptionStatistics({
  key={voteOption.id}
  {...voteOption}
  isPreview={false}
- isVoted={true}
+ isStatisticsVisible={true}
  isSelected={isSelectedOption}
  handleVoteClick={toggleOptionStatistics}
  />