retest

Main/views/SolutionView.py

@@ -1,5 +1,6 @@
 from Main.models import Solution
 from SprintLib.BaseView import BaseView, AccessError
+from SprintLib.utils import send_testing
 
 
 class SolutionView(BaseView):
@@ -8,8 +9,25 @@ class SolutionView(BaseView):
     endpoint = "solution"
     solution: Solution
 
-    def pre_handle(self):
+    def check_admin(self):
+        user = self.request.user
         if self.request.user.is_superuser:
+            return True
+        if self.solution.task.creator == user or user.username in self.solution.task.editors:
+            return True
+        if self.solution.set:
+            if self.solution.set.creator == user or user.username in self.solution.set.editors:
+                return True
+        return False
+
+    def pre_handle(self):
+        if self.check_admin():
             return
         if self.solution.user != self.request.user:
             raise AccessError()
+
+    def post_retest(self):
+        if not self.check_admin():
+            return "/"
+        send_testing(self.solution)
+        return "/solution?solution_id=" + str(self.solution.id)

Main/views/TaskView.py

@@ -5,8 +5,7 @@ from zipfile import ZipFile
 from Main.models import Solution, Progress, SolutionFile, SetTask, Task, Set
 from SprintLib.BaseView import BaseView, AccessError
 from SprintLib.language import languages
-from SprintLib.queue import send_to_queue
-from SprintLib.utils import write_bytes
+from SprintLib.utils import write_bytes, send_testing
 
 
 class TaskView(BaseView):
@@ -55,7 +54,7 @@ class TaskView(BaseView):
             solution=self.solution,
             fs_id=fs_id,
         )
-        self.send_testing()
+        send_testing(self.solution)
         return ("/task?setTask_id=" + str(self.setTask.id)) if self.set else ("/task?task_id=" + str(self.task.id))
 
     def post_1(self):
@@ -81,10 +80,5 @@ class TaskView(BaseView):
                 solution=self.solution,
                 fs_id=fs_id,
             )
-        self.send_testing()
+        send_testing(self.solution)
         return ("/task?setTask_id=" + str(self.setTask.id)) if self.set else ("/task?task_id=" + str(self.task.id))
-
-    def send_testing(self):
-        if self.solution.set is not None and len(self.solution.set.checkers.all()) != 0:
-            return
-        send_to_queue("test", {"id": self.solution.id})