feat: Apply API changes (kookmin-sw#75)

kookmin-sw · May 16, 2024 · 774ac99 · 774ac99
1 parent d7635ee
commit 774ac99
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 69 deletions.
diff --git a/src/app/pages/shared-post-page.tsx b/src/app/pages/shared-post-page.tsx
@@ -9,11 +9,7 @@ import { CardToggleButton, ImageGrid } from '@/components/shared-post-page';
 import { useAuthValue, useUserData } from '@/features/auth';
 import { useCreateChatRoom } from '@/features/chat';
 import { fromAddrToCoord } from '@/features/geocoding';
-import {
-  useFollowUser,
-  useFollowingListData,
-  useUnfollowUser,
-} from '@/features/profile';
+import { useFollowUser, useUnfollowUser } from '@/features/profile';
 import {
   useDeleteSharedPost,
   useDormitorySharedPost,
@@ -365,6 +361,7 @@ const styles = {
     padding: 0.5rem 1.5rem;
     justify-content: center;
     align-items: center;
+    align-self: stretch;
     gap: 0.25rem;
     flex: 1 0 0;
 
@@ -499,21 +496,6 @@ export function SharedPostPage({
       enabled: type === 'dormitory' && auth?.accessToken != null,
     });
 
-  const [selected, setSelected] = useState<
-    | {
-        memberId: string;
-        profileImage: string;
-      }
-    | undefined
-  >(
-    sharedPost != null
-      ? {
-          memberId: sharedPost.data.publisherAccount.memberId,
-          profileImage: sharedPost.data.publisherAccount.profileImageFileName,
-        }
-      : undefined,
-  );
-
   const { data: userData } = useUserData(auth?.accessToken != null);
   const [userId, setUserId] = useState<string>('');
 
@@ -523,31 +505,6 @@ export function SharedPostPage({
     }
   }, [userData]);
 
-  const { mutate: scrapPost } = useScrapSharedPost();
-
-  const followList = useFollowingListData();
-  const [isFollowed, setIsFollowed] = useState(
-    followList.data?.data.followingList[
-      sharedPost?.data.publisherAccount.memberId ?? ''
-    ] != null,
-  );
-
-  const { mutate: follow } = useFollowUser(
-    sharedPost?.data.publisherAccount.memberId ?? '',
-  );
-  const { mutate: unfollow } = useUnfollowUser(
-    sharedPost?.data.publisherAccount.memberId ?? '',
-  );
-
-  useEffect(() => {
-    if (selected != null || sharedPost == null) return;
-
-    setSelected({
-      memberId: sharedPost.data.publisherAccount.memberId,
-      profileImage: sharedPost.data.publisherAccount.profileImageFileName,
-    });
-  }, [selected, sharedPost]);
-
   useEffect(() => {
     if (sharedPost?.data.address.roadAddress != null) {
       fromAddrToCoord({ query: sharedPost?.data.address.roadAddress }).then(
@@ -597,6 +554,41 @@ export function SharedPostPage({
   else if (post?.data.roomMateFeatures.mateAge === '0') mateAge = '동갑';
   else mateAge = `±${post.data.roomMateFeatures.mateAge}`;
 
+  const [selected, setSelected] = useState<
+    | {
+        memberId: string;
+        nickname: string;
+        profileImageFileName: string;
+        birthYear: string;
+        isScrapped: boolean;
+      }
+    | undefined
+  >(post != null ? post.data.participants[0] : undefined);
+
+  useEffect(() => {
+    if (post == null || selected != null) return;
+
+    setSelected(post.data.participants[0]);
+  }, [selected, post]);
+
+  const { mutate: scrapPost } = useScrapSharedPost();
+
+  const { mutate: follow } = useFollowUser(selected?.memberId ?? '');
+  const { mutate: unfollow } = useUnfollowUser(selected?.memberId ?? '');
+
+  const [followList, setFollowList] = useState<Record<string, boolean>>({});
+
+  useEffect(() => {
+    if (post == null) return;
+
+    const { participants } = post.data;
+    const newFollowList: Record<string, boolean> = {};
+    participants.forEach(({ memberId, isScrapped }) => {
+      newFollowList[memberId] = isScrapped;
+    });
+    setFollowList(newFollowList);
+  }, [post]);
+
   if (isLoading || post == null) return <></>;
 
   return (
@@ -730,36 +722,31 @@ export function SharedPostPage({
         </styles.postContainer>
         <styles.mateContainer>
           <styles.mates>
-            {post.data.participants.map(
-              ({ memberId, profileImageFileName }, index) => (
-                <styles.mate
-                  key={memberId}
-                  $selected={memberId === selected?.memberId}
-                  $zIndex={index}
-                  src={profileImageFileName}
-                  onClick={() => {
-                    setSelected({
-                      memberId,
-                      profileImage: profileImageFileName,
-                    });
-                  }}
-                />
-              ),
-            )}
+            {post.data.participants.map((participant, index) => (
+              <styles.mate
+                key={participant.memberId}
+                $selected={participant.memberId === selected?.memberId}
+                $zIndex={index}
+                src={participant.profileImageFileName}
+                onClick={() => {
+                  setSelected(participant);
+                }}
+              />
+            ))}
           </styles.mates>
           <styles.selectedMateContainer>
             <styles.profile>
               <CircularProfileImage
                 diameter={110}
                 percentage={50}
-                url={post.data.publisherAccount.profileImageFileName}
+                url={selected?.profileImageFileName ?? ''}
               />
               <styles.profileInfo>
-                <p className="name">{post.data.publisherAccount.nickname}</p>
+                <p className="name">{selected?.nickname}</p>
                 <div>
                   <p>
-                    {post.data.publisherAccount.birthYear != null
-                      ? `${getAge(+post.data.publisherAccount.birthYear)}세`
+                    {selected?.birthYear != null
+                      ? `${getAge(+selected.birthYear)}세`
                       : new Date().getFullYear()}
                   </p>
                 </div>
@@ -776,11 +763,15 @@ export function SharedPostPage({
               <div>
                 <styles.showProfileButton>프로필 보기</styles.showProfileButton>
                 <Bookmark
-                  marked={isFollowed}
+                  marked={followList[selected?.memberId ?? ''] ?? false}
                   onToggle={() => {
-                    if (isFollowed) unfollow();
+                    if (
+                      selected == null ||
+                      followList[selected.memberId] == null
+                    )
+                      return;
+                    if (followList[selected.memberId]) unfollow();
                     else follow();
-                    setIsFollowed(prev => !prev);
                   }}
                   hasBorder
                   color="#888"

diff --git a/src/entities/shared-post/shared-post.type.ts b/src/entities/shared-post/shared-post.type.ts
@@ -52,7 +52,13 @@ export interface SharedPost {
     mateAge?: string;
     options: string; // 프런트에서 파싱 필요.
   };
-  participants: Array<{ memberId: string; profileImageFileName: string }>;
+  participants: Array<{
+    memberId: string;
+    nickname: string;
+    profileImageFileName: string;
+    birthYear: string;
+    isScrapped: boolean;
+  }>;
   roomImages: Array<{
     fileName: string;
     isThumbnail: boolean;
@@ -149,7 +155,10 @@ export interface DormitorySharedPost {
   };
   participants: Array<{
     memberId: string;
+    nickname: string;
     profileImageFileName: string;
+    birthYear: string;
+    isScrapped: boolean;
   }>;
   roomImages: Array<{
     fileName: string;