[Deploy] 과제 페이지 , 수강 신청 페이지 QA 반영

apps/admin/apis/auth/dashboardApi.ts

@@ -1,8 +1,7 @@
 import { fetcher } from "@wow-class/utils";
-import { apiPath, mentorApiPath } from "constants/apiPath";
+import { apiPath } from "constants/apiPath";
 import { tags } from "constants/tags";
 import type { DashboardApiResponseDto } from "types/dtos/auth";
-import type { MyStudyListApiResponseDto } from "types/dtos/studyList";
 
 export const dashboardApi = {
   getDashboardInfo: async () => {
@@ -19,14 +18,4 @@ export const dashboardApi = {
 
     return { studyRole, manageRole };
   },
-  getMyStudyList: async () => {
-    const response = await fetcher.get<MyStudyListApiResponseDto[]>(
-      mentorApiPath.studyList,
-      {
-        next: { tags: [tags.dashboard] },
-        cache: "force-cache",
-      }
-    );
-    return response.data;
-  },
 };

apps/admin/apis/study/studyApi.ts

@@ -24,6 +24,16 @@ export const studyApi = {
 
     return response.data;
   },
+  getMyStudyList: async () => {
+    const response = await fetcher.get<StudyListApiResponseDto[]>(
+      mentorApiPath.studyList,
+      {
+        next: { tags: [tags.myStudyList] },
+        cache: "force-cache",
+      }
+    );
+    return response.data;
+  },
   getStudyBasicInfo: async (studyId: number) => {
     const response = await fetcher.get<StudyBasicInfoApiResponseDto>(
       `/common/studies/${studyId}`,

apps/admin/app/studies/_components/StudyList.tsx

@@ -1,11 +1,15 @@
 import { css } from "@styled-system/css";
 import { studyApi } from "apis/study/studyApi";
+import isAdmin from "utils/isAdmin";
 
 import EmptyStudyList from "./EmptyStudyList";
 import StudyListItem from "./StudyListItem";
 
 const StudyList = async () => {
-  const studyList = await studyApi.getStudyList();
+  const adminStatus = await isAdmin();
+  const studyList = adminStatus
+    ? await studyApi.getStudyList()
+    : await studyApi.getMyStudyList();
 
   if (studyList?.length === 0) {
     return <EmptyStudyList />;

apps/admin/app/studies/create-study/@modal/(.)created-study-check/page.tsx

@@ -31,6 +31,7 @@ const CreatedStudyCheckModal = () => {
 
     if (result.success) {
       await revalidateTagByName(tags.studyList);
+      await revalidateTagByName(tags.myStudyList);
       window.alert("스터디 생성에 성공했어요.");
       router.push(`${routerPath.root.href}`);
     } else {

apps/admin/app/studies/create-study/_components/StudyBasicInformation/StudyStartDatePick.tsx

@@ -61,21 +61,6 @@ const StudyStartDatePick = () => {
     }
   }, [handleStudyDateSelect, studyDate.fromValue, studyDate.toValue, week]);
 
-  const disableDateList = [
-    {
-      from: new Date(0),
-      to: yesterday,
-    },
-    ...(watch("applicationEndDate")
-      ? [
-          {
-            from: new Date(0),
-            to: studyApplyEndDate,
-          },
-        ]
-      : []),
-  ];
-
   return (
     <Flex direction="column" position="relative" width={358}>
       <Text color="sub" style={{ marginBottom: "8px" }} typo="label2">
@@ -115,9 +100,12 @@ const StudyStartDatePick = () => {
       {isOpen && (
         <div ref={datepickerRef}>
           <DayPicker
-            disabled={disableDateList}
             mode="range"
             weekStartsOn={1}
+            disabled={{
+              from: new Date(0),
+              to: yesterday,
+            }}
             selected={{
               from: formatStringToDate(studyDate.fromValue),
               to: formatStringToDate(studyDate.toValue),

apps/admin/components/Navbar.tsx

@@ -1,6 +1,5 @@
 import { css } from "@styled-system/css";
 import { NavItem } from "@wow-class/ui";
-import { dashboardApi } from "apis/auth/dashboardApi";
 import { studyApi } from "apis/study/studyApi";
 import { clientUrl } from "constants/url";
 import Image from "next/image";
@@ -18,9 +17,10 @@ import participantImageUrl from "../public/images/particpant.svg";
  */
 
 const Navbar = async () => {
-  const studyList = (await isAdmin())
+  const adminStatus = await isAdmin();
+  const studyList = adminStatus
     ? await studyApi.getStudyList()
-    : await dashboardApi.getMyStudyList();
+    : await studyApi.getMyStudyList();
 
   const navMenu = [
     {

apps/admin/constants/tags.ts

@@ -3,6 +3,7 @@ export const enum tags {
   assignments = "assignments",
   curriculums = "curriculums",
   studyList = "studyList",
+  myStudyList = "myStudyList",
   studyBasicInfo = "studyBasicInfo",
   announcements = "announcements",
   memberList = "memberList",

apps/admin/types/dtos/studyList.ts

@@ -1,9 +1,5 @@
 import type { DayOfWeekType } from "types/entities/dayofweek";
-import type {
-  StudyKoreanType,
-  StudySemesterType,
-  StudyType,
-} from "types/entities/study";
+import type { StudyKoreanType, StudySemesterType } from "types/entities/study";
 import type { TimeType } from "types/entities/time";
 
 export interface StudyListApiResponseDto {
@@ -20,12 +16,3 @@ export interface StudyListApiResponseDto {
   totalWeek: number;
   openingDate: string;
 }
-
-export interface MyStudyListApiResponseDto {
-  studyId: number;
-  semester: string;
-  title: string;
-  studyType: StudyType;
-  notionLink: string;
-  mentorName: string;
-}

apps/client/apis/studyDetailApi.ts

@@ -1,29 +1,15 @@
 import { fetcher } from "@wow-class/utils";
 import { apiPath } from "constants/apiPath";
 import { tags } from "constants/tags";
-import type {
-  StudyDetailDashboardDto,
-  UpcomingStudyDto,
-} from "types/dtos/studyDetail";
+import type { StudyDetailDashboardDto } from "types/dtos/studyDetail";
 
 export const studyDetailApi = {
   getStudyDetailDashboard: async (studyId: number) => {
     const response = await fetcher.get<StudyDetailDashboardDto>(
       `${apiPath.studyDetail}/dashboard?studyId=${studyId}`,
       {
         next: { tags: [tags.studyDetailDashboard] },
-        cache: "force-cache",
-      }
-    );
-
-    return response.data;
-  },
-  getUpcomingStudy: async (studyId: number) => {
-    const response = await fetcher.get<UpcomingStudyDto>(
-      `${apiPath.studyDetail}/upcoming?studyId=${studyId}`,
-      {
-        next: { tags: [tags.upcomingStudy] },
-        cache: "force-cache",
+        cache: "no-store",
       }
     );
 

apps/client/apis/studyHistoryApi.ts

@@ -9,7 +9,7 @@ export const studyHistoryApi = {
       `${apiPath.studyHistory}/assignments?studyId=${studyId}`,
       {
         next: { tags: [tags.studyHistory] },
-        cache: "force-cache",
+        cache: "no-store",
       }
     );
 

apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxButtons.tsx

@@ -1,61 +1,34 @@
 "use client";
 
 import { Space } from "@wow-class/ui";
-import { myStudyApi } from "apis/myStudyApi";
-import { studyDetailApi } from "apis/studyDetailApi";
+import { padWithZero, parseISODate } from "@wow-class/utils";
 import { studyHistoryApi } from "apis/studyHistoryApi";
 import { tags } from "constants/tags";
 import Link from "next/link";
-import { useEffect, useState } from "react";
+import { toast } from "react-toastify";
 import type { Assignment } from "types/dtos/studyDetail";
 import type { AssignmentSubmissionStatusType } from "types/entities/common/assignment";
-import { getIsAfterStartDate } from "utils/getIsAfterStartDate";
 import { isDeadlinePassed } from "utils/isDeadlinePassed";
 import { revalidateTagByName } from "utils/revalidateTagByName";
 import { Link as LinkIcon, Reload as ReloadIcon } from "wowds-icons";
 import Button from "wowds-ui/Button";
 interface AssignmentBoxButtonsProps {
   assignment: Assignment;
+  repositoryLink?: string;
   buttonsDisabled?: boolean;
 }
 
 export const AssignmentBoxButtons = ({
-  buttonsDisabled: buttonDisabledProp,
+  buttonsDisabled,
   assignment,
+  repositoryLink,
 }: AssignmentBoxButtonsProps) => {
-  const [startDate, setStartDate] = useState("");
-
-  const targetWeek = assignment.week;
-
-  useEffect(() => {
-    const fetchAssignmentStartDate = async () => {
-      const ongoingStudyInfo = await myStudyApi.getMyOngoingStudyInfo();
-
-      if (ongoingStudyInfo?.studyId) {
-        const curriculumData = await myStudyApi.getStudyCurriculumList(
-          ongoingStudyInfo.studyId
-        );
-
-        const matchingWeek = curriculumData?.find(
-          (item) => item.week === targetWeek
-        );
-
-        if (matchingWeek) {
-          setStartDate(matchingWeek.period.startDate);
-        }
-      }
-    };
-
-    fetchAssignmentStartDate();
-  }, [targetWeek]);
-
-  const buttonsDisabled = buttonDisabledProp || !getIsAfterStartDate(startDate);
-
   return (
     <>
       <PrimaryButton
         assignment={assignment}
         buttonsDisabled={buttonsDisabled}
+        repositoryLink={repositoryLink}
       />
       <Space height={8} />
       <SecondaryButton
@@ -68,29 +41,8 @@ export const AssignmentBoxButtons = ({
 const PrimaryButton = ({
   assignment,
   buttonsDisabled,
+  repositoryLink,
 }: AssignmentBoxButtonsProps) => {
-  const [repositoryLink, setRepositoryLink] = useState("");
-
-  useEffect(() => {
-    const fetchStudyDashBoard = async () => {
-      const ongoingStudyInfo = await myStudyApi.getMyOngoingStudyInfo();
-      if (!ongoingStudyInfo) {
-        return;
-      }
-      const studyDashboard = await studyDetailApi.getStudyDetailDashboard(
-        ongoingStudyInfo.studyId
-      );
-
-      if (!studyDashboard) {
-        return;
-      } else {
-        setRepositoryLink(studyDashboard.repositoryLink);
-      }
-    };
-
-    fetchStudyDashBoard();
-  }, []);
-
   const { assignmentSubmissionStatus, submissionFailureType, submissionLink } =
     assignment;
   const { primaryButtonText } =
@@ -105,14 +57,13 @@ const PrimaryButton = ({
     return;
   }
   const stroke = buttonsDisabled ? "mono100" : "primary";
-  const link =
-    assignmentSubmissionStatus === null ? repositoryLink : submissionLink;
-
+  const primaryButtonHref =
+    assignmentSubmissionStatus === "SUCCESS" ? submissionLink : repositoryLink;
   return (
     <Button
       asProp={Link}
       disabled={buttonsDisabled}
-      href={link ?? ""}
+      href={primaryButtonHref ?? ""}
       icon={<LinkIcon height={20} stroke={stroke} width={20} />}
       style={buttonStyle}
       target="_blank"
@@ -126,43 +77,43 @@ const PrimaryButton = ({
 const SecondaryButton = ({
   assignment,
   buttonsDisabled,
-}: AssignmentBoxButtonsProps) => {
+}: Omit<AssignmentBoxButtonsProps, "repositoryLink">) => {
   const { assignmentSubmissionStatus, studyDetailId, deadline, committedAt } =
     assignment;
+  if (isDeadlinePassed(deadline)) {
+    return (
+      <Button disabled={true} style={buttonStyle}>
+        마감
+      </Button>
+    );
+  }
   const { secondaryButtonText } =
     assignmentSubmissionStatus === null
       ? buttonTextMap.INITIAL
       : buttonTextMap[assignmentSubmissionStatus];
+
   const handleClickSubmissionComplete = async () => {
     const response = await studyHistoryApi.submitAssignment(studyDetailId);
     if (response.success) {
-      //TODO: 과제 제출 이후에는 과제 상태에 대한 업데이트 필요
-      //이번주 과제 조회 api, 대시보드 api revaliate
-      revalidateTagByName(
-        assignmentSubmissionStatus === null
-          ? tags.studyDetailDashboard
-          : tags.upcomingStudy
-      );
+      revalidateTagByName(tags.studyDetailDashboard);
       revalidateTagByName(tags.studyHistory);
+      toast.success("과제 제출이 완료되었어요.");
     }
   };
 
-  if (isDeadlinePassed(deadline)) {
-    return (
-      <Button disabled={true} style={buttonStyle}>
-        마감
-      </Button>
-    );
-  }
   const stroke = buttonsDisabled ? "mono100" : "backgroundNormal";
+  const { year, month, day, hours, minutes } = parseISODate(
+    committedAt as string
+  );
+  const commitText = `최종 수정일자 ${year}년 ${month}월 ${day}일 ${padWithZero(hours)}:${padWithZero(minutes)}`;
   return (
     <Button
       disabled={buttonsDisabled}
       icon={<ReloadIcon height={20} stroke={stroke} width={20} />}
       style={buttonStyle}
       {...(assignmentSubmissionStatus === "SUCCESS" &&
         committedAt && {
-          subText: `최종 수정일자 ${committedAt}`,
+          subText: commitText,
         })}
       onClick={handleClickSubmissionComplete}
     >
@@ -173,7 +124,7 @@ const SecondaryButton = ({
 
 const buttonStyle = {
   maxWidth: "100%",
-  height: "48px !important",
+  height: "fit-content",
 };
 
 const buttonTextMap: Record<