Merge branch 'main' into deploy-hj

Author: dnqudgml12

src/pages/AssignmentPage/ProblemSolvePage/hooks/useProblemSolve.ts

@@ -425,6 +425,21 @@ export function useProblemSolve() {
 			return;
 		}
 
+		const deadlineRaw = assignmentInfo.endDate || assignmentInfo.dueDate;
+		if (
+			!isManager &&
+			deadlineRaw &&
+			Date.now() > new Date(deadlineRaw).getTime()
+		) {
+			if (
+				!window.confirm(
+					"마감 시간이 지났습니다. 지금 제출하면 지각으로 표시됩니다. 계속하시겠습니까?",
+				)
+			) {
+				return;
+			}
+		}
+
 		setIsSubmitting(true);
 		setSubmissionResult(null);
 		try {
@@ -478,7 +493,18 @@ export function useProblemSolve() {
 		} finally {
 			setIsSubmitting(false);
 		}
-	}, [code, language, sectionId, problemId, clearSessionAfterSubmission, isAssignmentActive, navigate, userRole]);
+	}, [
+		code,
+		language,
+		sectionId,
+		problemId,
+		clearSessionAfterSubmission,
+		isAssignmentActive,
+		navigate,
+		userRole,
+		assignmentInfo.endDate,
+		assignmentInfo.dueDate,
+	]);
 
 	const handleSubmitWithOutput = useCallback(async () => {
 		if (!code.trim()) {

src/pages/TutorPage/Grades/GradeManagement/hooks/useGradeManagement.ts

@@ -17,6 +17,7 @@ import type {
 	CodeResponse,
 	ProblemGrade,
 } from "../types";
+import { formatLateDurationForGradeCsv } from "../utils/gradeExportLateDuration";
 
 export function useGradeManagement() {
 	const { sectionId } = useParams<{ sectionId?: string }>();
@@ -774,16 +775,6 @@ export function useGradeManagement() {
 			if (dueAt && new Date() > new Date(dueAt)) return '"미제출"';
 			return '""';
 		};
-		/** 지각시간: ZIP submissions.csv와 동일하게 서버 계산값(lateDuration)만 사용 */
-		const formatLateDurationForCSV = (
-			pg: ProblemGrade | null | undefined,
-		): string => {
-			if (!pg?.submitted) return '""';
-			const t = pg.lateDuration?.trim();
-			if (!t) return '""';
-			return `"${t.replace(/"/g, '""')}"`;
-		};
-
 		// 전체 과제 보기: 과제만 필터한 courseGrades로 내보내기
 		if (
 			viewMode === "assignment" &&
@@ -838,7 +829,9 @@ export function useGradeManagement() {
 								getSubmissionDisplayForCSV(problemGrade?.submittedAt, dueAt),
 							);
 							row.push(formatDateForCSV(dueAt));
-							row.push(formatLateDurationForCSV(problemGrade));
+							row.push(
+								formatLateDurationForGradeCsv(problemGrade, dueAt),
+							);
 							if (typeof score === "number") {
 								totalAllScore += score;
 							}
@@ -929,7 +922,9 @@ export function useGradeManagement() {
 								getSubmissionDisplayForCSV(problemGrade?.submittedAt, dueAt),
 							);
 							row.push(formatDateForCSV(dueAt));
-							row.push(formatLateDurationForCSV(problemGrade));
+							row.push(
+								formatLateDurationForGradeCsv(problemGrade, dueAt),
+							);
 							if (typeof score === "number") {
 								totalAllScore += score;
 							}
@@ -1016,7 +1011,9 @@ export function useGradeManagement() {
 								getSubmissionDisplayForCSV(problemGrade?.submittedAt, dueAt),
 							);
 							row.push(formatDateForCSV(dueAt));
-							row.push(formatLateDurationForCSV(problemGrade));
+							row.push(
+								formatLateDurationForGradeCsv(problemGrade, dueAt),
+							);
 							if (score !== "" && score !== null && typeof score === "number") {
 								totalAllScore += score;
 							}
@@ -1045,7 +1042,9 @@ export function useGradeManagement() {
 								getSubmissionDisplayForCSV(problemGrade?.submittedAt, dueAt),
 							);
 							row.push(formatDateForCSV(dueAt));
-							row.push(formatLateDurationForCSV(problemGrade));
+							row.push(
+								formatLateDurationForGradeCsv(problemGrade, dueAt),
+							);
 							if (score !== "" && score !== null && typeof score === "number") {
 								totalAllScore += score;
 							}
@@ -1113,7 +1112,9 @@ export function useGradeManagement() {
 					row.push(String(score));
 					row.push(getSubmissionDisplayForCSV(problem.submittedAt, quizDueAt));
 					row.push(formatDateForCSV(quizDueAt));
-					row.push(formatLateDurationForCSV(problem));
+					row.push(
+						formatLateDurationForGradeCsv(problem, quizDueAt),
+					);
 				}
 				const totalScore = student.totalScore ?? 0;
 				const totalPoints = student.totalPoints ?? 0;
@@ -1177,7 +1178,9 @@ export function useGradeManagement() {
 					getSubmissionDisplayForCSV(problem.submittedAt, assignmentDueAt),
 				);
 				row.push(formatDateForCSV(assignmentDueAt));
-				row.push(formatLateDurationForCSV(problem));
+				row.push(
+					formatLateDurationForGradeCsv(problem, assignmentDueAt),
+				);
 			}
 			const totalScore = student.totalScore ?? 0;
 			const totalPoints = student.totalPoints ?? 0;

src/pages/TutorPage/Grades/GradeManagement/utils/gradeExportLateDuration.ts

@@ -0,0 +1,73 @@
+import type { ProblemGrade } from "../types";
+
+/**
+ * 백엔드 {@code SubmissionDeadlineComparison}과 동일한 전제:
+ * - 제출 시각 문자열: KST 벽시계(타임존 없는 ISO)
+ * - 마감/종료 문자열: UTC 벽시계(과제 endDate·퀴즈 endTime 저장 방식과 동일)
+ */
+function instantMsFromKstWall(raw: string): number | null {
+	const trimmed = raw.trim().replace(" ", "T");
+	if (!trimmed) return null;
+	if (/Z$/i.test(trimmed) || /[+-]\d{2}:?\d{2}$/.test(trimmed)) {
+		const t = Date.parse(trimmed);
+		return Number.isNaN(t) ? null : t;
+	}
+	const base = trimmed.includes("T") ? trimmed : `${trimmed}T00:00:00`;
+	const t = Date.parse(`${base}+09:00`);
+	return Number.isNaN(t) ? null : t;
+}
+
+function instantMsFromUtcWall(raw: string): number | null {
+	const trimmed = raw.trim().replace(" ", "T");
+	if (!trimmed) return null;
+	if (/Z$/i.test(trimmed)) {
+		const t = Date.parse(trimmed);
+		return Number.isNaN(t) ? null : t;
+	}
+	if (/[+-]\d{2}:?\d{2}$/.test(trimmed)) {
+		const t = Date.parse(trimmed);
+		return Number.isNaN(t) ? null : t;
+	}
+	const base = trimmed.includes("T") ? trimmed : `${trimmed}T00:00:00`;
+	const t = Date.parse(`${base}Z`);
+	return Number.isNaN(t) ? null : t;
+}
+
+/** Java {@code SubmissionDeadlineComparison.lateDurationText} 와 동일한 분 단위·문구 */
+function lateDurationTextKo(submittedMs: number, dueMs: number): string {
+	if (submittedMs <= dueMs) return "";
+	const minutes = Math.floor((submittedMs - dueMs) / 60000);
+	const days = Math.floor(minutes / (24 * 60));
+	const hours = Math.floor((minutes % (24 * 60)) / 60);
+	const mins = minutes % 60;
+	const parts: string[] = [];
+	if (days > 0) parts.push(`${days}일`);
+	if (hours > 0) parts.push(`${hours}시간`);
+	if (mins > 0 || parts.length === 0) parts.push(`${mins}분`);
+	return parts.join(" ");
+}
+
+function csvQuote(text: string): string {
+	return `"${text.replace(/"/g, '""')}"`;
+}
+
+/**
+ * 성적보내기 CSV의 지각시간 열 (ZIP submissions.csv lateDuration 과 동일 규칙).
+ * 제출·마감 시각이 있으면 항상 위 규칙으로 계산하고, 파싱 실패 시에만 API lateDuration 사용.
+ */
+export function formatLateDurationForGradeCsv(
+	pg: ProblemGrade | null | undefined,
+	dueAt: string | undefined,
+): string {
+	if (!pg?.submitted) return '""';
+	const subMs = pg.submittedAt
+		? instantMsFromKstWall(pg.submittedAt)
+		: null;
+	const dueMs = dueAt ? instantMsFromUtcWall(dueAt) : null;
+	if (subMs != null && dueMs != null) {
+		const text = lateDurationTextKo(subMs, dueMs);
+		return text ? csvQuote(text) : '""';
+	}
+	const fallback = pg.lateDuration?.trim();
+	return fallback ? csvQuote(fallback) : '""';
+}