Merge pull request #186 from imaginer-dev/183-그룹-일정-수정-생성에서-그룹-생성으로-수정

183 그룹 일정 수정 생성에서 그룹 생성으로 수정

Author: gihwan-dev

src/apis/createNewGroupApi.ts

@@ -0,0 +1,56 @@
+import supabase from '@/supabase';
+import { Member } from '@/types/Member.ts';
+
+interface CreateNewGroup {
+  name: string;
+  description: string;
+  startDate: string;
+  endDate: string;
+  memo: string;
+  newMemberList: Member[];
+}
+
+export const createNewGroupApi = async ({ startDate, endDate, newMemberList, ...props }: CreateNewGroup) => {
+  // 현재 로그인된 사용자를 가져온다.
+  const { data: user, error: userError } = await supabase.auth.getUser();
+
+  if (userError) {
+    throw userError;
+  }
+
+  // 그룹을 생성한다.
+  const { data: groupInfo, error: groupInfoError } = await supabase
+    .from('groups')
+    .insert({
+      name: props.name,
+      description: props.description,
+      memo: props.memo,
+      open: true,
+      start_date: startDate,
+      end_date: endDate,
+    })
+    .select()
+    .single();
+
+  if (!groupInfo || groupInfoError) {
+    throw groupInfoError;
+  }
+
+  // 그룹에 멤버를 추가한다.
+  const newRelationSchema = newMemberList.map((member) => ({
+    group_id: groupInfo.id,
+    user_id: member.id,
+  }));
+
+  newRelationSchema.push({
+    group_id: groupInfo.id,
+    user_id: user.user.id,
+  });
+
+  const { error: groupMemberError } = await supabase.from('group_user_ralations').insert(newRelationSchema);
+  if (groupMemberError) {
+    throw groupMemberError;
+  }
+
+  return true;
+};

src/apis/getAllGroupMember.ts

@@ -0,0 +1,28 @@
+import supabase from '@/supabase';
+
+export const getAllGroupMembers = async (groupId: string) => {
+  // group_user_ralations 의 응답 결과의 user_id를 포함하는 profile리스트를 받아온다.
+  const { data, error } = await supabase.from('group_user_ralations').select('user_id').eq('group_id', +groupId);
+
+  if (error) {
+    throw error;
+  }
+
+  if (!data) {
+    throw new Error('데이터를 찾을 수 없습니다.');
+  }
+
+  const { data: allUserProfile, error: getProfileError } = await supabase
+    .from('profiles')
+    .select('*')
+    .in(
+      'id',
+      data.map((d) => d.user_id),
+    );
+
+  if (getProfileError) {
+    throw getProfileError;
+  }
+
+  return allUserProfile;
+};

src/apis/getAllMemberSchedule.ts

@@ -1,5 +1,5 @@
-import { getAllGroupMembers } from '@/apis/groupScheduleApis.ts';
 import supabase from '@/supabase';
+import { getAllGroupMembers } from '@/apis/getAllGroupMember.ts';
 
 export const getAllMemberSchedule = async (groupId: string) => {
   const memberList = await getAllGroupMembers(groupId);

src/apis/getOneGroupApi.ts

@@ -0,0 +1,15 @@
+import supabase from '@/supabase';
+
+export const getOneGroupApi = async (groupId: string) => {
+  const { data, error } = await supabase.from('groups').select('*').eq('id', +groupId);
+
+  if (error) {
+    throw error;
+  }
+
+  if (!data) {
+    throw new Error('데이터를 찾을 수 없습니다.');
+  }
+
+  return data[0];
+};

src/apis/groupScheduleApis.ts

@@ -0,0 +1,31 @@
+import supabase from '@/supabase';
+
+interface UpdateGroup {
+  name: string;
+  description: string;
+  startDate: string;
+  endDate: string;
+  memo: string;
+  groupId: string;
+}
+
+export const updateGroup = async ({ name, description, startDate, endDate, memo, groupId }: UpdateGroup) => {
+  console.log(memo);
+  console.log(description);
+  const { data, error } = await supabase
+    .from('groups')
+    .update({
+      name,
+      description,
+      start_date: startDate,
+      end_date: endDate,
+      memo,
+    })
+    .eq('id', +groupId);
+
+  if (error) {
+    throw error;
+  }
+
+  return data;
+};

src/apis/updateGroupApi.ts

@@ -0,0 +1,27 @@
+import supabase from '@/supabase';
+import { Member } from '@/types/Member.ts';
+
+interface UpdateGroupMember {
+  updatedMemberList: Member[];
+  groupId: string;
+}
+
+export const updateGroupMember = async ({ updatedMemberList, groupId }: UpdateGroupMember) => {
+  const { error: deleteError } = await supabase.from('group_user_ralations').delete().eq('group_id', groupId);
+  if (deleteError) {
+    throw deleteError;
+  }
+
+  const { data, error: insertError } = await supabase.from('group_user_ralations').insert(
+    updatedMemberList.map((member) => ({
+      group_id: +groupId,
+      user_id: member.id,
+    })),
+  );
+
+  if (insertError) {
+    throw insertError;
+  }
+
+  return data;
+};

src/apis/updateGroupMemberApi.ts

@@ -31,7 +31,7 @@ const SideBarGroupList: FC<Props> = ({ userId }) => {
           key={group.id + 'sidebar-group-list'}
         >
           <Link to={`/group/${group.id}`}>{group.name}</Link>
-          <Link to={`/group/${group.id}/edit/${group.id}`}>
+          <Link to={`/group/${group.id}/edit`}>
             <PencilIcon />
           </Link>
         </li>

src/components/common/SideBar/SideBarGroupList.tsx

@@ -16,7 +16,7 @@ export const useAddGroupSchedule = () => {
     e.preventDefault();
     const formData = new FormData(e.currentTarget);
     const newGroupSchedule = {
-      title: formData.get('name') as string,
+      name: formData.get('name') as string,
       description: formData.get('description') as string,
       startDate: formData.get('startDate') as string,
       endDate: formData.get('endDate') as string,

src/hooks/useAddGroupSchedule.ts

@@ -1,13 +1,13 @@
 import { useGetAllMember } from '@/react-queries/useGetAllMember';
-import { useGetOneGroupSchedule } from '@/react-queries/useGetOneGroupSchedule';
+import { useGetOneGroup } from '@/react-queries/useGetOneGroup.ts';
 
-export const useGetGroupScheduleDefaultData = (scheduleId: string, groupId: string) => {
+export const useGetGroupScheduleDefaultData = (groupId: string) => {
   const {
-    data: groupScheduleData,
-    isLoading: groupScheduleIsLoading,
-    error: groupScheduleError,
-    isError: groupScheduleIsError,
-  } = useGetOneGroupSchedule(scheduleId);
+    data: groupData,
+    isLoading: groupIsLoading,
+    error: groupError,
+    isError: groupIsError,
+  } = useGetOneGroup(groupId);
 
   const {
     data: groupMemberData,
@@ -17,10 +17,10 @@ export const useGetGroupScheduleDefaultData = (scheduleId: string, groupId: stri
   } = useGetAllMember(groupId);
 
   return {
-    groupScheduleData,
+    groupData,
     groupMemberData,
-    isLoading: groupScheduleIsLoading || groupMemberIsLoading,
-    error: groupScheduleError ?? groupMemberError,
-    isError: groupScheduleIsError || groupMemberIsError,
+    isLoading: groupIsLoading || groupMemberIsLoading,
+    error: groupError ?? groupMemberError,
+    isError: groupIsError || groupMemberIsError,
   };
 };