Feat: #200 프로젝트 생성

src/components/common/DescriptionTextarea.tsx

@@ -21,12 +21,13 @@ export default function DescriptionTextarea({
   const { register } = useFormContext();
 
   return (
-    <label htmlFor={id}>
+    <label htmlFor={id} className="flex flex-col">
       <h3 className="text-large">{label}</h3>
       <textarea
         id={id}
-        className="h-100 w-full rounded-md border border-input p-10 text-regular placeholder:text-xs"
+        className="w-full rounded-md border border-input p-10 text-regular placeholder:text-xs"
         placeholder={placeholder}
+        rows={5}
         {...(validationRole ? register(fieldName, validationRole) : register(fieldName))}
       />
       <div className={`my-5 h-10 text-xs text-error ${errors ? 'visible' : 'invisible'}`}>{errors}</div>

src/components/common/PeriodDateInput.tsx

@@ -1,12 +1,11 @@
 import { useEffect, useState } from 'react';
 import { DateTime } from 'luxon';
 import { useFormContext } from 'react-hook-form';
-import { TASK_VALIDATION_RULES } from '@constants/formValidationRules';
+import { PERIOD_VALIDATION_RULES } from '@constants/formValidationRules';
 import ToggleButton from '@components/common/ToggleButton';
 import useToast from '@hooks/useToast';
 
 import type { FieldError } from 'react-hook-form';
-import type { Project } from '@/types/ProjectType';
 
 type PeriodDateInputProps = {
   startDateId: string;
@@ -15,8 +14,8 @@ type PeriodDateInputProps = {
   endDateLabel: string;
   startDateFieldName: string;
   endDateFieldName: string;
-  limitStartDate: Project['startDate'];
-  limitEndDate: Project['endDate'];
+  limitStartDate?: string | Date | null;
+  limitEndDate?: string | Date | null;
 };
 
 export default function PeriodDateInput({
@@ -26,8 +25,8 @@ export default function PeriodDateInput({
   endDateLabel,
   startDateFieldName,
   endDateFieldName,
-  limitStartDate,
-  limitEndDate,
+  limitStartDate = null,
+  limitEndDate = null,
 }: PeriodDateInputProps) {
   const [hasDeadline, setHasDeadline] = useState(false);
   const { toastWarn } = useToast();
@@ -62,7 +61,7 @@ export default function PeriodDateInput({
           id={startDateId}
           type="date"
           {...register(startDateFieldName, {
-            ...TASK_VALIDATION_RULES.START_DATE(limitStartDate, limitEndDate),
+            ...PERIOD_VALIDATION_RULES.START_DATE(limitStartDate, limitEndDate),
             onChange: (e) => {
               if (!hasDeadline) setValue(endDateFieldName, e.target.value);
             },
@@ -83,14 +82,13 @@ export default function PeriodDateInput({
           className={`${hasDeadline ? '' : '!bg-disable outline-none'}`}
           readOnly={!hasDeadline}
           {...register(endDateFieldName, {
-            ...TASK_VALIDATION_RULES.END_DATE(hasDeadline, limitStartDate, limitEndDate, watch(startDateFieldName)),
+            ...PERIOD_VALIDATION_RULES.END_DATE(hasDeadline, limitStartDate, limitEndDate, watch(startDateFieldName)),
             onChange: (e) => {
               const startDate = DateTime.fromISO(startDateStr).startOf('day');
               const endDate = DateTime.fromISO(e.target.value).startOf('day');
               if (startDate > endDate) {
                 toastWarn('종료일은 시작일과 같거나 이후로 설정해주세요.');
                 setValue(endDateFieldName, startDateStr);
-                setHasDeadline(false);
               }
             },
           })}

src/components/modal/project/CreateModalProject.tsx

@@ -4,6 +4,8 @@ import ModalButton from '@components/modal/ModalButton';
 import ModalProjectForm from '@components/modal/project/ModalProjectForm';
 
 import type { SubmitHandler } from 'react-hook-form';
+import { useParams } from 'react-router-dom';
+import { useCreateProject } from '@hooks/query/useProjectQuery';
 import type { ProjectForm } from '@/types/ProjectType';
 
 type CreateModalProjectProps = {
@@ -12,10 +14,13 @@ type CreateModalProjectProps = {
 
 export default function CreateModalProject({ onClose: handleClose }: CreateModalProjectProps) {
   const createProjectFormId = 'createProjectForm';
+  const { teamId } = useParams();
+
+  const numberTeamId = Number(teamId);
+  const { mutate: createProjectMutate } = useCreateProject(numberTeamId);
 
   const handleSubmit: SubmitHandler<ProjectForm> = async (data) => {
-    console.log('프로젝트 생성 폼 제출');
-    console.log(data);
+    createProjectMutate(data);
     handleClose();
   };
   return (

src/components/modal/project/ModalProjectForm.tsx

@@ -1,38 +1,45 @@
-import { FormProvider, useForm } from 'react-hook-form';
-
-import type { SubmitHandler } from 'react-hook-form';
+import { FormProvider, useForm, useWatch } from 'react-hook-form';
+import { DateTime } from 'luxon';
 import { useMemo, useState } from 'react';
 import RoleTooltip from '@components/common/RoleTooltip';
-import { PROJECT_ROLE_INFO, PROJECT_ROLES } from '@constants/role';
+import { PROJECT_DEFAULT_ROLE, PROJECT_ROLE_INFO, PROJECT_ROLES } from '@constants/role';
 import DuplicationCheckInput from '@components/common/DuplicationCheckInput';
 import DescriptionTextarea from '@components/common/DescriptionTextarea';
 import { PROJECT_VALIDATION_RULES } from '@constants/formValidationRules';
 import PeriodDateInput from '@components/common/PeriodDateInput';
 import SearchUserInput from '@components/common/SearchUserInput';
 import UserRoleSelectBox from '@components/common/UserRoleSelectBox';
 import useAxios from '@hooks/useAxios';
-import { findUser } from '@services/userService';
-import { AllSearchCallback } from '@/types/SearchCallbackType';
+import useToast from '@hooks/useToast';
+import { findUserByTeam } from '@services/teamService';
+import { useParams } from 'react-router-dom';
+import type { SubmitHandler } from 'react-hook-form';
+import type { TeamSearchCallback } from '@/types/SearchCallbackType';
 import type { ProjectRoleName } from '@/types/RoleType';
-import type { Project, ProjectCoworkerInfo, ProjectForm } from '@/types/ProjectType';
-import type { SearchUser } from '@/types/UserType';
+import type { ProjectCoworker, ProjectForm } from '@/types/ProjectType';
+import type { SearchUser, User } from '@/types/UserType';
+import type { Team } from '@/types/TeamType';
 
 type ModalProjectFormProps = {
   formId: string;
-  projectId?: Project['projectId'];
   onSubmit: SubmitHandler<ProjectForm>;
 };
 
-export default function ModalProjectForm({ formId, projectId, onSubmit }: ModalProjectFormProps) {
+export default function ModalProjectForm({ formId, onSubmit }: ModalProjectFormProps) {
   const [showTooltip, setShowTooltip] = useState(false);
   const [keyword, setKeyword] = useState('');
-  const [coworkerInfos, setCoworkerInfos] = useState<ProjectCoworkerInfo[]>([]);
-  // TODO: 프로젝트 생성 팀 사용자 찾기로 바꾸기
-  const { loading, data: userList = [], fetchData } = useAxios(findUser);
+  const [coworkerInfos, setCoworkerInfos] = useState<ProjectCoworker[]>([]);
+  const { toastInfo } = useToast();
+  const { teamId } = useParams();
+  const { loading, data: userList = [], clearData, fetchData } = useAxios(findUserByTeam);
 
-  // TODO: 프로젝트 생성 팀 사용자 찾기로 바꾸기
-  const searchCallbackInfo: AllSearchCallback = useMemo(
-    () => ({ type: 'ALL', searchCallback: fetchData }),
+  const searchCallbackInfo: TeamSearchCallback = useMemo(
+    () => ({
+      type: 'TEAM',
+      searchCallback: (teamId: Team['teamId'], nickname: User['nickname']) => {
+        return fetchData(Number(teamId), nickname);
+      },
+    }),
     [fetchData],
   );
 
@@ -41,47 +48,82 @@ export default function ModalProjectForm({ formId, projectId, onSubmit }: ModalP
     defaultValues: {
       projectName: '',
       content: '',
-      startDate: new Date(),
-      endDate: null,
+      startDate: DateTime.fromJSDate(new Date()).toFormat('yyyy-LL-dd'),
+      endDate: DateTime.fromJSDate(new Date()).toFormat('yyyy-LL-dd'),
       coworkers: [],
     },
   });
 
   const {
     watch,
     handleSubmit,
+    setValue,
     formState: { errors },
     register,
   } = methods;
 
-  const startDate = watch('startDate') || new Date();
-  const endDate = watch('endDate') || null;
+  const handleRoleChange = (userId: User['userId'], roleName: ProjectRoleName) => {
+    const updatedCoworkerInfos = coworkerInfos.map((coworkerInfo) =>
+      coworkerInfo.userId === userId ? { ...coworkerInfo, roleName } : coworkerInfo,
+    );
 
-  const handleCoworkersClick = (user: SearchUser) => {
-    console.log(user);
+    const updatedCoworkers = updatedCoworkerInfos.map(({ userId, roleName, nickname }) => ({
+      userId,
+      roleName,
+      nickname,
+    }));
+
+    setValue('coworkers', updatedCoworkers);
+    setCoworkerInfos(updatedCoworkerInfos);
+  };
+
+  const handleRemoveUser = (userId: User['userId']) => {
+    const filteredCoworkerInfos = coworkerInfos.filter((coworkerInfo) => coworkerInfo.userId !== userId);
+    const filteredCoworkers = filteredCoworkerInfos.map(({ userId, roleName, nickname }) => ({
+      userId,
+      roleName,
+      nickname,
+    }));
+
+    setValue('coworkers', filteredCoworkers);
+    setCoworkerInfos(filteredCoworkerInfos);
   };
 
   const handleKeywordChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setKeyword(e.target.value.trim());
   };
 
-  const handleRoleChange = (userId: number, roleName: ProjectRoleName) => {
-    console.log(userId, roleName);
-  };
+  const handleCoworkersClick = (user: SearchUser) => {
+    const isIncludedUser = coworkerInfos.find((coworkerInfo) => coworkerInfo.userId === user.userId);
+    if (isIncludedUser) return toastInfo('이미 포함된 팀원입니다');
 
-  const handleRemoveUser = (userId: number) => {
-    console.log(userId);
+    const updatedCoworkerInfos: ProjectCoworker[] = [
+      ...coworkerInfos,
+      { userId: user.userId, nickname: user.nickname, roleName: PROJECT_DEFAULT_ROLE },
+    ];
+    const updatedCoworkers = updatedCoworkerInfos.map(({ userId, roleName, nickname }) => ({
+      userId,
+      roleName,
+      nickname,
+    }));
+    setCoworkerInfos(updatedCoworkerInfos);
+    setValue('coworkers', updatedCoworkers);
+    setKeyword('');
+    clearData();
   };
 
+  const handleSubmitForm: SubmitHandler<ProjectForm> = (formData: ProjectForm) => onSubmit(formData);
+
   return (
     <FormProvider {...methods}>
-      <form id={formId} className="mb-10 flex grow flex-col justify-center" onSubmit={handleSubmit(onSubmit)}>
+      <form id={formId} className="mb-10 flex grow flex-col justify-center" onSubmit={handleSubmit(handleSubmitForm)}>
         <div className="relative" onMouseEnter={() => setShowTooltip(true)} onMouseLeave={() => setShowTooltip(false)}>
           <p className="text-sky-700">
             <strong>프로젝트 권한 정보</strong>
           </p>
           <RoleTooltip showTooltip={showTooltip} rolesInfo={PROJECT_ROLE_INFO} />
         </div>
+
         <DuplicationCheckInput
           id="projectName"
           label="프로젝트 명"
@@ -90,51 +132,48 @@ export default function ModalProjectForm({ formId, projectId, onSubmit }: ModalP
           errors={errors.projectName?.message}
           register={register('projectName', PROJECT_VALIDATION_RULES.PROJECT_NAME)}
         />
-        <div className="mb-30">
-          <DescriptionTextarea
-            id="content"
-            label="프로젝트 설명"
-            fieldName="content"
-            placeholder="프로젝트 내용을 입력해주세요."
-            validationRole={PROJECT_VALIDATION_RULES.PROJECT_DESCRIPTION}
-            errors={errors.content?.message}
-          />
-        </div>
+
+        <DescriptionTextarea
+          id="content"
+          label="프로젝트 설명"
+          fieldName="content"
+          placeholder="프로젝트 내용을 입력해주세요."
+          validationRole={PROJECT_VALIDATION_RULES.PROJECT_DESCRIPTION}
+          errors={errors.content?.message}
+        />
+
         <PeriodDateInput
           startDateLabel="시작일"
           endDateLabel="종료일"
           startDateId="startDate"
           endDateId="endDate"
           startDateFieldName="startDate"
           endDateFieldName="endDate"
-          limitStartDate={startDate}
-          limitEndDate={endDate}
         />
 
-        <div className="mb-16">
-          <SearchUserInput
-            id="search"
-            label="팀원"
-            keyword={keyword}
-            loading={loading}
-            userList={userList}
-            searchCallbackInfo={searchCallbackInfo}
-            onKeywordChange={handleKeywordChange}
-            onUserClick={handleCoworkersClick}
-          />
-          <div className="flex flex-wrap">
-            {coworkerInfos.map(({ userId, nickname }) => (
-              <UserRoleSelectBox
-                key={userId}
-                userId={userId}
-                nickname={nickname}
-                roles={PROJECT_ROLES}
-                defaultValue="MATE"
-                onRoleChange={handleRoleChange}
-                onRemoveUser={handleRemoveUser}
-              />
-            ))}
-          </div>
+        <SearchUserInput
+          id="search"
+          label="팀원"
+          keyword={keyword}
+          loading={loading}
+          userList={userList}
+          searchId={Number(teamId)}
+          searchCallbackInfo={searchCallbackInfo}
+          onKeywordChange={handleKeywordChange}
+          onUserClick={handleCoworkersClick}
+        />
+        <div className="flex flex-wrap">
+          {coworkerInfos.map(({ userId, nickname }) => (
+            <UserRoleSelectBox
+              key={userId}
+              userId={userId}
+              nickname={nickname}
+              roles={PROJECT_ROLES}
+              defaultValue={PROJECT_DEFAULT_ROLE}
+              onRoleChange={handleRoleChange}
+              onRemoveUser={handleRemoveUser}
+            />
+          ))}
         </div>
       </form>
     </FormProvider>

src/components/modal/team/ModalTeamForm.tsx

@@ -2,7 +2,7 @@ import { useMemo, useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import useAxios from '@hooks/useAxios';
 import useToast from '@hooks/useToast';
-import { TEAM_ROLE_INFO, TEAM_ROLES } from '@constants/role';
+import { TEAM_DEFAULT_ROLE, TEAM_ROLE_INFO, TEAM_ROLES } from '@constants/role';
 import { TEAM_VALIDATION_RULES } from '@constants/formValidationRules';
 import { findUser } from '@services/userService';
 import RoleTooltip from '@components/common/RoleTooltip';
@@ -83,7 +83,7 @@ export default function ModalTeamForm({ formId, onSubmit }: ModalTeamFormProps)
 
     const updatedCoworkerInfos: TeamCoworker[] = [
       ...coworkerInfos,
-      { userId: user.userId, nickname: user.nickname, roleName: 'MATE' },
+      { userId: user.userId, nickname: user.nickname, roleName: TEAM_DEFAULT_ROLE },
     ];
     const updatedCoworkers = updatedCoworkerInfos.map(({ userId, roleName }) => ({
       userId,
@@ -143,7 +143,7 @@ export default function ModalTeamForm({ formId, onSubmit }: ModalTeamFormProps)
                 userId={userId}
                 nickname={nickname}
                 roles={TEAM_ROLES}
-                defaultValue="MATE"
+                defaultValue={TEAM_DEFAULT_ROLE}
                 onRoleChange={handleRoleChange}
                 onRemoveUser={handleRemoveUser}
               />

src/components/modal/team/UpdateModalTeam.tsx

@@ -16,7 +16,7 @@ import Spinner from '@components/common/Spinner';
 import DescriptionTextarea from '@components/common/DescriptionTextarea';
 import SearchUserInput from '@components/common/SearchUserInput';
 import UserRoleSelectBox from '@components/common/UserRoleSelectBox';
-import { TEAM_ROLES } from '@constants/role';
+import { TEAM_DEFAULT_ROLE, TEAM_ROLES } from '@constants/role';
 import { findUser } from '@services/userService';
 import useAxios from '@hooks/useAxios';
 import useToast from '@hooks/useToast';
@@ -131,7 +131,7 @@ export default function UpdateModalTeam({ teamId, onClose: handleClose }: Update
             userList={userList}
             searchCallbackInfo={searchCallbackInfo}
             onKeywordChange={handleKeywordChange}
-            onUserClick={(user) => handleCoworkersClick(user.userId, 'MATE')}
+            onUserClick={(user) => handleCoworkersClick(user.userId, TEAM_DEFAULT_ROLE)}
           />
           <div className="flex flex-wrap">
             {coworkers.map(({ userId, nickname, roleName }) => (