test,lint,format check

Author: kart-u

backend/apps/github/management/commands/github_update_users.py

@@ -51,7 +51,9 @@ def handle(self, *args, **options):
             prefix = f"{idx + offset + 1} of {active_users_count - offset}"
             print(f"{prefix:<10} {user.title}")
 
-            profile, _ = MemberProfile.objects.get_or_create(github_user=user)
+            profile, created = MemberProfile.objects.get_or_create(github_user=user)
+            if created:
+                profile.github_user = user
             profile.contributions_count = user_contributions.get(user.id, 0)
             profiles.append(profile)
 

backend/apps/owasp/migrations/0068_alter_memberprofile_has_public_member_page.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.8 on 2025-11-26 14:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('owasp', '0067_memberprofile_backward_compatibility'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='memberprofile',
+            name='has_public_member_page',
+            field=models.BooleanField(default=True, help_text="Whether the member's profile is publicly visible on the OWASP website", verbose_name='Has Public Member Page'),
+        ),
+    ]

backend/tests/apps/github/api/internal/queries/user_test.py

@@ -16,49 +16,61 @@ def mock_user(self):
 
     def test_resolve_user_existing_with_public_member_page(self, mock_user):
         """Test resolving an existing user with has_public_member_page=True."""
-        with patch("apps.github.models.user.User.objects.filter") as mock_filter:
-            mock_queryset = mock_filter.return_value
-            mock_queryset.first.return_value = mock_user
+        with patch("apps.github.models.user.User.objects.select_related") as mock_select_related:
+            mock_queryset = mock_select_related.return_value
+            mock_queryset.filter.return_value.first.return_value = mock_user
 
             result = UserQuery().user(login="test-user")
 
             assert result == mock_user
-            mock_filter.assert_called_once_with(has_public_member_page=True, login="test-user")
-            mock_queryset.first.assert_called_once()
+            mock_select_related.assert_called_once_with("owasp_profile")
+            mock_queryset.filter.assert_called_once_with(
+                owasp_profile__has_public_member_page=True, login="test-user"
+            )
+            mock_queryset.filter.return_value.first.assert_called_once()
 
     def test_resolve_user_not_found_when_has_public_member_page_false(self):
         """Test resolving a user with has_public_member_page=False returns None."""
-        with patch("apps.github.models.user.User.objects.filter") as mock_filter:
-            mock_queryset = mock_filter.return_value
-            mock_queryset.first.return_value = None
+        with patch("apps.github.models.user.User.objects.select_related") as mock_select_related:
+            mock_queryset = mock_select_related.return_value
+            mock_queryset.filter.return_value.first.return_value = None
 
             result = UserQuery().user(login="test-user")
 
             assert result is None
-            mock_filter.assert_called_once_with(has_public_member_page=True, login="test-user")
-            mock_queryset.first.assert_called_once()
+            mock_select_related.assert_called_once_with("owasp_profile")
+            mock_queryset.filter.assert_called_once_with(
+                owasp_profile__has_public_member_page=True, login="test-user"
+            )
+            mock_queryset.filter.return_value.first.assert_called_once()
 
     def test_resolve_user_not_found(self):
         """Test resolving a non-existent user."""
-        with patch("apps.github.models.user.User.objects.filter") as mock_filter:
-            mock_queryset = mock_filter.return_value
-            mock_queryset.first.return_value = None
+        with patch("apps.github.models.user.User.objects.select_related") as mock_select_related:
+            mock_queryset = mock_select_related.return_value
+            mock_queryset.filter.return_value.first.return_value = None
 
             result = UserQuery().user(login="non-existent")
 
             assert result is None
-            mock_filter.assert_called_once_with(has_public_member_page=True, login="non-existent")
-            mock_queryset.first.assert_called_once()
+            mock_select_related.assert_called_once_with("owasp_profile")
+            mock_queryset.filter.assert_called_once_with(
+                owasp_profile__has_public_member_page=True, login="non-existent"
+            )
+            mock_queryset.filter.return_value.first.assert_called_once()
 
     def test_resolve_user_filters_by_public_member_page_and_login(self):
         """Test that user query filters by both has_public_member_page and login."""
-        with patch("apps.github.models.user.User.objects.filter") as mock_filter:
-            mock_queryset = mock_filter.return_value
-            mock_queryset.first.return_value = None
+        with patch("apps.github.models.user.User.objects.select_related") as mock_select_related:
+            mock_queryset = mock_select_related.return_value
+            mock_queryset.filter.return_value.first.return_value = None
 
             UserQuery().user(login="test-user")
 
-            mock_filter.assert_called_once_with(has_public_member_page=True, login="test-user")
+            mock_select_related.assert_called_once_with("owasp_profile")
+            mock_queryset.filter.assert_called_once_with(
+                owasp_profile__has_public_member_page=True, login="test-user"
+            )
 
     def test_top_contributed_repositories(self):
         """Test resolving top contributed repositories."""

backend/tests/apps/github/management/commands/github_update_users_test.py

@@ -38,10 +38,23 @@ def test_handle_with_default_offset(
         self, mock_repository_contributor, mock_user, mock_member_profile
     ):
         """Test command execution with default offset."""
-        mock_member_profile.objects.get_or_create.return_value = (MagicMock(), False)
-        mock_user1 = MagicMock(id=1, title="User 1", contributions_count=0)
-        mock_user2 = MagicMock(id=2, title="User 2", contributions_count=0)
-        mock_user3 = MagicMock(id=3, title="User 3", contributions_count=0)
+        mock_profile1 = MagicMock(contributions_count=0)
+        mock_profile2 = MagicMock(contributions_count=0)
+        mock_profile3 = MagicMock(contributions_count=0)
+
+        def get_or_create_side_effect(github_user):
+            if github_user.id == 1:
+                return mock_profile1, False
+            if github_user.id == 2:
+                return mock_profile2, False
+            if github_user.id == 3:
+                return mock_profile3, False
+            return MagicMock(), False
+
+        mock_member_profile.objects.get_or_create.side_effect = get_or_create_side_effect
+        mock_user1 = MagicMock(id=1, title="User 1")
+        mock_user2 = MagicMock(id=2, title="User 2")
+        mock_user3 = MagicMock(id=3, title="User 3")
 
         mock_users_queryset = MagicMock()
         mock_users_queryset.count.return_value = 3
@@ -73,12 +86,16 @@ def test_handle_with_default_offset(
         mock_print.assert_any_call("2 of 3     User 2")
         mock_print.assert_any_call("3 of 3     User 3")
 
-        assert mock_user1.contributions_count == 10
-        assert mock_user2.contributions_count == 20
-        assert mock_user3.contributions_count == 30
+        assert mock_profile1.contributions_count == 10
+        assert mock_profile2.contributions_count == 20
+        assert mock_profile3.contributions_count == 30
 
-        assert mock_user.bulk_save.call_count == 2
-        assert mock_user.bulk_save.call_args_list[-1][0][0] == [mock_user1, mock_user2, mock_user3]
+        assert mock_member_profile.bulk_save.call_count == 2
+        assert mock_member_profile.bulk_save.call_args_list[-1][0][0] == [
+            mock_profile1,
+            mock_profile2,
+            mock_profile3,
+        ]
 
     @patch("apps.github.management.commands.github_update_users.MemberProfile")
     @patch("apps.github.management.commands.github_update_users.User")
@@ -88,9 +105,19 @@ def test_handle_with_custom_offset(
         self, mock_repository_contributor, mock_user, mock_member_profile
     ):
         """Test command execution with custom offset."""
-        mock_member_profile.objects.get_or_create.return_value = (MagicMock(), False)
-        mock_user1 = MagicMock(id=2, title="User 2", contributions_count=0)
-        mock_user2 = MagicMock(id=3, title="User 3", contributions_count=0)
+        mock_profile1 = MagicMock(contributions_count=0)
+        mock_profile2 = MagicMock(contributions_count=0)
+
+        def get_or_create_side_effect(github_user):
+            if github_user.id == 2:
+                return mock_profile1, False
+            if github_user.id == 3:
+                return mock_profile2, False
+            return MagicMock(), False
+
+        mock_member_profile.objects.get_or_create.side_effect = get_or_create_side_effect
+        mock_user1 = MagicMock(id=2, title="User 2")
+        mock_user2 = MagicMock(id=3, title="User 3")
 
         mock_users_queryset = MagicMock()
         mock_users_queryset.count.return_value = 3
@@ -117,11 +144,14 @@ def test_handle_with_custom_offset(
         mock_print.assert_any_call("2 of 2     User 2")
         mock_print.assert_any_call("3 of 2     User 3")
 
-        assert mock_user1.contributions_count == 20
-        assert mock_user2.contributions_count == 30
+        assert mock_profile1.contributions_count == 20
+        assert mock_profile2.contributions_count == 30
 
-        assert mock_user.bulk_save.call_count == 2
-        assert mock_user.bulk_save.call_args_list[-1][0][0] == [mock_user1, mock_user2]
+        assert mock_member_profile.bulk_save.call_count == 2
+        assert mock_member_profile.bulk_save.call_args_list[-1][0][0] == [
+            mock_profile1,
+            mock_profile2,
+        ]
 
     @patch("apps.github.management.commands.github_update_users.MemberProfile")
     @patch("apps.github.management.commands.github_update_users.User")
@@ -130,10 +160,19 @@ def test_handle_with_custom_offset(
     def test_handle_with_users_having_no_contributions(
         self, mock_repository_contributor, mock_user, mock_member_profile
     ):
-        """Test command execution when users have no contributions."""
-        mock_member_profile.objects.get_or_create.return_value = (MagicMock(), False)
-        mock_user1 = MagicMock(id=1, title="User 1", contributions_count=0)
-        mock_user2 = MagicMock(id=2, title="User 2", contributions_count=0)
+        mock_profile1 = MagicMock(contributions_count=0)
+        mock_profile2 = MagicMock(contributions_count=0)
+
+        def get_or_create_side_effect(github_user):
+            if github_user.id == 1:
+                return mock_profile1, False
+            if github_user.id == 2:
+                return mock_profile2, False
+            return MagicMock(), False
+
+        mock_member_profile.objects.get_or_create.side_effect = get_or_create_side_effect
+        mock_user1 = MagicMock(id=1, title="User 1")
+        mock_user2 = MagicMock(id=2, title="User 2")
 
         mock_users_queryset = MagicMock()
         mock_users_queryset.count.return_value = 2
@@ -153,11 +192,14 @@ def test_handle_with_users_having_no_contributions(
         mock_print.assert_any_call("1 of 2     User 1")
         mock_print.assert_any_call("2 of 2     User 2")
 
-        assert mock_user1.contributions_count == 0
-        assert mock_user2.contributions_count == 0
+        assert mock_profile1.contributions_count == 0
+        assert mock_profile2.contributions_count == 0
 
-        assert mock_user.bulk_save.call_count == 1
-        assert mock_user.bulk_save.call_args_list[-1][0][0] == [mock_user1, mock_user2]
+        assert mock_member_profile.bulk_save.call_count == 1
+        assert mock_member_profile.bulk_save.call_args_list[-1][0][0] == [
+            mock_profile1,
+            mock_profile2,
+        ]
 
     @patch("apps.github.management.commands.github_update_users.MemberProfile")
     @patch("apps.github.management.commands.github_update_users.User")
@@ -167,12 +209,15 @@ def test_handle_with_single_user(
         self, mock_repository_contributor, mock_user, mock_member_profile
     ):
         """Test command execution with single user."""
-        mock_member_profile.objects.get_or_create.return_value = (MagicMock(), False)
-        mock_user1 = MagicMock(id=1, title="User 1", contributions_count=0)
+        mock_profile1 = MagicMock(contributions_count=0)
+        mock_member_profile.objects.get_or_create.return_value = (mock_profile1, False)
+        mock_user1 = MagicMock(id=1, title="User 1")
 
         mock_users_queryset = MagicMock()
         mock_users_queryset.count.return_value = 1
         mock_users_queryset.__getitem__.return_value = [mock_user1]
+        mock_users_queryset.count.return_value = 1
+        mock_users_queryset.__getitem__.return_value = [mock_user1]
 
         mock_user.objects.order_by.return_value = mock_users_queryset
 
@@ -188,10 +233,10 @@ def test_handle_with_single_user(
 
         mock_print.assert_called_once_with("1 of 1     User 1")
 
-        assert mock_user1.contributions_count == 15
+        assert mock_profile1.contributions_count == 15
 
-        assert mock_user.bulk_save.call_count == 2
-        assert mock_user.bulk_save.call_args_list[-1][0][0] == [mock_user1]
+        assert mock_member_profile.bulk_save.call_count == 2
+        assert mock_member_profile.bulk_save.call_args_list[-1][0][0] == [mock_profile1]
 
     @patch("apps.github.management.commands.github_update_users.MemberProfile")
     @patch("apps.github.management.commands.github_update_users.User")
@@ -218,8 +263,6 @@ def test_handle_with_empty_user_list(
 
         mock_print.assert_not_called()
 
-        assert mock_user.bulk_save.call_count == 1
-        assert mock_user.bulk_save.call_args_list[-1][0][0] == []
         assert mock_member_profile.bulk_save.call_count == 1
         assert mock_member_profile.bulk_save.call_args_list[-1][0][0] == []
 
@@ -231,9 +274,19 @@ def test_handle_with_exact_batch_size(
         self, mock_repository_contributor, mock_user, mock_member_profile
     ):
         """Test command execution when user count equals batch size."""
-        mock_member_profile.objects.get_or_create.return_value = (MagicMock(), False)
-        mock_user1 = MagicMock(id=1, title="User 1", contributions_count=0)
-        mock_user2 = MagicMock(id=2, title="User 2", contributions_count=0)
+        mock_profile1 = MagicMock(contributions_count=0)
+        mock_profile2 = MagicMock(contributions_count=0)
+
+        def get_or_create_side_effect(github_user):
+            if github_user.id == 1:
+                return mock_profile1, False
+            if github_user.id == 2:
+                return mock_profile2, False
+            return MagicMock(), False
+
+        mock_member_profile.objects.get_or_create.side_effect = get_or_create_side_effect
+        mock_user1 = MagicMock(id=1, title="User 1")
+        mock_user2 = MagicMock(id=2, title="User 2")
 
         mock_users_queryset = MagicMock()
         mock_users_queryset.count.return_value = 2
@@ -256,11 +309,14 @@ def test_handle_with_exact_batch_size(
         mock_print.assert_any_call("1 of 2     User 1")
         mock_print.assert_any_call("2 of 2     User 2")
 
-        assert mock_user1.contributions_count == 10
-        assert mock_user2.contributions_count == 20
+        assert mock_profile1.contributions_count == 10
+        assert mock_profile2.contributions_count == 20
 
-        assert mock_user.bulk_save.call_count == 2
-        assert mock_user.bulk_save.call_args_list[-1][0][0] == [mock_user1, mock_user2]
+        assert mock_member_profile.bulk_save.call_count == 2
+        assert mock_member_profile.bulk_save.call_args_list[-1][0][0] == [
+            mock_profile1,
+            mock_profile2,
+        ]
 
     @patch("apps.github.management.commands.github_update_users.MemberProfile")
     @patch("apps.github.management.commands.github_update_users.User")
@@ -275,9 +331,6 @@ def test_handle_member_profile_created(
 
         mock_user1 = MagicMock(
             id=1,
-            contributions_count=0,
-            is_owasp_staff=True,
-            has_public_member_page=False,
         )
 
         mock_users_queryset = MagicMock()
@@ -296,6 +349,4 @@ def test_handle_member_profile_created(
 
         assert mock_profile.github_user == mock_user1
         assert mock_profile.contributions_count == 5
-        assert mock_profile.is_owasp_staff is True
-        assert mock_profile.has_public_member_page is False
         mock_member_profile.bulk_save.assert_called_once()

backend/tests/apps/nest/management/commands/nest_update_badges_test.py

@@ -31,13 +31,18 @@ def make_mock_former_employees(mock_former_employee):
 
 def extract_is_owasp_staff(arg):
     """Extract is_owasp_staff value from Q object, dict, or tuple."""
+    key_to_check = "owasp_profile__is_owasp_staff"
+    legacy_key_to_check = "is_owasp_staff"
     if hasattr(arg, "children"):
         for key, value in arg.children:
-            if key == "is_owasp_staff":
+            if key in (key_to_check, legacy_key_to_check):
                 return value
-    if isinstance(arg, dict) and "is_owasp_staff" in arg:
-        return arg["is_owasp_staff"]
-    if isinstance(arg, tuple) and len(arg) == 2 and arg[0] == "is_owasp_staff":
+    if isinstance(arg, dict):
+        if key_to_check in arg:
+            return arg[key_to_check]
+        if legacy_key_to_check in arg:
+            return arg[legacy_key_to_check]
+    if isinstance(arg, tuple) and len(arg) == 2 and arg[0] in (key_to_check, legacy_key_to_check):
         return arg[1]
     return None
 
@@ -53,7 +58,7 @@ def get_mock_for_staff_value(value):
         return None
 
     def user_filter_side_effect(*args, **kwargs):
-        staff_value = kwargs.get("is_owasp_staff")
+        staff_value = kwargs.get("owasp_profile__is_owasp_staff", kwargs.get("is_owasp_staff"))
         if staff_value is not None:
             return get_mock_for_staff_value(staff_value)
         for arg in args: