Merge pull request #235 from TEAM-DAWM/feat/#194/task-description

[FEAT] Task 상세 조회 api 연결
TEAM-DAWM · Jul 19, 2024 · b837c2f · b837c2f
2 parents bf4c29f + 68e416a
commit b837c2f
Show file tree

Hide file tree

Showing 13 changed files with 93 additions and 61 deletions.
diff --git a/src/apis/tasks/taskDescription/TaskDescriptionType.ts b/src/apis/tasks/taskDescription/TaskDescriptionType.ts
@@ -0,0 +1,5 @@
+export interface TaskDescriptionType {
+	taskId: number;
+	targetDate?: string | null;
+	isOpen?: boolean;
+}
diff --git a/src/apis/tasks/taskDescription/axios.ts b/src/apis/tasks/taskDescription/axios.ts
@@ -0,0 +1,14 @@
+import { TaskDescriptionType } from './TaskDescriptionType';
+
+import { privateInstance } from '@/apis/instance';
+
+const taskDescription = async ({ taskId, targetDate }: TaskDescriptionType) => {
+	const { data } = await privateInstance.get(`/api/tasks/${taskId}`, {
+		params: {
+			targetDate,
+		},
+	});
+	return data;
+};
+
+export default taskDescription;
diff --git a/src/apis/tasks/taskDescription/query.ts b/src/apis/tasks/taskDescription/query.ts
@@ -0,0 +1,16 @@
+import { useQuery } from '@tanstack/react-query';
+
+import taskDescription from './axios';
+import { TaskDescriptionType } from './TaskDescriptionType';
+
+// Task 상세 설명 조회
+const useTaskDescription = ({ taskId, targetDate, isOpen }: TaskDescriptionType) => {
+	const data = useQuery({
+		queryKey: ['today', 'taskDesc', taskId, targetDate],
+		queryFn: () => taskDescription({ taskId, targetDate }),
+		enabled: isOpen,
+	});
+
+	return data;
+};
+export default useTaskDescription;
diff --git a/src/components/common/BtnTask/BtnTask.tsx b/src/components/common/BtnTask/BtnTask.tsx
@@ -2,12 +2,11 @@ import { css, Theme } from '@emotion/react';
 import styled from '@emotion/styled';
 import React, { useState } from 'react';
 
-import Modal from '../modal/Modal';
-
 import IconHoverContainer from './IconHoverContainer';
 
 import Icons from '@/assets/svg/index';
 import BtnDate from '@/components/common/BtnDate/BtnDate';
+import Modal from '@/components/common/modal/Modal';
 import MODAL from '@/constants/modalLocation';
 import { theme } from '@/styles/theme';
 import { TaskType } from '@/types/tasks/taskType';
@@ -44,7 +43,7 @@ function BtnTask(props: BtnTaskProps) {
 		btnStatus,
 		preventDoubleClick = false,
 		isDragging = false,
-		targetDate,
+		targetDate = null,
 	} = props;
 	const [isModalOpen, setModalOpen] = useState(false);
 	const [isHovered, setIsHovered] = useState(false);
@@ -127,7 +126,15 @@ function BtnTask(props: BtnTaskProps) {
 					targetDate={targetDate}
 				/>
 			</BtnTaskLayout>
-			<Modal isOpen={isModalOpen} sizeType={{ type: 'short' }} top={top} left={left} onClose={closeModal} taskId={id} />
+			<Modal
+				isOpen={isModalOpen}
+				sizeType={{ type: 'short' }}
+				top={top}
+				left={left}
+				onClose={closeModal}
+				taskId={id}
+				targetDate={targetDate}
+			/>
 		</ModalLayout>
 	);
 }

diff --git a/src/components/common/StagingArea/StagingAreaTaskContainer.tsx b/src/components/common/StagingArea/StagingAreaTaskContainer.tsx
@@ -15,12 +15,7 @@ interface StagingAreaTaskContainerProps {
 	targetDate: string;
 }
 
-function StagingAreaTaskContainer({
-	handleSelectedTarget,
-	selectedTarget,
-	tasks,
-	targetDate,
-}: StagingAreaTaskContainerProps) {
+function StagingAreaTaskContainer({ handleSelectedTarget, selectedTarget, tasks }: StagingAreaTaskContainerProps) {
 	return (
 		<StagingAreaTaskContainerLayout>
 			<BtnTaskContainer type="staging">
@@ -48,7 +43,6 @@ function StagingAreaTaskContainer({
 											handleSelectedTarget={handleSelectedTarget}
 											selectedTarget={selectedTarget}
 											isDragging={snapshot.isDragging}
-											targetDate={targetDate}
 										/>
 									</div>
 								)}

diff --git a/src/components/common/modal/Modal.tsx b/src/components/common/modal/Modal.tsx
@@ -2,40 +2,32 @@ import styled from '@emotion/styled';
 
 import ModalBackdrop from './ModalBackdrop';
 
+import useTaskDescription from '@/apis/tasks/taskDescription/query';
 import useDeleteTimeBlock from '@/apis/timeBlocks/deleteTimeBlock/query';
 import BtnDate from '@/components/common/BtnDate/BtnDate';
 import OkayCancelBtn from '@/components/common/button/OkayCancelBtn';
 import ModalHeaderBtn from '@/components/common/modal/ModalHeaderBtn';
 import ModalTextInputTime from '@/components/common/modal/ModalTextInputTime';
 import TextInputBox from '@/components/common/modal/TextInputBox';
 import { SizeType } from '@/types/textInputType';
+import formatDatetoLocalDate from '@/utils/formatDatetoLocalDate';
 
 interface ModalProps {
 	isOpen: boolean;
 	sizeType: SizeType;
 	top: number;
 	left: number;
 	onClose: () => void;
-	taskId?: number;
+	taskId: number;
 	timeBlockId?: number;
+	targetDate?: string | null;
 }
-
-function Modal({ isOpen, sizeType, top, left, onClose, taskId, timeBlockId }: ModalProps) {
-	const dummyData = {
-		id: taskId,
-		name: 'task name',
-		description: 'task description',
-		deadLine: {
-			date: '2024-06-30',
-			time: '12:30',
-		},
-		status: '진행 중', // 수정
-		timeBlock: {
-			id: 1,
-			startTime: '2024-07-08T12:30',
-			endTime: '2024-07-08T14:30',
-		},
-	};
+function Modal({ isOpen, sizeType, top, left, onClose, taskId, targetDate = null, timeBlockId }: ModalProps) {
+	const { data, isFetched } = useTaskDescription({
+		taskId,
+		targetDate: formatDatetoLocalDate(targetDate),
+		isOpen,
+	});
 
 	const { mutate } = useDeleteTimeBlock();
 
@@ -50,26 +42,24 @@ function Modal({ isOpen, sizeType, top, left, onClose, taskId, timeBlockId }: Mo
 
 		onClose();
 	};
-
+	if (!isOpen || !isFetched) return null;
 	return (
-		isOpen && (
-			<ModalBackdrop onClick={onClose}>
-				<ModalLayout type={sizeType.type} top={top} left={left} onClick={(e) => e.stopPropagation()}>
-					<ModalHeader>
-						<BtnDate date={dummyData.deadLine.date} time={dummyData.deadLine.time} />
-						<ModalHeaderBtn type={sizeType.type} onDelete={handleDelete} />
-					</ModalHeader>
-					<ModalBody>
-						<TextInputBox type={sizeType.type} name={dummyData.name} desc={dummyData.description} />
-						{sizeType.type === 'long' && <ModalTextInputTime />}
-					</ModalBody>
-					<ModalFooter>
-						<OkayCancelBtn type="cancel" onClick={onClose} />
-						<OkayCancelBtn type="okay" onClick={onClose} />
-					</ModalFooter>
-				</ModalLayout>
-			</ModalBackdrop>
-		)
+		<ModalBackdrop onClick={onClose}>
+			<ModalLayout type={sizeType.type} top={top} left={left} onClick={(e) => e.stopPropagation()}>
+				<ModalHeader>
+					<BtnDate date={data.data.deadLine.date} time={data.data.deadLine.time} />
+					<ModalHeaderBtn type={sizeType.type} onDelete={handleDelete} />
+				</ModalHeader>
+				<ModalBody>
+					<TextInputBox type={sizeType.type} name={data.data.name} desc={data.data.description} />
+					{sizeType.type === 'long' && <ModalTextInputTime />}
+				</ModalBody>
+				<ModalFooter>
+					<OkayCancelBtn type="cancel" onClick={onClose} />
+					<OkayCancelBtn type="okay" onClick={onClose} />
+				</ModalFooter>
+			</ModalLayout>
+		</ModalBackdrop>
 	);
 }
 

diff --git a/src/components/targetArea/TargetArea.tsx b/src/components/targetArea/TargetArea.tsx
@@ -47,6 +47,7 @@ function TargetArea({
 							handleSelectedTarget={handleSelectedTarget}
 							selectedTarget={selectedTarget}
 							tasks={tasks}
+							targetDate={targetDate}
 						/>
 						{provided.placeholder}
 					</div>

diff --git a/src/components/targetArea/TargetAreaDate.tsx b/src/components/targetArea/TargetAreaDate.tsx
@@ -4,11 +4,12 @@ import formatDatetoStrinKor from '@/utils/formatDatetoStringKor';
 
 /** nnnn년 nn월 nn일 */
 interface TargetAreaDateProps {
-	targetDate: Date;
+	targetDate: string;
 }
 
 function TargetAreaDate({ targetDate }: TargetAreaDateProps) {
-	const formatDate = formatDatetoStrinKor(targetDate);
+	const dateTypeDate = new Date(targetDate);
+	const formatDate = formatDatetoStrinKor(dateTypeDate);
 	return <DateText>{formatDate}</DateText>;
 }
 

diff --git a/src/components/targetArea/TargetTaskSection.tsx b/src/components/targetArea/TargetTaskSection.tsx
@@ -11,9 +11,10 @@ interface TargetTaskSectionProps {
 	handleSelectedTarget: (task: TaskType | null) => void;
 	selectedTarget: TaskType | null;
 	tasks: TaskType[];
+	targetDate: string;
 }
 function TargetTaskSection(props: TargetTaskSectionProps) {
-	const { handleSelectedTarget, selectedTarget, tasks } = props;
+	const { handleSelectedTarget, selectedTarget, tasks, targetDate } = props;
 
 	return (
 		<BtnTaskContainer type="target">
@@ -44,6 +45,7 @@ function TargetTaskSection(props: TargetTaskSectionProps) {
 										handleSelectedTarget={handleSelectedTarget}
 										selectedTarget={selectedTarget}
 										isDragging={snapshot.isDragging}
+										targetDate={targetDate}
 									/>
 								</div>
 							)}

diff --git a/src/pages/Today.tsx b/src/pages/Today.tsx
@@ -131,7 +131,7 @@ function Today() {
 						onClickNextDate={handleNextBtn}
 						onClickTodayDate={handleTodayBtn}
 						onClickDatePicker={handleChangeDate}
-						targetDate={selectedDate}
+						targetDate={selectedDate.toString()}
 					/>
 				)}
 			</DragDropContext>

diff --git a/src/types/today/TargetControlSectionProps.ts b/src/types/today/TargetControlSectionProps.ts
@@ -3,5 +3,5 @@ export interface TargetControlSectionProps {
 	onClickNextDate: () => void;
 	onClickTodayDate: () => void;
 	onClickDatePicker: (target: Date) => void;
-	targetDate: Date;
+	targetDate: string;
 }
diff --git a/src/utils/formatDatetoLocalDate.ts b/src/utils/formatDatetoLocalDate.ts
@@ -1,9 +1,10 @@
 /** Date 형식을 0000-00-00 형식 string 으로 반환합니다 */
-const formatDatetoLocalDate = (date: Date | null) => {
+const formatDatetoLocalDate = (date: Date | null | string) => {
 	if (date) {
-		const year = date.getFullYear();
-		const month = '0'.concat((date.getMonth() + 1).toString()).slice(-2);
-		const day = '0'.concat(date.getDate().toString()).slice(-2);
+		const dateTypeDate = new Date(date);
+		const year = dateTypeDate.getFullYear();
+		const month = '0'.concat((dateTypeDate.getMonth() + 1).toString()).slice(-2);
+		const day = '0'.concat(dateTypeDate.getDate().toString()).slice(-2);
 		return `${year}-${month}-${day}`;
 	}
 	return '';

diff --git a/src/utils/formatDatetoString.ts b/src/utils/formatDatetoString.ts
@@ -1,11 +1,12 @@
 /** Date 형식을 0000.00.00 형식 string 으로 반환합니다
  * undefined, null 의 경우 '시간' 텍스트를 반환합니다
  */
-const formatDatetoString = (date: Date | undefined | null) => {
+const formatDatetoString = (date: Date | undefined | null | string) => {
 	if (date) {
-		const year = date.getFullYear();
-		const month = '0'.concat((date.getMonth() + 1).toString()).slice(-2);
-		const day = '0'.concat(date.getDate().toString()).slice(-2);
+		const dateTypeDate = new Date(date);
+		const year = dateTypeDate.getFullYear();
+		const month = '0'.concat((dateTypeDate.getMonth() + 1).toString()).slice(-2);
+		const day = '0'.concat(dateTypeDate.getDate().toString()).slice(-2);
 		return `${year}.${month}.${day}`;
 	}
 	return '';