Migrate User fields to MemberProfile (PR 1: Schema & Sync)

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

@@ -8,6 +8,7 @@
 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__)
 
@@ -46,14 +47,35 @@ 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/admin/member_profile.py

@@ -11,6 +11,9 @@ class MemberProfileAdmin(admin.ModelAdmin):
     autocomplete_fields = ("github_user",)
     list_display = (
         "github_user",
+        "is_owasp_staff",
+        "has_public_member_page",
+        "contributions_count",
         "owasp_slack_id",
         "first_contribution_at",
         "is_owasp_board_member",
@@ -47,7 +50,14 @@ class MemberProfileAdmin(admin.ModelAdmin):
         ),
         (
             "Contribution Information",
-            {"fields": ("first_contribution_at",)},
+            {
+                "fields": (
+                    "first_contribution_at",
+                    "is_owasp_staff",
+                    "has_public_member_page",
+                    "contributions_count",
+                )
+            },
         ),
         (
             "Membership Flags",

backend/apps/owasp/migrations/0066_memberprofile_contributions_count_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.2.7 on 2025-11-18 17:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0065_memberprofile_linkedin_page_id"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="memberprofile",
+            name="contributions_count",
+            field=models.PositiveIntegerField(default=0, verbose_name="Contributions count"),
+        ),
+        migrations.AddField(
+            model_name="memberprofile",
+            name="has_public_member_page",
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name="memberprofile",
+            name="is_owasp_staff",
+            field=models.BooleanField(
+                default=False,
+                help_text="Indicates if the user is OWASP Foundation staff.",
+                verbose_name="Is OWASP Staff",
+            ),
+        ),
+    ]

backend/apps/owasp/migrations/0067_memberprofile_backward_compatibility.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.2.7 on 2025-11-18 18:04
+
+from django.db import migrations
+
+
+def copy_user_data_to_member_profile(apps, _schema_editor):
+    """Copy user data to member profile."""
+    User = apps.get_model("github", "User")
+    MemberProfile = apps.get_model("owasp", "MemberProfile")
+    profiles_to_update = []
+    batch_size = 500
+    update_fields = [
+        "has_public_member_page",
+        "is_owasp_staff",
+        "contributions_count",
+    ]
+
+    for user in User.objects.all().iterator(chunk_size=batch_size):
+        profile, _ = MemberProfile.objects.get_or_create(github_user=user)
+        profile.has_public_member_page = user.has_public_member_page
+        profile.is_owasp_staff = user.is_owasp_staff
+        profile.contributions_count = user.contributions_count
+        profiles_to_update.append(profile)
+
+        if len(profiles_to_update) >= batch_size:
+            MemberProfile.objects.bulk_update(
+                profiles_to_update, update_fields, batch_size=batch_size
+            )
+            profiles_to_update = []
+
+    if profiles_to_update:
+        MemberProfile.objects.bulk_update(profiles_to_update, update_fields, batch_size=batch_size)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0066_memberprofile_contributions_count_and_more"),
+        ("github", "0039_remove_commit_commit_repo_created_idx"),
+    ]
+
+    operations = [
+        migrations.RunPython(copy_user_data_to_member_profile, migrations.RunPython.noop),
+    ]

backend/apps/owasp/models/member_profile.py

@@ -5,7 +5,7 @@
 from django.core.validators import RegexValidator
 from django.db import models
 
-from apps.common.models import TimestampedModel
+from apps.common.models import BulkSaveModel, TimestampedModel
 from apps.github.models.user import User
 
 
@@ -71,6 +71,25 @@ class Meta:
         help_text="LinkedIn username or custom URL ID (e.g., 'john-doe-123')",
     )
 
+    has_public_member_page = models.BooleanField(
+        default=True,
+        verbose_name="Has Public Member Page",
+        help_text="Whether the member's profile is publicly visible on the OWASP website",
+    )
+    is_owasp_staff = models.BooleanField(
+        default=False,
+        verbose_name="Is OWASP Staff",
+        help_text="Indicates if the user is OWASP Foundation staff.",
+    )
+    contributions_count = models.PositiveIntegerField(
+        verbose_name="Contributions count", default=0
+    )
+
     def __str__(self) -> str:
         """Return human-readable representation."""
         return f"OWASP member profile for {self.github_user.login}"
+
+    @staticmethod
+    def bulk_save(profiles, fields=None) -> None:
+        """Bulk save member profiles."""
+        BulkSaveModel.bulk_save(MemberProfile, profiles, fields=fields)

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

@@ -30,11 +30,15 @@ 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):
+    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)
@@ -76,11 +80,15 @@ def test_handle_with_default_offset(self, mock_repository_contributor, mock_user
         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):
+    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)
 
@@ -115,13 +123,15 @@ def test_handle_with_custom_offset(self, mock_repository_contributor, mock_user)
         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
+        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)
 
@@ -149,11 +159,15 @@ 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):
+    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_users_queryset = MagicMock()
@@ -179,11 +193,15 @@ def test_handle_with_single_user(self, mock_repository_contributor, mock_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):
+    def test_handle_with_empty_user_list(
+        self, mock_repository_contributor, mock_user, mock_member_profile
+    ):
         """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 = []
@@ -202,12 +220,18 @@ def test_handle_with_empty_user_list(self, mock_repository_contributor, mock_use
 
         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):
+    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)
 
@@ -237,3 +261,41 @@ def test_handle_with_exact_batch_size(self, mock_repository_contributor, mock_us
 
         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()

backend/tests/apps/owasp/admin/member_profile_test.py

@@ -12,6 +12,9 @@ def test_list_display(self):
 
         expected_fields = (
             "github_user",
+            "is_owasp_staff",
+            "has_public_member_page",
+            "contributions_count",
             "owasp_slack_id",
             "first_contribution_at",
             "is_owasp_board_member",