Merge branch 'main' of github.com:e-valuation/evap into live-server-t…

…ests

.github/workflows/tests.yml

@@ -86,7 +86,7 @@ jobs:
         run: isort . --check --diff
       - run: ls -laR evap/static/ts
       - name: Check TypeScript formatting
-        run: npx prettier --list-different --loglevel debug 'evap/static/ts/**/*.ts'
+        run: npx prettier --list-different --log-level debug 'evap/static/ts/**/*.ts'
 
   backup-process:
     runs-on: ubuntu-22.04
@@ -170,3 +170,14 @@ jobs:
           path: evap/static/css
       - name: Run tests
         run: xvfb-run --auto-servernum npx jest
+
+  macos-nix-build:
+    runs-on: macos-14
+    name: Build nix environment on MacOS
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: ./.github/setup_evap
+        with:
+          start-db: true

evap/evaluation/models.py

@@ -1660,18 +1660,18 @@ def is_empty(self):
 
 
 class UserProfileManager(BaseUserManager):
-    def create_user(self, *, email, password=None, first_name=None, last_name=None):
-        user = self.model(email=self.normalize_email(email), first_name_given=first_name, last_name=last_name)
+    def create_user(self, *, email, password=None, first_name_given=None, last_name=None):
+        user = self.model(email=self.normalize_email(email), first_name_given=first_name_given, last_name=last_name)
         validate_password(password, user=user)
         user.set_password(password)
         user.save()
         return user
 
-    def create_superuser(self, *, email, password=None, first_name=None, last_name=None):
+    def create_superuser(self, *, email, password=None, first_name_given=None, last_name=None):
         user = self.create_user(
             password=password,
             email=self.normalize_email(email),
-            first_name=first_name,
+            first_name_given=first_name_given,
             last_name=last_name,
         )
         user.is_superuser = True
@@ -1791,7 +1791,7 @@ class Meta:
         verbose_name_plural = _("users")
 
     USERNAME_FIELD = "email"
-    REQUIRED_FIELDS: list[str] = []
+    REQUIRED_FIELDS: list[str] = ["first_name_given", "last_name"]
 
     def __str__(self):
         return self.full_name

evap/evaluation/tests/test_commands.py

@@ -32,6 +32,25 @@
 from evap.tools import MonthAndDay
 
 
+class TestCreateUserCommand(TestCase):
+    # Regression test for #2204 - createsuperuser failing due to misconfigured REQUIRED_FIELDS
+    def test_create_super_user(self):
+        management.call_command(
+            "createsuperuser",
+            "--no-input",
+            "--first_name_given",
+            "Tony",
+            "--last_name",
+            "Kuchenbuch",
+            "--email",
+            "[email protected]",
+        )
+
+        user = UserProfile.objects.get(email="[email protected]")
+        self.assertEqual(user.first_name_given, "Tony")
+        self.assertEqual(user.last_name, "Kuchenbuch")
+
+
 class TestAnonymizeCommand(TestCase):
     @classmethod
     def setUpTestData(cls):
@@ -224,7 +243,7 @@ def test_scss_called_with_no_sass_installed(self, mock_subprocess_run):
             management.call_command("scss")
 
 
-class TestTsCommend(TestCase):
+class TestTsCommand(TestCase):
     def setUp(self):
         self.ts_path = os.path.join(settings.STATICFILES_DIRS[0], "ts")