Merge pull request #279 from WeGo-Together/minseo-feat/schedule-filter

[Feat] 나의 모임 및 모임 이력 탭에 filter=ALL 파라미터 추가

Author: claudia99503

src/api/service/group-service/index.ts

@@ -33,6 +33,24 @@ export const groupServiceRemote = () => ({
       params.append('cursor', payload.cursor.toString());
     }
     params.append('size', payload.size.toString());
+    if (payload.filter) {
+      params.append('filter', payload.filter);
+    }
+    if (payload.includeStatuses && payload.includeStatuses.length > 0) {
+      payload.includeStatuses.forEach((status) => {
+        params.append('includeStatuses', status);
+      });
+    }
+    if (payload.excludeStatuses && payload.excludeStatuses.length > 0) {
+      payload.excludeStatuses.forEach((status) => {
+        params.append('excludeStatuses', status);
+      });
+    }
+    if (payload.myStatuses && payload.myStatuses.length > 0) {
+      payload.myStatuses.forEach((status) => {
+        params.append('myStatuses', status);
+      });
+    }
 
     return apiV2.get<GetMyGroupsResponse>(`/groups/me?${params.toString()}`);
   },

src/app/schedule/(components)/current.tsx src/app/schedule/_components/current.tsxsrc/app/schedule/(components)/current.tsx renamed to src/app/schedule/_components/current.tsx

@@ -12,7 +12,12 @@ export default function History() {
   const { items, error, fetchNextPage, hasNextPage, isFetchingNextPage, completedMessage } =
     useInfiniteScroll<GroupListItemResponse, ['myGroups', 'past']>({
       queryFn: async ({ cursor, size }) => {
-        return await API.groupService.getMyGroups({ type: 'past', cursor, size });
+        return await API.groupService.getMyGroups({
+          type: 'past',
+          cursor,
+          size,
+          filter: 'ALL',
+        });
       },
       queryKey: ['myGroups', 'past'],
       pageSize: 10,

src/app/schedule/(components)/history.tsx src/app/schedule/_components/history.tsxsrc/app/schedule/(components)/history.tsx renamed to src/app/schedule/_components/history.tsx

@@ -143,3 +143,5 @@ export const MeetingList = ({
     </section>
   );
 };
+
+//

…p/schedule/(components)/meeting-list.tsx …pp/schedule/_components/meeting-list.tsxsrc/app/schedule/(components)/meeting-list.tsx renamed to src/app/schedule/_components/meeting-list.tsx src/app/schedule/(components)/meeting-list.tsx renamed to src/app/schedule/_components/meeting-list.tsx

@@ -12,7 +12,12 @@ export default function My() {
   const { items, error, fetchNextPage, hasNextPage, isFetchingNextPage, completedMessage } =
     useInfiniteScroll<GroupListItemResponse, ['myGroups', 'myPost']>({
       queryFn: async ({ cursor, size }) => {
-        return await API.groupService.getMyGroups({ type: 'myPost', cursor, size });
+        return await API.groupService.getMyGroups({
+          type: 'myPost',
+          cursor,
+          size,
+          filter: 'ALL',
+        });
       },
       queryKey: ['myGroups', 'myPost'],
       pageSize: 10,

src/app/schedule/(components)/my.tsx src/app/schedule/_components/my.tsxsrc/app/schedule/(components)/my.tsx renamed to src/app/schedule/_components/my.tsx

@@ -6,9 +6,9 @@ import { Suspense } from 'react';
 
 import { TabNavigation } from '@/components/shared';
 
-import Current from './(components)/current';
-import History from './(components)/history';
-import My from './(components)/my';
+import Current from './_components/current';
+import History from './_components/history';
+import My from './_components/my';
 
 const SCHEDULE_TABS = [
   { label: '현재 모임', value: 'current' },
@@ -40,8 +40,3 @@ export default function SchedulePage() {
     </div>
   );
 }
-
-// 나중에 api 연동할 때
-// 1. ScheduleContent를 감싸던 임시 Suspense 제거해야됨
-// 2. useSearchParams()는 그대로 유지
-// 3. Current, My, History를 서버 컴포넌트로 변경 (use client 제거) - 서버에서 데이터 페칭