- Added few tests

- Added fields as asked

Author: orronai

lms/lmsdb/models.py

@@ -23,6 +23,7 @@
 from lms.lmsdb import database_config
 from lms.models.errors import AlreadyExists
 from lms.utils import hashing
+from lms.utils.courses import generate_invite_code
 from lms.utils.log import log
 
 
@@ -137,6 +138,8 @@ class Course(BaseModel):
     due_date = DateTimeField(null=True)
     is_finished = BooleanField(default=False)
     close_registration_date = DateTimeField(default=datetime.now)
+    invite_code = CharField(default=generate_invite_code, unique=True)
+    is_public = BooleanField(default=False)
 
     def __str__(self):
         return f'{self.name}: {self.date} - {self.due_date}'
@@ -230,11 +233,10 @@ def is_user_registered(cls, user_id: int, course_id: int) -> bool:
         return (
             cls.
             select()
-            .join(User)
-            .where(User.id == user_id)
-            .switch()
-            .join(Course)
-            .where(Course.id == course_id)
+            .where(
+                cls.user == user_id,
+                cls.course == course_id,
+            )
             .exists()
         )
 

lms/lmsweb/views.py

@@ -430,7 +430,7 @@ def upload_page(course_id: int):
         return fail(422, 'No file was given.')
 
     try:
-        matches, misses = upload.new(user, file, course_id)
+        matches, misses = upload.new(user, course_id, file)
     except UploadError as e:
         log.debug(e)
         return fail(400, str(e))

lms/models/upload.py

@@ -64,7 +64,7 @@ def _run_auto_checks(solution: Solution) -> None:
 
 
 def new(
-    user: User, file: FileStorage, course_id: int,
+    user: User, course_id: int, file: FileStorage,
 ) -> Tuple[List[int], List[int]]:
     matches: List[int] = []
     misses: List[int] = []

lms/templates/user.html

@@ -27,18 +27,18 @@ <h2>{{ _('תרגילים שהוגשו:') }}</h2>
           </thead>
           <tbody>
             {%- for exercise in solutions.values() %}
-            {% for solution in exercise.values() %}
-            <tr>
-              <th scope="row">{{ solution.exercise_number | e }}</th>
-              <td>{{ solution.course_name | e }}</td>
-              <td>{{ solution.exercise_name | e }}</td>
-              <td>
-                {{ _('נבדק') if solution.is_checked else _('הוגש') if solution.solution_id else _('לא הוגש') }}
-              </td>
-              <td><a href="/view/{{ solution.solution_id }}">{{ solution.solution_id }}</a></td>
-              <td>{{ solution.get('checker', '') | e }}</a></td>
-            </tr>
-            {% endfor %}
+              {% for solution in exercise.values() %}
+                <tr>
+                  <th scope="row">{{ solution.exercise_number | e }}</th>
+                  <td>{{ solution.course_name | e }}</td>
+                  <td>{{ solution.exercise_name | e }}</td>
+                  <td>
+                    {{ _('נבדק') if solution.is_checked else _('הוגש') if solution.solution_id else _('לא הוגש') }}
+                  </td>
+                  <td><a href="/view/{{ solution.solution_id }}">{{ solution.solution_id }}</a></td>
+                  <td>{{ solution.get('checker', '') | e }}</a></td>
+                </tr>
+              {% endfor %}
             {% endfor -%}
           </tbody>
         </table>

lms/utils/courses.py

@@ -0,0 +1,10 @@
+import secrets
+import string
+
+
+def generate_invite_code(length: int = 10):
+    return ''.join(
+        secrets.SystemRandom().choices(
+            string.ascii_letters + string.digits, k=10,
+        ),
+    )

tests/test_exercises.py

@@ -1,6 +1,6 @@
 import datetime
 
-from lms.lmsdb.models import Course, Exercise, User
+from lms.lmsdb.models import Course, Exercise, Solution, User
 from tests import conftest
 
 
@@ -31,3 +31,43 @@ def test_courses_exercises(course: Course, student_user: User):
 
         conftest.create_exercise(course, 1, index=1)
         assert len(list(Exercise.get_objects(student_user.id))) == 1
+
+    @staticmethod
+    def test_course_objects_structure(course: Course, student_user: User):
+        # Create more courses
+        course2 = conftest.create_course(index=1)
+        course3 = conftest.create_course(index=2)
+
+        # Create another student user
+        student_user2 = conftest.create_student_user(index=1)
+
+        # Assign users to courses
+        conftest.create_usercourse(student_user, course)
+        conftest.create_usercourse(student_user, course3)
+        conftest.create_usercourse(student_user2, course2)
+
+        # Create exercises for the courses
+        conftest.create_exercise(course, 1)
+        ex2_c1 = conftest.create_exercise(course, 2)
+        ex1_c2 = conftest.create_exercise(course2, 1)
+        conftest.create_exercise(course2, 2)
+        conftest.create_exercise(course3, 1)
+
+        # Create solutions
+        conftest.create_solution(ex2_c1, student_user)
+        conftest.create_solution(ex1_c2, student_user2)
+
+        # Dicts of dicts structures
+        user_structure1 = Solution.of_user(student_user)
+        user_structure2 = Solution.of_user(student_user2)
+
+        assert len(user_structure1) == 2
+        assert len(user_structure2) == 1
+        assert 'solution_id' in user_structure1.get('course 0').get(2)
+        assert len(user_structure1.get('course 0')) == 2
+        assert len(user_structure1.get('course 2')) == 1
+        assert len(user_structure2.get('course 1')) == 2
+        assert (
+            user_structure2.get('course 1').get(4).get('exercise_number') == 2,
+        )
+        assert 'solution_id' in user_structure2.get('course 1').get(3)

tests/test_extractor.py

@@ -32,7 +32,8 @@ def setup(self):
         self.image_no_exercise_file = next(self.zip_files(
             (self.IMAGE_NO_EXERCISE,),
         ))
-        self.pyfile_different_course = self.get_bytes_io_py_file(
+        self.image_bytes_io = self.get_bytes_io_file(self.IMAGE_NAME)
+        self.pyfile_different_course = self.get_bytes_io_file(
             self.PY_DIFFERENT_COURSE,
         )
         self.pyfiles_files = list(self.py_files(self.PY_NAMES))
@@ -87,7 +88,7 @@ def py_files(filenames: Iterator[str]):
             yield open(f'{SAMPLES_DIR}/{file_name}')
 
     @staticmethod
-    def get_bytes_io_py_file(file_name) -> BytesIO:
+    def get_bytes_io_file(file_name) -> BytesIO:
         with open(f'{SAMPLES_DIR}/{file_name}', 'br') as open_file:
             return BytesIO(open_file.read()), file_name
 
@@ -225,6 +226,20 @@ def test_upload_another_course(
         })
         assert fail_upload_response.status_code == 400
 
+    def test_upload_invalid_exercise(
+        self,
+        course: Course,
+        student_user: User,
+    ):
+        conftest.create_usercourse(student_user, course)
+
+        client = conftest.get_logged_user(username=student_user.username)
+        fail_upload_response = client.post(f'/upload/{course.id}', data={
+            'file': self.image_bytes_io,
+        })
+        assert fail_upload_response.status_code == 400
+
+
     def test_upload_correct_course(
         self,
         course: Course,