Merge pull request #360 from checkmo2025/fix-354

[fix] 모임 조설정페이지 수정 + [style] 책장 프로필없을 때 기본프로필

Author: hongik-luke

src/apis/clubMeeting/GetmeetingMember.ts

@@ -0,0 +1,11 @@
+import type { GetMeetingMembersPayload, GetMeetingMembersResult } from "../../types/Meeting/GetmeetingMember";
+import { axiosInstance } from "../axiosInstance";
+
+export async function getMeetingMembers(
+  { meetingId, cursorId = null, size = 15 }: GetMeetingMembersPayload
+): Promise<GetMeetingMembersResult> {
+  return await axiosInstance.get(
+    `/meetings/${meetingId}/members`,
+    { params: { cursorId, size } }
+  );
+}

src/components/Meeting/teamMapper.ts

@@ -1,4 +1,4 @@
-import type { ClubMember } from "../../types/Club/GetClubMembers";
+import type { MeetingMemberItem } from "../../types/Meeting/GetmeetingMember";
 import type { MeetingTeamMutateRequest } from "../../types/Meeting/MeetingTeamManage";
 
 // "1조" → 1, "A조" → 1, 그 외엔 groups 인덱스 기반
@@ -13,18 +13,16 @@ export function toTeamNumber(groupName: string, groups: string[]) {
   return idx >= 0 ? idx + 1 : 0;
 }
 
-export function buildMeetingTeamMutateRequest(  groupSelections: Record<string, ClubMember[]>,
-  groups: string[]
+export function buildMeetingTeamMutateRequest(
+  groupSelections: Record<string, MeetingMemberItem[]>
 ): MeetingTeamMutateRequest {
   return {
-    teamMemberDTOList: Object.entries(groupSelections)
-      .map(([groupName, members]) => ({
-        teamNumber: toTeamNumber(groupName, groups),
-        nicknameList: members.map(m => m.basicInfo.nickname)
-          
-
-      }))
-      .filter(x => x.teamNumber > 0 && x.nicknameList.length > 0)
+    teamMemberDTOList: Object.entries(groupSelections).map(([groupName, members]) => {
+      return {
+        teamNumber: toTeamNumber(groupName, Object.keys(groupSelections)),
+        nicknameList: members.map(member => member.memberInfo.nickname),
+      };
+    }),
 
   };
 }

src/components/Shelf/ReviewSection.tsx

@@ -149,7 +149,7 @@ export default function ReviewSection({
       <div className="flex py-2 shadow rounded-2xl border-2 border-[var(--sub-color-2-brown,#EAE5E2)] w-full mb-3  transition-transform duration-300 hover:shadow-md">
         <div className="flex items-center justify-between h-[48px] w-[270px] flex-none ml-[12px] mr-[34px]">
           <img
-            src={currentUser.profileImageUrl}
+            src={currentUser.profileImageUrl || '/assets/ix_user-profile-filled.svg'}
             className="w-[48px] h-[48px] rounded-full object-cover"
             alt="프로필"
           />

src/hooks/Meeting/useGetInfinityMember.ts

@@ -0,0 +1,29 @@
+import { useInfiniteQuery } from '@tanstack/react-query';
+import type { GetMeetingMembersResult } from '../../types/Meeting/GetmeetingMember';
+import { getMeetingMembers } from '../../apis/clubMeeting/GetmeetingMember';
+
+
+const qk = {
+  meetingMembers: (meetingId: number, size: number) =>
+    ['meetingMembers', meetingId, size] as const,
+};
+
+export function useGetInfinityMember(meetingId: number, size = 15) {
+  return useInfiniteQuery<GetMeetingMembersResult, Error>({
+    queryKey: qk.meetingMembers(meetingId, size),
+    queryFn: ({ pageParam }) => {
+      const cursor = (pageParam ?? null) as number | null;
+      return getMeetingMembers({ meetingId, cursorId: cursor, size });
+    },
+    initialPageParam: null as number | null,
+    getNextPageParam: (lastPage) =>
+      lastPage.hasNext ? lastPage.nextCursor : undefined,
+    select: (data) => {
+      const flatMembers = data.pages.flatMap(p => p.members);
+      const membership = data.pages[0]?.membership;
+      return { ...data, flatMembers, membership };
+    },
+    staleTime: 30_000,
+    gcTime: 5 * 60_000,
+  });
+}

src/pages/BookClub/Shelf/ScoreDetailPage.tsx

@@ -15,12 +15,14 @@ export default function ScoreDetailPage() {
   useEffect(() => {
     const nickname = localStorage.getItem('nickname');
     const profileImageUrl = localStorage.getItem('profileImageUrl');
-    if(!nickname || !profileImageUrl) {
-      console.log("error처리")
-      return;
+    if(nickname) {
+      setMynickname(nickname);
+     
     }
-    setMynickname(nickname);
-    setUrl(profileImageUrl);
+    if(profileImageUrl) {
+      setUrl(profileImageUrl);
+    }
+
   }, []) 
 
   return (

src/pages/BookClub/Shelf/ShelfDetailPage.tsx

@@ -20,12 +20,13 @@ export default function ShelfDetailPage() {
   useEffect(() => {
     const nickname = localStorage.getItem('nickname');
     const profileImageUrl = localStorage.getItem('profileImageUrl');
-    if(!nickname || !profileImageUrl) {
-      console.log("error처리")
-      return;
+    if(nickname) {
+      setMynickname(nickname);
+     
+    }
+    if(profileImageUrl) {
+      setUrl(profileImageUrl);
     }
-    setMynickname(nickname);
-    setUrl(profileImageUrl);
   }, []) 
 
   if (isLoading) return <div className = "font-[Pretendard] font-semibold text-[16px] text-[#8D8D8D]">로딩 중…</div>

src/pages/BookClub/Shelf/TopicDetailPage.tsx

@@ -35,12 +35,13 @@ export default function ThemeDetailPage() {
   useEffect(() => {
     const nickname = localStorage.getItem('nickname');
     const profileImageUrl = localStorage.getItem('profileImageUrl');
-    if(!nickname || !profileImageUrl) {
-      console.log("error처리")
-      return;
+    if(nickname) {
+      setMynickname(nickname);
+     
+    }
+    if(profileImageUrl) {
+      setUrl(profileImageUrl);
     }
-    setMynickname(nickname);
-    setUrl(profileImageUrl);
   }, []) 
 
   useEffect(() => {
@@ -133,7 +134,7 @@ export default function ThemeDetailPage() {
             {/* 등록 영역 */}
             <div className=" py-2 flex shadow rounded-2xl border-2 border-[var(--sub-color-2-brown,#EAE5E2)] mb-3   transition-transform duration-300 hover:shadow-md">
               <div className="flex-shrink-0 items-center w-[222px] h-[48px] ml-[12px] flex gap-[19px] mr-[15px]">
-                <img src={MyUrl} className="w-[48px] h-[48px] rounded-full object-cover"  alt="프로필"/>
+                <img src={MyUrl || '/assets/ix_user-profile-filled.svg'} className="w-[48px] h-[48px] rounded-full object-cover"  alt="프로필"/>
                 <div className="flex-1 font-semibold text-[15px] text-gray-800">
                   {Mynickname}
                 </div>