fix(problem): problem path using id not display id

Author: zdszero

judge/tasks.py

@@ -21,7 +21,7 @@ def judge_task(submission_id, problem_id):
 def local_judge_task(submission_id, problem_id, user_id):
     submission = Submission.objects.get(id=submission_id)
 
-    problem = Problem.objects.get(_id=problem_id)
+    problem = Problem.objects.get(id=problem_id)
     problem.submission_number += 1
     try:
         if SubmissionTester(submission).judge():

judge/testing.py

@@ -24,7 +24,7 @@ class TestResult:
     Error   = 1
     Timeout = 2
 
-def create_new_problem_from_template(new_problem_id: str, old_problem_id: str):
+def create_new_problem_from_template(new_problem_id: int, old_problem_id: int):
     old_path = PathManager.problem_dir(old_problem_id)
     new_path = PathManager.problem_dir(new_problem_id)
     os.makedirs(new_path, exist_ok=True)
@@ -67,8 +67,8 @@ def run_command_with_timeout(command: list, timeout: float) -> int:
 
 class PathManager:
     @staticmethod
-    def problem_dir(problem_id: str) -> str:
-        return join(DATA_DIR, PROBLEM_DIR, problem_id)
+    def problem_dir(id: int) -> str:
+        return join(DATA_DIR, PROBLEM_DIR, str(id))
 
     @staticmethod
     def submission_dir(user_id: str, submission_id: str) -> str:
@@ -91,7 +91,7 @@ def __init__(self, uploaded_file, problem: Problem):
         else:
             raise Exception("zipfile is None")
         self.problem = problem
-        self.problem_dir_path = PathManager.problem_dir(problem._id)
+        self.problem_dir_path = PathManager.problem_dir(problem.id)
         if not exists(self.problem_dir_path):
             os.makedirs(self.problem_dir_path)
         self._error_message: str = ""
@@ -165,7 +165,7 @@ def __init__(self, submission: Submission):
         if not exists(self.sub_dirpath):
             os.makedirs(self.sub_dirpath, exist_ok=True)
         problem: Problem = submission.problem
-        prob_dir = PathManager.problem_dir(problem._id) # use display id
+        prob_dir = PathManager.problem_dir(problem.id) # use display id
         if not exists(prob_dir):
             raise Exception("problem dir {} not exists".format(prob_dir))
         for filename in os.listdir(prob_dir):

problem/views/admin.py

@@ -125,7 +125,7 @@ def delete(self, request):
         except Problem.DoesNotExist:
             return self.error("Problem does not exists")
         ensure_created_by(problem, request.user)
-        d = PathManager.problem_dir(problem._id)
+        d = PathManager.problem_dir(problem.id)
         if os.path.isdir(d):
             print('remove dir', d)
             shutil.rmtree(d, ignore_errors=True)
@@ -322,7 +322,7 @@ def post(self, request):
         new_problem = Problem.objects.create(**data)
         new_problem.tags.set(tags)
 
-        create_new_problem_from_template(new_problem._id, old_problem._id)
+        create_new_problem_from_template(new_problem.id, old_problem.id)
 
         return self.success()