Merge pull request #189 from SystemConsultantGroup/develop

수정사항 반영을 위해 main 브랜치로 머지합니다.
SystemConsultantGroup · Oct 17, 2024 · 844f1d4 · 844f1d4
2 parents b30e463 + 431958f
commit 844f1d4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/api/_types/reviews.ts b/src/api/_types/reviews.ts
@@ -77,7 +77,7 @@ export interface FinalReviewResponse extends CommonApiResponse {
 export interface UpdateReviewRequestBody {
   contentStatus: Status;
   presentationStatus?: Status | null;
-  comment?: string;
+  comment?: string | null;
   fileUUID?: string;
 }
 

diff --git a/src/app/prof/review/[id]/ProfessorReviewForm.tsx b/src/app/prof/review/[id]/ProfessorReviewForm.tsx
@@ -90,6 +90,11 @@ export function ProfessorReviewForm({
         presentationStatus: input.presentation,
         ...(commentType === "심사 의견" ? { comment: input.comment } : {}),
         ...(commentType === "심사 의견 파일" ? { fileUUID } : {}),
+        ...(commentType === undefined
+          ? previous.reviewFile
+            ? { fileUUID: previous.reviewFile.uuid }
+            : { comment: previous.comment }
+          : {}),
       } satisfies UpdateReviewRequestBody,
       { baseURL: process.env.NEXT_PUBLIC_REVIEW_API_ENDPOINT }
     );
@@ -142,8 +147,18 @@ export function ProfessorReviewForm({
         review={{
           thesis: values.thesis,
           presentation: values.presentation,
-          comment: commentType === "심사 의견" ? values.comment : "",
-          commentFile: commentType === "심사 의견 파일" ? values.commentFile?.name ?? null : null,
+          comment:
+            commentType === "심사 의견"
+              ? values.comment
+              : previous.contentStatus === "PENDING"
+                ? previous.comment
+                : "",
+          commentFile:
+            commentType === "심사 의견 파일"
+              ? values.commentFile?.name ?? null
+              : previous.contentStatus === "PENDING"
+                ? previous.reviewFile?.name ?? null
+                : null,
         }}
         opened={showConfirmDialog}
         onConfirm={() => handleSubmit(values)}

diff --git a/src/components/pages/review/Review/ReviewResult.tsx b/src/components/pages/review/Review/ReviewResult.tsx
@@ -10,7 +10,7 @@ export interface ReviewResultProps {
   stage: Stage;
   thesis?: Status;
   presentation?: Status | null;
-  comment?: string;
+  comment?: string | null;
   commentFile?: string | null;
   isFinal?: boolean;
 }

diff --git a/src/components/pages/review/ReviewConfirmModal/ReviewConfirmModal.tsx b/src/components/pages/review/ReviewConfirmModal/ReviewConfirmModal.tsx
@@ -12,7 +12,7 @@ export interface ReviewConfirmModalProps extends PropsWithChildren {
   review: {
     thesis: Status;
     presentation: Status | null;
-    comment: string;
+    comment: string | null;
     commentFile: string | null;
   };
   opened: boolean;