tests and remove user import

.github/workflows/main.yaml

@@ -42,9 +42,9 @@ jobs:
       #   run: pipenv run python manage.py makemigrations --check --dry-run
 
       # TODO: assert code coverage target.
-      # - name: Test Code Units
-      #   working-directory: ./backend
-      #   run: pipenv run pytest
+      - name: Test Code Units
+        working-directory: ./backend
+        run: pipenv run pytest
 
   build-and-deploy:
     runs-on: ubuntu-latest

backend/Pipfile

@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-codeforlife = {ref = "v0.6.6", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
+codeforlife = {ref = "v0.6.7", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
 django = "==3.2.20"
 djangorestframework = "==3.13.1"
 # https://pypi.org/user/codeforlife/

backend/api/forms.py

@@ -10,8 +10,8 @@
 
 
 class BaseAuthForm(forms.Form):
-    def __init__(self, request: HttpRequest = None, *args, **kwargs):
-        self.request = request  # Should this be optional?
+    def __init__(self, request: HttpRequest, *args, **kwargs):
+        self.request = request
         self.user: t.Optional[AbstractBaseUser] = None
 
     def clean(self, **kwargs):

backend/api/tests/views/test_session.py

@@ -0,0 +1,12 @@
+from unittest.mock import Mock, patch
+
+from codeforlife.tests import CronTestCase
+from django.urls import reverse
+
+
+class TestClearExpiredView(CronTestCase):
+    @patch("django.core.management.call_command")
+    def test_clear_expired_view(self, call_command: Mock):
+        self.client.get(reverse("clear-expired-sessions"))
+
+        call_command.assert_called_once_with("clearsessions")

backend/api/views/session.py

@@ -1,8 +1,9 @@
 import logging
+from enum import Enum
 from functools import cached_property
 
+# from codeforlife.user.models import User
 from codeforlife.mixins import CronMixin
-from codeforlife.user.models import User
 from common.models import UserSession
 from django.contrib.auth.views import LoginView as _LoginView
 from django.contrib.sessions.models import Session, SessionManager
@@ -19,22 +20,29 @@
 )
 
 
+# TODO: use User.Type from cfl package
+class UserType(str, Enum):
+    TEACHER = "teacher"
+    DEP_STUDENT = "dependent-student"
+    INDEP_STUDENT = "independent-student"
+
+
 # TODO: add 2FA logic
 class LoginView(_LoginView):
     @cached_property
     def user_type(self):
-        return User.Type(self.kwargs["user_type"])
+        return UserType(self.kwargs["user_type"])
 
     def get_form_class(self):
-        if self.user_type == User.Type.INDEP_STUDENT:
+        if self.user_type == UserType.INDEP_STUDENT:
             return CredentialsForm
 
-        elif self.user_type == User.Type.DEP_STUDENT:
+        elif self.user_type == UserType.DEP_STUDENT:
             if "user_id" in self.request.POST:
                 return DependentStudentUserIdCredentialsForm
             return DependentStudentUsernameCredentialsForm
 
-        else:  # user_type == User.Type.TEACHER
+        else:  # user_type == UserType.TEACHER
             if False:  # TODO: add 2fa logic.
                 return OneTimePasswordForm
             return CredentialsForm
@@ -45,7 +53,7 @@ def form_valid(self, form: BaseAuthForm):
         # TODO: use google analytics
         user = form.get_user()
         user_session = {"user": user}
-        if self.user_type == User.Type.DEP_STUDENT:
+        if self.user_type == UserType.DEP_STUDENT:
             user_session["class_field"] = user.new_student.class_field
             user_session["login_type"] = (
                 "direct" if "user_id" in self.request.POST else "classform"