Keep new submissions when applying historical classroom repairs

classroom_service.py

@@ -15,6 +15,8 @@ COURSE_STORAGE_QUOTA_BYTES=max(16, int(os.getenv("CLASSROOM_COURSE_QUOTA_MB", "1
 MAX_VERSIONS_PER_KIND=max(2, int(os.getenv("CLASSROOM_MAX_VERSIONS_PER_KIND", "100")))
 CHECKPOINTS_PER_HOUR=max(1, int(os.getenv("CLASSROOM_CHECKPOINTS_PER_HOUR", "60")))
 SUBMISSIONS_PER_HOUR=max(1, int(os.getenv("CLASSROOM_SUBMISSIONS_PER_HOUR", "20")))
+# Bundled syntax repairs target work saved before 2026-10-04 00:00 Asia/Taipei.
+LEGACY_REPAIR_CUTOFF_MS=1791043200000
 VERSION_WRITE_COOLDOWN_MS=max(0, int(os.getenv("CLASSROOM_VERSION_COOLDOWN_MS", "1500")))
 STUDENT_WS_CONNECTIONS_PER_MINUTE=max(10, int(os.getenv("CLASSROOM_WS_CONNECTIONS_PER_MINUTE", "300")))
 STUDENT_WS_MESSAGES_PER_MINUTE=max(60, int(os.getenv("CLASSROOM_WS_MESSAGES_PER_MINUTE", "300")))
@@ -145,8 +147,9 @@ def init_db():
         if not c.execute("SELECT 1 FROM classroom_migrations WHERE migration_id=?",(migration_id,)).fetchone():
             for repair in REPAIRS.glob("*/*/*.py") if REPAIRS.is_dir() else []:
                 class_code,week_id=repair.parts[-3],repair.parts[-2];student_id=repair.stem
-                row=c.execute("SELECT draft_files,final_files,checkpoint_at,submitted_at FROM classroom_projects WHERE class_code=? AND student_id=? AND week_id=?",(class_code,student_id,week_id)).fetchone()
+                row=c.execute("SELECT draft_files,final_files,checkpoint_at,submitted_at,updated_at FROM classroom_projects WHERE class_code=? AND student_id=? AND week_id=?",(class_code,student_id,week_id)).fetchone()
                 if not row:continue
+                if max(int(row[2] or 0),int(row[3] or 0),int(row[4] or 0))>=LEGACY_REPAIR_CUTOFF_MS:continue
                 draft=json.loads(row[0]);final=json.loads(row[1]) if row[1] else None;fixed=repair.read_text(encoding="utf-8")
                 if row[2] is None or row[2]<int(row[3] or 0):draft["main.py"]=fixed
                 if final is not None:final["main.py"]=fixed

tests/test_classroom.py

@@ -6,6 +6,7 @@ import unittest
 import zipfile
 from pathlib import Path
 from types import SimpleNamespace
+from unittest.mock import patch
 
 import classroom_service as classroom
 
@@ -91,6 +92,31 @@ class ClassroomServiceTests(unittest.TestCase):
         self.assertEqual(len(matching), 1)
         self.assertEqual(matching[0]["files"], loaded["checkpoint_files"])
 
+    def test_fresh_bootstrap_does_not_replace_new_submission_with_legacy_repair(self):
+        data = Path(self.temp_dir.name) / "seed"
+        data.mkdir()
+        (data / "classes.json").write_text("[]", encoding="utf-8")
+        versions = data / "versions"
+        repair = data / "repairs" / "L6A" / "week02" / "student.py"
+        repair.parent.mkdir(parents=True)
+        repair.write_text('print("old repair")\n', encoding="utf-8")
+        files = {"main.py": 'print("latest student story")\n'}
+        timestamp = classroom.LEGACY_REPAIR_CUTOFF_MS + 1
+        record = {"class_code": "L6A", "student_id": "student", "display_name": "Alex",
+                  "week_id": "week02", "version_id": "teacher-submit", "kind": "submit",
+                  "project_name": "case", "created_at": timestamp, "files": files}
+        version = versions / "L6A" / "student" / "week02" / "teacher-submit.json"
+        version.parent.mkdir(parents=True)
+        version.write_text(json.dumps(record), encoding="utf-8")
+        with patch.multiple(classroom, DATA=data, REPAIRS=data / "repairs",
+                            VERSIONS=versions, CHECKPOINTS=data / "checkpoints",
+                            DB=Path(self.temp_dir.name) / "fresh.sqlite3"):
+            classroom.init_db()
+            restored = classroom.load("L6A", "student", "Alex", "week02")
+            self.assertEqual(restored["files"], files)
+            self.assertEqual(restored["final_files"], files)
+            self.assertEqual(restored["submitted_at"], timestamp)
+
     def test_progress_picker_lists_every_checkpoint_and_submission_newest_first(self):
         state = classroom.empty("L6A", "student-1", "Alex", "week02")
         state["project_name"] = "校園謎案"