Updated tests, added usermanager, tested model relationships

Author: del9ra

app/core/admin.py

@@ -73,7 +73,6 @@ class UserAdmin(DefaultUserAdmin):
                     "practice_area_primary",
                     "practice_area_secondary",
                     "practice_area_target_intake",
-                    "referred_by",
                     "email_cognito",
                 )
             },

app/core/api/serializers.py

@@ -94,7 +94,6 @@ class Meta:
             "practice_area_primary",
             "practice_area_secondary",
             "practice_area_target_intake",
-            "referred_by",
             "email_cognito",
         )
         read_only_fields = (

app/core/migrations/0034_alter_user_email_intake.py

@@ -1,15 +1,22 @@
-# Generated by Django 4.2.16 on 2025-03-05 21:36
+# Generated by Django 4.2.16 on 2025-03-14 21:22
 
+import core.models
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('core', '0032_projectprogramareaxref_project_program_areas'),
+        ('core', '0033_projectstatus_project_current_status'),
     ]
 
     operations = [
+        migrations.AlterModelManagers(
+            name='user',
+            managers=[
+                ('objects', core.models.UserManager()),
+            ],
+        ),
         migrations.RenameField(
             model_name='user',
             old_name='gmail',
@@ -57,16 +64,16 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='user',
             name='practice_area_primary',
-            field=models.ManyToManyField(related_name='primary_users', to='core.practicearea'),
+            field=models.ManyToManyField(blank=True, related_name='primary_users', to='core.practicearea'),
         ),
         migrations.AddField(
             model_name='user',
             name='practice_area_secondary',
-            field=models.ManyToManyField(related_name='secondary_users', to='core.practicearea'),
+            field=models.ManyToManyField(blank=True, related_name='secondary_users', to='core.practicearea'),
         ),
         migrations.AddField(
             model_name='user',
             name='practice_area_target_intake',
-            field=models.ManyToManyField(related_name='target_intake_users', to='core.practicearea'),
+            field=models.ManyToManyField(blank=True, related_name='target_intake_users', to='core.practicearea'),
         ),
     ]

app/core/migrations/0033_rename_gmail_user_email_gmail_and_more.py renamed to app/core/migrations/0034_alter_user_managers_rename_gmail_user_email_gmail_and_more.py

@@ -1 +1 @@
-0033_projectstatus_project_current_status
+0034_alter_user_managers_rename_gmail_user_email_gmail_and_more

app/core/migrations/0035_alter_user_email_intake.py

@@ -1,8 +1,9 @@
 import uuid
 
+from django.apps import apps
 from django.contrib.auth.base_user import AbstractBaseUser
+from django.contrib.auth.base_user import BaseUserManager
 from django.contrib.auth.models import PermissionsMixin
-from django.contrib.auth.models import UserManager
 from django.contrib.auth.validators import UnicodeUsernameValidator
 from django.db import models
 from phonenumber_field.modelfields import PhoneNumberField
@@ -27,6 +28,49 @@ def __repr__(self):
         return f"<{self.__class__.__name__} {self.uuid}>"
 
 
+class UserManager(BaseUserManager):
+    """
+    This is based on the UserManager from django 4.2
+    """
+
+    use_in_migrations = True
+
+    def _create_user(self, username, password, **extra_fields):
+        """
+        Create and save a user with the given username, email, and password.
+        """
+
+        # Lookup the real model class from the global app registry so this
+        # manager method can be used in migrations. This is fine because
+        # managers are by definition working on the real model.
+        if not username:
+            raise ValueError("The given username must be set")
+        global_user_model = apps.get_model(
+            self.model._meta.app_label, self.model._meta.object_name
+        )
+        username = global_user_model.normalize_username(username)
+        user = self.model(username=username, **extra_fields)
+        user.set_password(password)
+        user.save(using=self._db)
+        return user
+
+    def create_user(self, username, password=None, **extra_fields):
+        extra_fields.setdefault("is_staff", False)
+        extra_fields.setdefault("is_superuser", False)
+        return self._create_user(username, password, **extra_fields)
+
+    def create_superuser(self, username, password, **extra_fields):
+        extra_fields.setdefault("is_staff", True)
+        extra_fields.setdefault("is_superuser", True)
+
+        if extra_fields.get("is_staff") is not True:
+            raise ValueError("Superuser must have is_staff=True.")
+        if extra_fields.get("is_superuser") is not True:
+            raise ValueError("Superuser must have is_superuser=True.")
+
+        return self._create_user(username, password, **extra_fields)
+
+
 class User(PermissionsMixin, AbstractBaseUser, AbstractBaseModel):
     """
     Table contains cognito-users & django-users.
@@ -61,7 +105,9 @@ class User(PermissionsMixin, AbstractBaseUser, AbstractBaseModel):
 
     # Django-user related fields #
     # password is inherited from AbstractBaseUser
-    email_intake = models.EmailField("Email address", blank=True)  # allow non-unique emails
+    email_intake = models.EmailField(
+        "Email address", blank=True
+    )  # allow non-unique emails
     is_staff = models.BooleanField(
         "staff status",
         default=False,
@@ -78,11 +124,15 @@ class User(PermissionsMixin, AbstractBaseUser, AbstractBaseModel):
         "UserStatusType", null=True, on_delete=models.PROTECT
     )
     # current_practice_area = models.ManyToManyField("PracticeArea")
-    # target_practice_area = models.ManyToManyField("PracticeArea")
-    practice_area_primary = models.ManyToManyField("PracticeArea", related_name="primary_users")
-    practice_area_secondary = models.ManyToManyField("PracticeArea", related_name="secondary_users")
-    practice_area_target_intake = models.ManyToManyField("PracticeArea", related_name="target_intake_users")
-
+    practice_area_primary = models.ManyToManyField(
+        "PracticeArea", related_name="primary_users", blank=True
+    )
+    practice_area_secondary = models.ManyToManyField(
+        "PracticeArea", related_name="secondary_users", blank=True
+    )
+    practice_area_target_intake = models.ManyToManyField(
+        "PracticeArea", related_name="target_intake_users", blank=True
+    )
 
     job_title_current_intake = models.CharField(max_length=255, blank=True)
     job_title_target_intake = models.CharField(max_length=255, blank=True)

app/core/migrations/max_migration.txt

@@ -31,16 +31,20 @@
 def user_superuser_admin():
     return User.objects.create_user(
         username="AdminUser",
-        email_intake="[email protected]",
+        # email_intake="[email protected]",
         password="adminuser",
         is_superuser=True,
     )
 
 
 @pytest.fixture
 def user_permissions():
-    user1 = User.objects.create(username="TestUser1", email_intake="[email protected]")
-    user2 = User.objects.create(username="TestUser2", email_intake="[email protected]")
+    user1 = User.objects.create(
+        username="TestUser1", email_intake="[email protected]"
+    )
+    user2 = User.objects.create(
+        username="TestUser2", email_intake="[email protected]"
+    )
     project = Project.objects.create(name="Test Project")
     permission_type = PermissionType.objects.first()
     practice_area = PracticeArea.objects.first()
@@ -62,7 +66,8 @@ def user_permissions():
 @pytest.fixture
 def user_permission_admin_project():
     user = User.objects.create(
-        username="TestUser Admin Project", email_intake="[email protected]"
+        username="TestUser Admin Project",
+        email_intake="[email protected]",
     )
     project = Project.objects.create(name="Test Project Admin Project")
     permission_type = PermissionType.objects.filter(name=admin_project).first()
@@ -112,6 +117,15 @@ def user2(django_user_model):
     )
 
 
+@pytest.fixture
+def user3(django_user_model):
+    return django_user_model.objects.create_user(
+        username="TestUser3",
+        email_intake="[email protected]",
+        password="testpass",
+    )
+
+
 @pytest.fixture
 def admin(django_user_model):
     return django_user_model.objects.create_user(

app/core/models.py

@@ -165,6 +165,12 @@ def test_user_actions(client_name, action, endpoint, payload, expected_status, r
     action_fn = getattr(client, action)
     url = request.getfixturevalue(endpoint)
     res = action_fn(url, payload)
+    print(f"Status Code: {res.status_code}")
+    print(f"Response Content: {res.content.decode()}")  # If response is not JSON
+    try:
+        print(f"Response JSON: {res.json()}")  # If response is JSON
+    except Exception:
+        pass
     assert res.status_code == expected_status
 
 

app/core/tests/conftest.py

@@ -3,11 +3,14 @@
 import pytest
 
 from ..models import Event
+from ..models import PracticeArea
 from ..models import ProgramArea
 from ..models import ProjectProgramAreaXref
 from ..models import ProjectSdgXref
 from ..models import ProjectStatus
 from ..models import Sdg
+from ..models import User
+from ..models import UserStatusType
 
 pytestmark = pytest.mark.django_db
 
@@ -224,3 +227,81 @@ def test_url_type(url_type):
 
 def test_user_status_type(user_status_type):
     assert str(user_status_type) == "Test User Status Type"
+
+
+def test_user_model_old_names():
+    """
+    Test that accessing old field names raises AttributeError.
+    """
+    with pytest.raises(AttributeError) as excinfo:
+        old_fields = [
+            "current_job_title",
+            "email",
+            "first_name",
+            "gmail",
+            "is_active",
+            "last_name",
+            "preferred_email",
+            "target_job_title",
+        ]
+        for field in old_fields:
+            _ = getattr(User, field)
+        assert f"has no attribute {field}" in str(excinfo)
+
+
+def test_user_has_a_user_status_relationship(user, user2):
+    active_user_status = UserStatusType.objects.get(name="Active")
+    inactive_user_status = UserStatusType.objects.get(name="Inactive")
+    active_user_status.user_set.add(user)
+    active_user_status.user_set.add(user2)
+
+    assert active_user_status.user_set.count() == 2
+
+    assert user.user_status == active_user_status
+    assert user2.user_status == active_user_status
+
+    active_user_status.user_set.remove(user)
+    inactive_user_status.user_set.add(user)
+
+    assert active_user_status.user_set.count() == 1
+    assert inactive_user_status.user_set.count() == 1
+
+    assert user.user_status == inactive_user_status
+
+
+def test_user_practice_area_relationship(user, user2, user3):
+    development_practice_area = PracticeArea.objects.get(name="Development")
+    project_management_practice_area = PracticeArea.objects.get(
+        name="Project Management"
+    )
+    design_practice_area = PracticeArea.objects.get(name="Design")
+
+    user.practice_area_primary.add(development_practice_area)
+    assert user.practice_area_primary.count() == 1
+    assert user.practice_area_primary.contains(development_practice_area)
+    assert development_practice_area.primary_users.contains(user)
+
+    user.practice_area_primary.remove(development_practice_area)
+    assert user.practice_area_primary.count() == 0
+    assert not user.practice_area_primary.contains(development_practice_area)
+    assert not development_practice_area.primary_users.contains(user)
+
+    user2.practice_area_secondary.add(project_management_practice_area)
+    assert user2.practice_area_secondary.count() == 1
+    assert user2.practice_area_secondary.contains(project_management_practice_area)
+    assert project_management_practice_area.secondary_users.contains(user2)
+
+    user2.practice_area_secondary.remove(project_management_practice_area)
+    assert user2.practice_area_secondary.count() == 0
+    assert not user2.practice_area_secondary.contains(project_management_practice_area)
+    assert not project_management_practice_area.secondary_users.contains(user2)
+
+    user3.practice_area_target_intake.add(design_practice_area)
+    assert user3.practice_area_target_intake.count() == 1
+    assert user3.practice_area_target_intake.contains(design_practice_area)
+    assert design_practice_area.target_intake_users.contains(user3)
+
+    user3.practice_area_target_intake.remove(design_practice_area)
+    assert user3.practice_area_target_intake.count() == 0
+    assert not user3.practice_area_target_intake.contains(design_practice_area)
+    assert not design_practice_area.target_intake_users.contains(user3)