Revert "feat: Enable reuplading old versions (#229)" (#238)

This reverts commit a3f2cf9.

Author: yammesicka

lms/lmsdb/models.py

@@ -340,21 +340,13 @@ def create_hash(content: Union[str, bytes], *args, **kwargs) -> str:
 
     @classmethod
     def is_duplicate(
-            cls, content: Union[str, bytes], user: User, exercise: Exercise,
-            *, already_hashed: bool = False,
+            cls, content: Union[str, bytes], user: User, *,
+            already_hashed: bool = False,
     ) -> bool:
         hash_ = cls.create_hash(content) if not already_hashed else content
-
-        return (
-            cls
-            .select()
-            .group_by(cls.solver, cls.exercise)
-            .having(
-                cls.submission_timestamp == fn.MAX(cls.submission_timestamp),
-                cls.solver == user,
-                cls.exercise == exercise,
-                cls.hashed == hash_,
-            )
+        return cls.select().where(
+            cls.hashed == hash_,
+            cls.solver == user,
         ).exists()
 
     def start_checking(self) -> bool:
@@ -435,10 +427,7 @@ def create_solution(
         if len(files) == 1:
             hash_ = cls.create_hash(files[0].code)
 
-        if (
-            hash_
-            and cls.is_duplicate(hash_, solver, exercise, already_hashed=True)
-        ):
+        if hash_ and cls.is_duplicate(hash_, solver, already_hashed=True):
             raise AlreadyExists('This solution already exists.')
 
         instance = cls.create(**{

lms/models/upload.py

@@ -12,12 +12,8 @@
 from lms.utils.log import log
 
 
-def _is_uploaded_before(
-    user: User, exercise: Exercise, file_hash: str,
-) -> bool:
-    return Solution.is_duplicate(
-        file_hash, user, exercise, already_hashed=True,
-    )
+def _is_uploaded_before(user: User, file_hash: str) -> bool:
+    return Solution.is_duplicate(file_hash, user, already_hashed=True)
 
 
 def _upload_to_db(
@@ -33,7 +29,7 @@ def _upload_to_db(
         raise UploadError(
             f'Exercise {exercise_id} is closed for new solutions.')
 
-    if solution_hash and _is_uploaded_before(user, exercise, solution_hash):
+    if solution_hash and _is_uploaded_before(user, solution_hash):
         raise AlreadyExists('You try to reupload an old solution.')
     elif not files:
         raise UploadError(f'There are no files to upload for {exercise_id}.')
@@ -58,7 +54,6 @@ def new(user: User, file: FileStorage) -> Tuple[List[int], List[int]]:
     matches: List[int] = []
     misses: List[int] = []
     errors: List[Union[UploadError, AlreadyExists]] = []
-
     for exercise_id, files, solution_hash in Extractor(file):
         try:
             solution = _upload_to_db(exercise_id, user, files, solution_hash)

lms/tests/test_solutions.py

@@ -50,20 +50,6 @@ def test_new_solution_override_old_solutions(
         assert next_unchecked.id == second_solution.id
         assert next_unchecked_by_id.id == second_solution.id
 
-        third_solution = conftest.create_solution(
-            exercise, student_user, code='123',
-        )
-        fourth_solution = conftest.create_solution(
-            exercise, student_user, code='1234',
-        )
-        assert not Solution.is_duplicate(
-            third_solution.hashed, student_user, exercise, already_hashed=True,
-        )
-        assert Solution.is_duplicate(
-            fourth_solution.hashed, student_user, exercise,
-            already_hashed=True,
-        )
-
     def test_next_exercise_with_cleanest_code(
             self,
             comment: Comment,