Skip to content

Fix issue #190: [Claude] User model custom manager #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions photo/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@
from utils.enums import ContestInternalStates


class NamedUserManager(models.Manager):
def get_queryset(self):
return super().get_queryset().exclude(
models.Q(name_first__isnull=True) |
models.Q(name_first="") |
models.Q(name_last__isnull=True) |
models.Q(name_last="")
)

class UserManager(BaseUserManager):
def create_user(self, email, password=None, **kwargs):
if not email:
Expand Down Expand Up @@ -84,6 +93,7 @@ class User(AbstractUser, SoftDeleteModel):
EMAIL_FIELD = "email"
REQUIRED_FIELDS = ["first_name", "last_name"]
objects = UserManager()
named_users = NamedUserManager()

class Meta:
constraints = [
Expand Down
53 changes: 53 additions & 0 deletions photo/tests/test_database/test_user_manager.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import pytest
from django.test import TestCase

from photo.models import User


class TestNamedUserManager(TestCase):
def setUp(self):
# Create users with different name combinations
self.user1 = User.objects.create_user(
email="user1@example.com",
password="password123",
name_first="John",
name_last="Doe"
)
self.user2 = User.objects.create_user(
email="user2@example.com",
password="password123",
name_first="",
name_last="Smith"
)
self.user3 = User.objects.create_user(
email="user3@example.com",
password="password123",
name_first="Jane",
name_last=""
)
self.user4 = User.objects.create_user(
email="user4@example.com",
password="password123",
name_first=None,
name_last=None
)

def test_named_users_manager(self):
# Get all named users
named_users = User.named_users.all()

# Should only include users with both first and last names
self.assertEqual(named_users.count(), 1)
self.assertIn(self.user1, named_users)
self.assertNotIn(self.user2, named_users)
self.assertNotIn(self.user3, named_users)
self.assertNotIn(self.user4, named_users)

def test_default_manager_unchanged(self):
# Verify that the default manager still returns all users
all_users = User.objects.all()
self.assertEqual(all_users.count(), 4)
self.assertIn(self.user1, all_users)
self.assertIn(self.user2, all_users)
self.assertIn(self.user3, all_users)
self.assertIn(self.user4, all_users)