Merge branch 'fe-dev' of https://github.com/woowacourse-teams/2024-ha…

…eng-dong into feature/#319
woowacourse-teams · Aug 16, 2024 · 0caac4a · 0caac4a
2 parents fa6262b + ee322f6
commit 0caac4a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/client/src/apis/request/member.ts b/client/src/apis/request/member.ts
@@ -73,7 +73,7 @@ export const requestDeleteAllMemberList = async ({eventId, memberName}: WithEven
 };
 
 export type ResponseGetCurrentInMemberList = {
-  members: Array<{name: string}>;
+  memberNames: string[];
 };
 
 export const requestGetCurrentInMemberList = async (eventId: string) => {

diff --git a/client/src/hooks/useSearchInMemberList.ts b/client/src/hooks/useSearchInMemberList.ts
@@ -22,15 +22,15 @@ const useSearchInMemberList = (
   const [currentInputIndex, setCurrentInputIndex] = useState(-1);
 
   // 서버에서 가져온 전체 리스트
-  const [currentInMemberList, setCurrentInMemberList] = useState<Array<{name: string}>>([]);
+  const [currentInMemberList, setCurrentInMemberList] = useState<Array<string>>([]);
 
   // 검색된 리스트 (따로 둔 이유는 검색 후 클릭했을 때 리스트를 비워주어야하기 때문)
   const [filteredInMemberList, setFilteredInMemberList] = useState<Array<string>>([]);
 
   useEffect(() => {
     const getCurrentInMembers = async () => {
       const currentInMemberListFromServer = await fetch({queryFunction: () => requestGetCurrentInMemberList(eventId)});
-      setCurrentInMemberList(currentInMemberListFromServer.members);
+      setCurrentInMemberList(currentInMemberListFromServer.memberNames);
     };
 
     getCurrentInMembers();
@@ -39,11 +39,9 @@ const useSearchInMemberList = (
   const filterMatchItems = (keyword: string) => {
     if (keyword.trim() === '') return [];
 
-    const MatchItems = currentInMemberList.map(({name}) => name);
-
-    return MatchItems.filter(
-      matchItem => matchItem.toLocaleLowerCase().indexOf(keyword.toLocaleLowerCase()) > -1,
-    ).slice(0, 3);
+    return currentInMemberList
+      .filter(member => member.toLocaleLowerCase().indexOf(keyword.toLocaleLowerCase()) > -1)
+      .slice(0, 3);
   };
 
   const chooseMember = (inputIndex: number, name: string) => {

diff --git a/client/src/pages/CreateEventPage/CompleteCreateEventPage.tsx b/client/src/pages/CreateEventPage/CompleteCreateEventPage.tsx
@@ -18,7 +18,7 @@ const CompleteCreateEventPage = () => {
 
   const {showToast} = useToast();
 
-  const homePageUrl = getEventPageUrlByEnvironment(url, 'home');
+  const homePageUrl = getEventPageUrlByEnvironment(eventId ?? '', 'home');
 
   return (
     <MainLayout>