feat: 커리큘럼 시작일 DTO 추가, 그에 따른 로직 수정

apps/admin/app/studies/[studyId]/_components/assignment/AssignmentList.tsx

@@ -7,8 +7,6 @@ const AssignmentList = async ({ studyId }: { studyId: string }) => {
   const assignmentList = await studyApi.getAssignmentList(
     parseInt(studyId, 10)
   );
-  const study = await studyApi.getStudyBasicInfo(+studyId);
-  const studyStartDate = study?.period?.startDate;
 
   return (
     <section aria-label="assignment-list">
@@ -19,7 +17,6 @@ const AssignmentList = async ({ studyId }: { studyId: string }) => {
           <AssignmentListItem
             assignment={assignment}
             key={`studyDetailId-${index}`}
-            studyStartDate={studyStartDate}
           />
         );
       })}

apps/admin/app/studies/[studyId]/_components/assignment/AssignmentListItem.tsx

@@ -9,12 +9,17 @@ import AssignmentButtons from "./AssignmentButtons";
 
 const AssignmentListItem = ({
   assignment,
-  studyStartDate,
 }: {
   assignment: AssignmentApiResponseDto;
-  studyStartDate?: string;
 }) => {
-  const { studyDetailId, title, deadline, week, assignmentStatus } = assignment;
+  const {
+    studyDetailId,
+    title,
+    deadline,
+    week,
+    assignmentStatus,
+    studyDetailStartDate,
+  } = assignment;
 
   const formatDateToEndString = (date: string | null) => {
     if (!date) return "-";
@@ -23,8 +28,7 @@ const AssignmentListItem = ({
     return `종료 : ${year}년 ${month}월 ${day}일 ${padWithZero(hours)}:${padWithZero(minutes)}`;
   };
 
-  const thisWeekAssignment =
-    studyStartDate && getIsCurrentWeek(studyStartDate, week);
+  const thisWeekAssignment = getIsCurrentWeek(studyDetailStartDate);
   const studyDeadline = formatDateToEndString(deadline);
 
   return (

apps/admin/app/studies/[studyId]/_components/curriculum/CurriculumListItem.tsx

@@ -26,7 +26,7 @@ const CurriculumListItem = ({
   const { month: endMonth, day: endDay } = parseISODate(endDate);
 
   const curriculumTimeLine = `${padWithZero(startMonth)}.${padWithZero(startDay)} - ${padWithZero(endMonth)}.${padWithZero(endDay)}`;
-  const thisWeekAssignment = getIsCurrentWeek(startDate, week);
+  const thisWeekAssignment = getIsCurrentWeek(startDate);
 
   return (
     <Table>

apps/admin/app/studies/assignments/[studyDetailId]/_components/AssignmentForm.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { Flex } from "@styled-system/jsx";
-import { formatDateToISOString, formatStringToDate } from "@wow-class/utils";
+import { formatDateToISOString } from "@wow-class/utils";
 import { useState } from "react";
 import { useFormContext } from "react-hook-form";
 import type {
@@ -20,12 +20,12 @@ const AssignmentForm = ({
   assignment: AssignmentApiResponseDto;
 }) => {
   const { control, setValue } = useFormContext<AssignmentApiRequestDto>();
-  const { title, descriptionLink, deadline } = assignment;
+  const { title, descriptionLink, deadline, studyDetailStartDate } = assignment;
   const [selectedDate, setSelectedDate] = useState<Date | undefined>(
     deadline ? new Date(deadline) : undefined
   );
 
-  const startDate = findStartDate();
+  const startDate = findStartDate(studyDetailStartDate);
 
   return (
     <Flex direction="column" gap="2.25rem">
@@ -75,7 +75,7 @@ const findStartDate = (curriculumStartString?: string) => {
   );
   if (!curriculumStartString) return tomorrow;
 
-  const curriculumStartDate = formatStringToDate(curriculumStartString);
+  const curriculumStartDate = new Date(curriculumStartString);
 
   const curriculumStartTime = curriculumStartDate.getTime();
   const tomorrowTime = tomorrow.getTime();

apps/admin/types/dtos/assignmentList.ts

@@ -8,6 +8,7 @@ export interface AssignmentApiResponseDto {
   week: number;
   descriptionLink: string | null;
   assignmentStatus: StudyAssignmentStatusType;
+  studyDetailStartDate: string;
 }
 
 export interface AssignmentApiRequestDto {

apps/admin/utils/getIsCurrentWeek.ts

@@ -1,12 +1,12 @@
-const getIsCurrentWeek = (dateString: string, week: number): boolean => {
+const getIsCurrentWeek = (dateString: string): boolean => {
   const startDate = new Date(dateString);
   const today = new Date();
 
   const diffInTime = today.getTime() - startDate.getTime();
   const diffInDays = Math.floor(diffInTime / (1000 * 60 * 60 * 24));
-  const weekNumber = Math.ceil((diffInDays + 1) / 7);
+  console.log(diffInDays);
 
-  return weekNumber === week;
+  return 0 <= diffInDays && diffInDays < 7;
 };
 
 export default getIsCurrentWeek;