created update member profile

Author: kart-u

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

@@ -8,7 +8,6 @@
 from apps.common.models import BATCH_SIZE
 from apps.github.models.repository_contributor import RepositoryContributor
 from apps.github.models.user import User
-from apps.owasp.models.member_profile import MemberProfile
 
 logger = logging.getLogger(__name__)
 
@@ -47,35 +46,14 @@ def handle(self, *args, **options):
             .annotate(total_contributions=Sum("contributions_count"))
         }
         users = []
-        profiles = []
         for idx, user in enumerate(active_users[offset:]):
             prefix = f"{idx + offset + 1} of {active_users_count - offset}"
             print(f"{prefix:<10} {user.title}")
 
             user.contributions_count = user_contributions.get(user.id, 0)
             users.append(user)
 
-            profile, created = MemberProfile.objects.get_or_create(github_user_id=user.id)
-            if created:
-                profile.github_user = user
-            profile.contributions_count = user.contributions_count
-            profile.is_owasp_staff = user.is_owasp_staff
-            profile.has_public_member_page = user.has_public_member_page
-            profiles.append(profile)
-
             if not len(users) % BATCH_SIZE:
                 User.bulk_save(users, fields=("contributions_count",))
-                MemberProfile.bulk_save(
-                    profiles,
-                    fields=(
-                        "contributions_count",
-                        "is_owasp_staff",
-                        "has_public_member_page",
-                    ),
-                )
 
         User.bulk_save(users, fields=("contributions_count",))
-        MemberProfile.bulk_save(
-            profiles,
-            fields=("contributions_count", "is_owasp_staff", "has_public_member_page"),
-        )

backend/apps/owasp/management/commands/owasp_update_member_profiles.py

@@ -0,0 +1,69 @@
+"""A command to update member profiles."""
+
+import logging
+
+from django.core.management.base import BaseCommand
+from django.db.models import Q, Sum
+
+from apps.common.models import BATCH_SIZE
+from apps.github.models.repository_contributor import RepositoryContributor
+from apps.github.models.user import User
+from apps.owasp.models.member_profile import MemberProfile
+
+logger = logging.getLogger(__name__)
+
+
+class Command(BaseCommand):
+    help = "Update member profiles."
+
+    def add_arguments(self, parser):
+        """Add command-line arguments to the parser.
+
+        Args:
+            parser (argparse.ArgumentParser): The argument parser instance.
+
+        """
+        parser.add_argument("--offset", default=0, required=False, type=int)
+
+    def handle(self, *args, **options):
+        """Handle the command execution.
+
+        Args:
+            *args: Variable length argument list.
+            **options: Arbitrary keyword arguments containing command options.
+
+        """
+        active_users = User.objects.order_by("-created_at")
+        active_users_count = active_users.count()
+        offset = options["offset"]
+        user_contributions = {
+            item["user_id"]: item["total_contributions"]
+            for item in RepositoryContributor.objects.exclude(
+                Q(repository__is_fork=True)
+                | Q(repository__organization__is_owasp_related_organization=False)
+                | Q(user__login__in=User.get_non_indexable_logins()),
+            )
+            .values("user_id")
+            .annotate(total_contributions=Sum("contributions_count"))
+        }
+        profiles = []
+        for idx, user in enumerate(active_users[offset:]):
+            prefix = f"{idx + offset + 1} of {active_users_count - offset}"
+            print(f"{prefix:<10} {user.title}")
+
+            profile, created = MemberProfile.objects.get_or_create(github_user_id=user.id)
+            if created:
+                profile.github_user = user
+            profile.contributions_count = user_contributions.get(user.id, 0)
+            profiles.append(profile)
+
+            if not len(profiles) % BATCH_SIZE:
+                MemberProfile.bulk_save(
+                    profiles,
+                    fields=("contributions_count",),
+                )
+
+        MemberProfile.bulk_save(
+            profiles,
+            fields=("contributions_count",),
+        )

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

@@ -30,15 +30,11 @@ def test_add_arguments(self):
             "--offset", default=0, required=False, type=int
         )
 
-    @patch("apps.github.management.commands.github_update_users.MemberProfile")
     @patch("apps.github.management.commands.github_update_users.User")
     @patch("apps.github.management.commands.github_update_users.RepositoryContributor")
     @patch("apps.github.management.commands.github_update_users.BATCH_SIZE", 2)
-    def test_handle_with_default_offset(
-        self, mock_repository_contributor, mock_user, mock_member_profile
-    ):
+    def test_handle_with_default_offset(self, mock_repository_contributor, mock_user):
         """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)
@@ -80,15 +76,11 @@ def test_handle_with_default_offset(
         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]
 
-    @patch("apps.github.management.commands.github_update_users.MemberProfile")
     @patch("apps.github.management.commands.github_update_users.User")
     @patch("apps.github.management.commands.github_update_users.RepositoryContributor")
     @patch("apps.github.management.commands.github_update_users.BATCH_SIZE", 2)
-    def test_handle_with_custom_offset(
-        self, mock_repository_contributor, mock_user, mock_member_profile
-    ):
+    def test_handle_with_custom_offset(self, mock_repository_contributor, mock_user):
         """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)
 
@@ -123,15 +115,13 @@ def test_handle_with_custom_offset(
         assert mock_user.bulk_save.call_count == 2
         assert mock_user.bulk_save.call_args_list[-1][0][0] == [mock_user1, mock_user2]
 
-    @patch("apps.github.management.commands.github_update_users.MemberProfile")
     @patch("apps.github.management.commands.github_update_users.User")
     @patch("apps.github.management.commands.github_update_users.RepositoryContributor")
     @patch("apps.github.management.commands.github_update_users.BATCH_SIZE", 3)
     def test_handle_with_users_having_no_contributions(
-        self, mock_repository_contributor, mock_user, mock_member_profile
+        self, mock_repository_contributor, mock_user
     ):
         """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)
 
@@ -159,15 +149,11 @@ def test_handle_with_users_having_no_contributions(
         assert mock_user.bulk_save.call_count == 1
         assert mock_user.bulk_save.call_args_list[-1][0][0] == [mock_user1, mock_user2]
 
-    @patch("apps.github.management.commands.github_update_users.MemberProfile")
     @patch("apps.github.management.commands.github_update_users.User")
     @patch("apps.github.management.commands.github_update_users.RepositoryContributor")
     @patch("apps.github.management.commands.github_update_users.BATCH_SIZE", 1)
-    def test_handle_with_single_user(
-        self, mock_repository_contributor, mock_user, mock_member_profile
-    ):
+    def test_handle_with_single_user(self, mock_repository_contributor, mock_user):
         """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_users_queryset = MagicMock()
@@ -193,15 +179,11 @@ def test_handle_with_single_user(
         assert mock_user.bulk_save.call_count == 2
         assert mock_user.bulk_save.call_args_list[-1][0][0] == [mock_user1]
 
-    @patch("apps.github.management.commands.github_update_users.MemberProfile")
     @patch("apps.github.management.commands.github_update_users.User")
     @patch("apps.github.management.commands.github_update_users.RepositoryContributor")
     @patch("apps.github.management.commands.github_update_users.BATCH_SIZE", 2)
-    def test_handle_with_empty_user_list(
-        self, mock_repository_contributor, mock_user, mock_member_profile
-    ):
+    def test_handle_with_empty_user_list(self, mock_repository_contributor, mock_user):
         """Test command execution with no users."""
-        mock_member_profile.objects.get_or_create.return_value = (MagicMock(), False)
         mock_users_queryset = MagicMock()
         mock_users_queryset.count.return_value = 0
         mock_users_queryset.__getitem__.return_value = []
@@ -220,18 +202,12 @@ def test_handle_with_empty_user_list(
 
         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] == []
 
-    @patch("apps.github.management.commands.github_update_users.MemberProfile")
     @patch("apps.github.management.commands.github_update_users.User")
     @patch("apps.github.management.commands.github_update_users.RepositoryContributor")
     @patch("apps.github.management.commands.github_update_users.BATCH_SIZE", 2)
-    def test_handle_with_exact_batch_size(
-        self, mock_repository_contributor, mock_user, mock_member_profile
-    ):
+    def test_handle_with_exact_batch_size(self, mock_repository_contributor, mock_user):
         """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)
 
@@ -261,41 +237,3 @@ def test_handle_with_exact_batch_size(
 
         assert mock_user.bulk_save.call_count == 2
         assert mock_user.bulk_save.call_args_list[-1][0][0] == [mock_user1, mock_user2]
-
-    @patch("apps.github.management.commands.github_update_users.MemberProfile")
-    @patch("apps.github.management.commands.github_update_users.User")
-    @patch("apps.github.management.commands.github_update_users.RepositoryContributor")
-    @patch("apps.github.management.commands.github_update_users.BATCH_SIZE", 2)
-    def test_handle_member_profile_created(
-        self, mock_repository_contributor, mock_user, mock_member_profile
-    ):
-        """Test command execution when MemberProfile is newly created."""
-        mock_profile = MagicMock()
-        mock_member_profile.objects.get_or_create.return_value = (mock_profile, True)
-
-        mock_user1 = MagicMock(
-            id=1,
-            contributions_count=0,
-            is_owasp_staff=True,
-            has_public_member_page=False,
-        )
-
-        mock_users_queryset = MagicMock()
-        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
-
-        mock_rc_objects = MagicMock()
-        mock_rc_objects.exclude.return_value.values.return_value.annotate.return_value = [
-            {"user_id": 1, "total_contributions": 5}
-        ]
-        mock_repository_contributor.objects = mock_rc_objects
-
-        command = Command()
-        command.handle(offset=0)
-
-        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()