Fix tests

backend/api/fixtures/realistic/realistic.yaml

@@ -172,7 +172,6 @@
     time_limit: 10
     memory_limit: 50
     show_log: false
-    show_artifact: false
 - model: api.extracheck
   pk: 1
   fields:
@@ -183,7 +182,6 @@
     time_limit: 30
     memory_limit: 128
     show_log: true
-    show_artifact: true
 
 # MARK: Students
 - model: api.student
@@ -693,43 +691,36 @@
   fields:
     extra_check: 0
     log_file: fixtures/realistic/projects/0/0/submissions/0/submission_1/logs/log_extra_check_0.txt
-    artifact: ""
 - model: api.extracheckresult
   pk: 3
   fields:
     extra_check: 1
     log_file: fixtures/realistic/projects/0/0/submissions/0/submission_1/logs/log_extra_check_1.txt
-    artifact: fixtures/realistic/projects/0/0/submissions/0/submission_1/artifacts/artifact_extra_check_1.zip
 - model: api.extracheckresult
   pk: 5
   fields:
     extra_check: 0
     log_file: fixtures/realistic/projects/0/0/submissions/0/submission_2/logs/log_extra_check_0.txt
-    artifact: ""
 - model: api.extracheckresult
   pk: 6
   fields:
     extra_check: 1
     log_file: fixtures/realistic/projects/0/0/submissions/0/submission_2/logs/log_extra_check_1.txt
-    artifact: fixtures/realistic/projects/0/0/submissions/0/submission_2/artifacts/artifact_extra_check_1.zip
 - model: api.extracheckresult
   pk: 8
   fields:
     extra_check: 0
     log_file: ""
-    artifact: ""
 - model: api.extracheckresult
   pk: 9
   fields:
     extra_check: 1
     log_file: ""
-    artifact: ""
 - model: api.extracheckresult
   pk: 11
   fields:
     extra_check: 0
     log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_0.txt
-    artifact: ""
 - model: api.extracheckresult
   pk: 12
   fields:

backend/api/locale/en/LC_MESSAGES/django.po

@@ -34,61 +34,61 @@ msgstr "Docker image is ready"
 msgid "dockerimage.state.error"
 msgstr "Docker image failed to build"
 
-#: models/submission.py:62
+#: models/submission.py:61
 msgid "submission.state.queued"
 msgstr "Queued"
 
-#: models/submission.py:63
+#: models/submission.py:62
 msgid "submission.state.running"
 msgstr "Running"
 
-#: models/submission.py:64
+#: models/submission.py:63
 msgid "submission.state.success"
 msgstr "Success"
 
-#: models/submission.py:65
+#: models/submission.py:64
 msgid "submission.state.failed"
 msgstr "Failed"
 
-#: models/submission.py:70
+#: models/submission.py:69
 msgid "submission.error.blockedextension"
 msgstr "The zip file contains a file with a non-allowed extension."
 
-#: models/submission.py:71
+#: models/submission.py:70
 msgid "submission.error.obligatedextensionnotfound"
 msgstr ""
 "The submitted zip file doesn't have any file with an obligated file "
 "extension."
 
-#: models/submission.py:72
+#: models/submission.py:71
 msgid "submission.error.filedirnotfound"
 msgstr "The submitted zip file lacks an obligated directory."
 
-#: models/submission.py:75
+#: models/submission.py:74
 msgid "submission.error.dockerimageerror"
 msgstr "try again later."
 
-#: models/submission.py:76
+#: models/submission.py:75
 msgid "submission.error.timelimit"
 msgstr "Timelimit exceeded."
 
-#: models/submission.py:77
+#: models/submission.py:76
 msgid "submission.error.memorylimit"
 msgstr "Memorylimit exceeded."
 
-#: models/submission.py:78
+#: models/submission.py:77
 msgid "submission.error.checkerror"
 msgstr "A check failed."
 
-#: models/submission.py:79
+#: models/submission.py:78
 msgid "submission.error.runtimeerror"
 msgstr "Crashed."
 
-#: models/submission.py:80
+#: models/submission.py:79
 msgid "submission.error.unknown"
 msgstr "Unkown error."
 
-#: models/submission.py:81
+#: models/submission.py:80
 msgid "submission.error.failedstructurecheck"
 msgstr "The zip file doesn't have the right structure."
 

backend/api/locale/nl/LC_MESSAGES/django.po

@@ -34,61 +34,61 @@ msgstr "Docker image is klaar."
 msgid "dockerimage.state.error"
 msgstr "Docker image is gefaald om te bouwen."
 
-#: models/submission.py:62
+#: models/submission.py:61
 msgid "submission.state.queued"
 msgstr "wachten"
 
-#: models/submission.py:63
+#: models/submission.py:62
 msgid "submission.state.running"
 msgstr "lopen"
 
-#: models/submission.py:64
+#: models/submission.py:63
 msgid "submission.state.success"
 msgstr "succes"
 
-#: models/submission.py:65
+#: models/submission.py:64
 msgid "submission.state.failed"
 msgstr "gefaald"
 
-#: models/submission.py:70
+#: models/submission.py:69
 msgid "submission.error.blockedextension"
 msgstr "De zip file bevat een niet toegelaten bestandstype."
 
-#: models/submission.py:71
+#: models/submission.py:70
 msgid "submission.error.obligatedextensionnotfound"
 msgstr ""
 "Er is geen enkel bestand met een bepaalde bestandstype die verplicht is in "
 "het ingediende zip-bestand."
 
-#: models/submission.py:72
+#: models/submission.py:71
 msgid "submission.error.filedirnotfound"
 msgstr "De ingediende zip file mankeerd een verplichtte map."
 
-#: models/submission.py:75
+#: models/submission.py:74
 msgid "submission.error.dockerimageerror"
 msgstr "Probeer later opnieuw."
 
-#: models/submission.py:76
+#: models/submission.py:75
 msgid "submission.error.timelimit"
 msgstr "Tijdslimit bereikt."
 
-#: models/submission.py:77
+#: models/submission.py:76
 msgid "submission.error.memorylimit"
 msgstr "Geheugenlimiet bereikt."
 
-#: models/submission.py:78
+#: models/submission.py:77
 msgid "submission.error.checkerror"
 msgstr "Een check faalde."
 
-#: models/submission.py:79
+#: models/submission.py:78
 msgid "submission.error.runtimeerror"
 msgstr "Crashed."
 
-#: models/submission.py:80
+#: models/submission.py:79
 msgid "submission.error.unknown"
 msgstr "Onbekende fout."
 
-#: models/submission.py:81
+#: models/submission.py:80
 msgid "submission.error.failedstructurecheck"
 msgstr "De ingediende zip file heeft niet de juiste structuur."
 

backend/api/logic/get_file_path.py

@@ -56,8 +56,3 @@ def get_docker_image_file_path(instance: DockerImage, _: str) -> str:
 
 def get_docker_image_tag(instance: DockerImage) -> str:
     return f"{DOCKER_BUILD_ROOT_NAME}_{instance.id}"
-
-
-def get_extra_check_artifact_file_path(instance: ExtraCheckResult, uuid: str) -> str:
-    return (f"{_get_project_dir_path(instance.submission.group.project)}"
-            f"submissions/{instance.submission.group.id}/{uuid}/artifacts/{_get_uuid()}.zip")

backend/api/models/checks.py

@@ -14,6 +14,8 @@ class FileExtension(models.Model):
         unique=True
     )
 
+# TODO: Remove zip.* translations
+
 
 class StructureCheck(models.Model):
     """Model that represents a structure check for a project.
@@ -98,6 +100,7 @@ class ExtraCheck(models.Model):
     )
 
     # Maximum memory the container uses in MB
+    # TODO: Set max and min
     memory_limit = models.PositiveSmallIntegerField(
         default=128,
         blank=False,
@@ -110,10 +113,3 @@ class ExtraCheck(models.Model):
         blank=False,
         null=False
     )
-
-    # Whether the artifacts should made available to the student
-    show_artifact = models.BooleanField(
-        default=True,
-        blank=False,
-        null=False
-    )

backend/api/models/submission.py

@@ -1,7 +1,6 @@
 from typing import TYPE_CHECKING
 
-from api.logic.get_file_path import (get_extra_check_artifact_file_path,
-                                     get_extra_check_log_file_path,
+from api.logic.get_file_path import (get_extra_check_log_file_path,
                                      get_submission_file_path)
 from api.models.checks import ExtraCheck, StructureCheck
 from api.models.group import Group
@@ -138,11 +137,3 @@ class ExtraCheckResult(CheckResult):
         blank=False,
         null=True
     )
-
-    # File path for the artifact of the extra checks
-    artifact = models.FileField(
-        upload_to=get_extra_check_artifact_file_path,
-        max_length=256,
-        blank=False,
-        null=True
-    )

backend/api/permissions/group_permissions.py

@@ -1,10 +1,8 @@
-from api.models.group import Group
 from api.permissions.role_permissions import (is_assistant, is_student,
                                               is_teacher)
 from authentication.models import User
 from rest_framework.permissions import SAFE_METHODS, BasePermission
 from rest_framework.request import Request
-from rest_framework.views import APIView
 from rest_framework.viewsets import ViewSet
 
 
@@ -61,23 +59,6 @@ def has_object_permission(self, request: Request, view: ViewSet, group) -> bool:
 class GroupSubmissionPermission(BasePermission):
     """Permission class for submission related group endpoints"""
 
-    def has_permission(self, request: Request, view: APIView) -> bool:
-        user: User = request.user
-        group_id = view.kwargs.get('pk')
-        group: Group | None = Group.objects.get(id=group_id) if group_id else None
-
-        if group is None:
-            return True
-
-        # Teachers and assistants of that course can view all submissions
-        if is_teacher(user):
-            return group.project.course.teachers.filter(id=user.teacher.id).exists()
-
-        if is_assistant(user):
-            return group.project.course.assistants.filter(id=user.assistant.id).exists()
-
-        return is_student(user) and group.students.filter(id=user.student.id).exists()
-
     def had_object_permission(self, request: Request, view: ViewSet, group) -> bool:
         user: User = request.user
         course = group.project.course

backend/api/permissions/project_permissions.py

@@ -13,6 +13,11 @@ def has_permission(self, request: Request, view: ViewSet) -> bool:
         """Check if user has permission to view a general project endpoint."""
         user: User = request.user
 
+        # TODO: Sure return True corresponds with the comments made above
+        # The general project endpoint that lists all projects is not accessible for any role.
+        if request.method in SAFE_METHODS:
+            return True
+
         # We only allow teachers and assistants to create new projects.
         return is_teacher(user) or is_assistant(user)
 

backend/api/permissions/submission_permissions.py

@@ -57,18 +57,3 @@ def has_object_permission(self, request: Request, view: APIView, obj: ExtraCheck
             return obj.extra_check.show_log
 
         return True
-
-
-class ExtraCheckResultArtifactPermission(ExtraCheckResultPermission):
-    def has_object_permission(self, request: Request, view: APIView, obj: ExtraCheckResult) -> bool:
-        result = super().has_object_permission(request, view, obj)
-
-        if not result:
-            return False
-
-        user: User = cast(User, request.user)
-
-        if is_student(user):
-            return obj.extra_check.show_artifact
-
-        return True

backend/api/serializers/submission_serializer.py

@@ -39,9 +39,6 @@ def to_representation(self, instance: ExtraCheckResult) -> dict | None:
             representation["log_file"] = request.build_absolute_uri(
                 reverse("extra-check-result-detail", args=[str(instance.id)]) + "log/"
             )
-            representation["artifact"] = request.build_absolute_uri(
-                reverse("extra-check-result-detail", args=[str(instance.id)]) + "artifact/"
-            )
             return representation
 
         return None