Merge pull request #247 from THIP-TextHip/hotfix/vote

fix: 기록장 투표 정보 퍼센트가 아닌 득표수로 표시되도록 수정

Author: ljh130334

src/components/memory/RecordItem/PollRecord.tsx

@@ -91,8 +91,9 @@ const PollRecord = ({ content, pollOptions, postId, shouldBlur = false, onVoteUp
             return {
               ...opt,
               percentage: updatedItem.percentage,
+              count: updatedItem.count,
               isVoted: updatedItem.isVoted,
-              isHighest: updatedItem.percentage === Math.max(...response.data.voteItems.map(item => item.percentage))
+              isHighest: updatedItem.count === Math.max(...response.data.voteItems.map(item => item.count))
             };
           }
           return opt;
@@ -142,8 +143,17 @@ const PollRecord = ({ content, pollOptions, postId, shouldBlur = false, onVoteUp
     }
   };
 
-  // 아무도 투표하지 않았는지 확인 (모든 옵션이 0%인지 확인)
-  const hasVotes = currentOptions.some(option => option.percentage > 0);
+  // 아무도 투표하지 않았는지 확인 (모든 옵션이 0표인지 확인)
+  const hasVotes = currentOptions.some(option => option.count > 0);
+
+  // 전체 투표수 계산
+  const totalVotes = currentOptions.reduce((sum, option) => sum + option.count, 0);
+
+  // 각 옵션의 퍼센트 계산 (애니메이션용)
+  const getPercentage = (count: number) => {
+    if (totalVotes === 0) return 0;
+    return (count / totalVotes) * 100;
+  };
 
   return (
     <PollSection ref={pollRef}>
@@ -162,7 +172,7 @@ const PollRecord = ({ content, pollOptions, postId, shouldBlur = false, onVoteUp
           >
             <PollBar>
               <PollBarFill
-                percentage={hasVotes ? option.percentage : 0}
+                percentage={hasVotes ? getPercentage(option.count) : 0}
                 isHighest={hasVotes && option.isHighest}
                 animate={hasVotes && animate}
                 delay={index * 200} // 각 옵션마다 200ms 지연
@@ -177,7 +187,7 @@ const PollRecord = ({ content, pollOptions, postId, shouldBlur = false, onVoteUp
               </PollText>
               {hasVotes && (
                 <PollPercentage isHighest={hasVotes && option.isHighest}>
-                  {option.percentage}%
+                  {option.count}표
                 </PollPercentage>
               )}
             </PollContent>

src/pages/memory/Memory.tsx

@@ -31,14 +31,18 @@ const convertPostToRecord = (post: Post): Record => {
     isWriter: post.isWriter,
     isLiked: post.isLiked,
     isLocked: post.isLocked, // 블러 처리 여부 추가
-    pollOptions: post.voteItems.map((item, index) => ({
-      id: item.voteItemId.toString(),
-      text: item.itemName,
-      percentage: item.percentage,
-      isHighest: index === 0,
-      voteItemId: item.voteItemId,
-      isVoted: item.isVoted,
-    })),
+    pollOptions: post.voteItems.map((item) => {
+      const maxCount = Math.max(...post.voteItems.map(v => v.count || 0));
+      return {
+        id: item.voteItemId.toString(),
+        text: item.itemName,
+        percentage: item.percentage,
+        count: item.count || 0,
+        isHighest: (item.count || 0) === maxCount && maxCount > 0,
+        voteItemId: item.voteItemId,
+        isVoted: item.isVoted,
+      };
+    }),
   };
 };
 

src/types/memory.ts

@@ -3,6 +3,7 @@ export interface VoteItem {
   voteItemId: number;
   itemName: string;
   percentage: number;
+  count: number;
   isVoted: boolean;
 }
 
@@ -82,6 +83,7 @@ export interface PollOption {
   id: string;
   text: string;
   percentage: number;
+  count: number;
   isHighest: boolean;
   voteItemId: number; // 투표 API에 필요한 ID
   isVoted: boolean; // 현재 사용자가 투표했는지 여부

src/types/record.ts

@@ -35,6 +35,7 @@ export interface VoteItemResult {
   voteItemId: number; // 투표 아이템 ID
   itemName: string; // 투표 옵션 이름
   percentage: number; // 득표율
+  count: number; // 득표수
   isVoted: boolean; // 현재 사용자가 투표했는지 여부
 }