Add reusable Contribution Heatmap to member page for design consistency

backend/Makefile

@@ -210,7 +210,8 @@ update-data: \
 	github-update-related-organizations \
 	github-update-users \
 	owasp-aggregate-projects \
-	owasp-aggregate-contributions \
+	owasp-aggregate-entity-contributions \
+	owasp-aggregate-member-contributions \
 	owasp-update-events \
 	owasp-sync-posts \
 	owasp-update-sponsors \

backend/apps/github/api/internal/nodes/user.py

@@ -12,6 +12,7 @@
         "avatar_url",
         "bio",
         "company",
+        "contribution_data",
         "contributions_count",
         "email",
         "followers_count",

backend/apps/github/migrations/0041_user_contribution_data.py

@@ -0,0 +1,22 @@
+# Generated by Django 6.0.1 on 2026-01-12 19:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("github", "0040_merge_20251117_0136"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="contribution_data",
+            field=models.JSONField(
+                blank=True,
+                default=dict,
+                help_text="Aggregated contribution data as date -> count mapping",
+                verbose_name="Contribution heatmap data",
+            ),
+        ),
+    ]

backend/apps/github/migrations/0042_merge_20260127_2218.py

@@ -0,0 +1,12 @@
+# Generated by Django 6.0.1 on 2026-01-27 22:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("github", "0041_milestone_github_milestone_created_at_and_more"),
+        ("github", "0041_user_contribution_data"),
+    ]
+
+    operations = []

backend/apps/github/migrations/0043_alter_user_contribution_data.py

@@ -0,0 +1,23 @@
+# Generated by Django 6.0.1 on 2026-01-28 01:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("github", "0042_merge_20260127_2218"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="contribution_data",
+            field=models.JSONField(
+                blank=True,
+                default=dict,
+                help_text="Aggregated contribution data as date -> count mapping",
+                null=True,
+                verbose_name="Contribution heatmap data",
+            ),
+        ),
+    ]

backend/apps/github/models/user.py

@@ -54,6 +54,14 @@ class Meta:
         verbose_name="Contributions count", default=0
     )
 
+    contribution_data = models.JSONField(
+        verbose_name="Contribution heatmap data",
+        default=dict,
+        blank=True,
+        null=True,
+        help_text="Aggregated contribution data as date -> count mapping",
+    )
+
     def __str__(self) -> str:
         """Return a human-readable representation of the user.
 

backend/apps/owasp/Makefile

@@ -2,10 +2,14 @@ owasp-aggregate-projects:
 	@echo "Aggregating OWASP projects"
 	@CMD="python manage.py owasp_aggregate_projects" $(MAKE) exec-backend-command
 
-owasp-aggregate-contributions:
+owasp-aggregate-entity-contributions:
 	@echo "Aggregating OWASP contributions"
-	@CMD="python manage.py owasp_aggregate_contributions --entity-type chapter" $(MAKE) exec-backend-command
-	@CMD="python manage.py owasp_aggregate_contributions --entity-type project" $(MAKE) exec-backend-command
+	@CMD="python manage.py owasp_aggregate_entity_contributions --entity-type chapter" $(MAKE) exec-backend-command
+	@CMD="python manage.py owasp_aggregate_entity_contributions --entity-type project" $(MAKE) exec-backend-command
+
+owasp-aggregate-member-contributions:
+	@echo "Aggregating OWASP community member contributions"
+	@CMD="python manage.py owasp_aggregate_member_contributions" $(MAKE) exec-backend-command
 
 owasp-create-project-metadata-file:
 	@echo "Generating metadata"

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

@@ -0,0 +1,140 @@
+"""Management command to aggregate user contribution data."""
+
+from datetime import datetime, timedelta
+from typing import Any
+
+from django.core.management.base import BaseCommand
+from django.db.models import Count
+from django.db.models.functions import TruncDate
+from django.utils import timezone
+
+from apps.github.models.commit import Commit
+from apps.github.models.issue import Issue
+from apps.github.models.pull_request import PullRequest
+from apps.github.models.user import User
+
+
+class Command(BaseCommand):
+    """Aggregate contribution data for users."""
+
+    help = "Aggregate contribution data (commits, PRs, issues) for users"
+
+    def add_arguments(self, parser):
+        """Add command arguments."""
+        parser.add_argument(
+            "--user",
+            type=str,
+            help="Specific user login to process",
+        )
+        parser.add_argument(
+            "--days",
+            type=int,
+            default=365,
+            help="Number of days to look back (default: 365)",
+        )
+        parser.add_argument(
+            "--batch-size",
+            type=int,
+            default=100,
+            help="Batch size for processing users (default: 100)",
+        )
+
+    def handle(self, *args: Any, **options: Any) -> None:
+        """Handle the command execution."""
+        user_login = options.get("user")
+        days = options.get("days", 365)
+        batch_size = options.get("batch_size", 100)
+
+        start_date = timezone.now() - timedelta(days=days)
+
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"Aggregating contributions since {start_date.date()} ({days} days back)"
+            )
+        )
+
+        if user_login:
+            users = User.objects.filter(login=user_login)
+            if not users.exists():
+                self.stdout.write(self.style.ERROR(f"Member '{user_login}' not found"))
+                return
+        else:
+            users = User.objects.filter(contributions_count__gt=0)
+
+        total_users = users.count()
+        self.stdout.write(f"Processing {total_users} members...")
+
+        updated_users = []
+        for user in users.iterator(chunk_size=batch_size):
+            user.contribution_data = self._aggregate_user_contributions(user, start_date)
+            updated_users.append(user)
+
+        User.bulk_save(updated_users, fields=["contribution_data"])
+
+        self.stdout.write(
+            self.style.SUCCESS(f"Successfully aggregated contributions for {total_users} members")
+        )
+
+    def _aggregate_user_contributions(self, user: User, start_date: datetime) -> dict[str, int]:
+        """Aggregate contributions for a user.
+
+        Args:
+            user: User instance
+            start_date: Start datetime for aggregation
+
+        Returns:
+            Dictionary mapping YYYY-MM-DD to contribution counts
+
+        """
+        contribution_data = {}
+        current_date = start_date.date()
+        end_date = timezone.now().date()
+
+        while current_date <= end_date:
+            date_str = current_date.strftime("%Y-%m-%d")
+            contribution_data[date_str] = 0
+            current_date += timedelta(days=1)
+
+        commits = (
+            Commit.objects.filter(
+                author=user,
+                created_at__gte=start_date,
+            )
+            .annotate(date=TruncDate("created_at"))
+            .values("date")
+            .annotate(count=Count("id"))
+        )
+
+        for commit in commits:
+            date_str = commit["date"].strftime("%Y-%m-%d")
+            contribution_data[date_str] = contribution_data.get(date_str, 0) + commit["count"]
+
+        prs = (
+            PullRequest.objects.filter(
+                author=user,
+                created_at__gte=start_date,
+            )
+            .annotate(date=TruncDate("created_at"))
+            .values("date")
+            .annotate(count=Count("id"))
+        )
+
+        for pr in prs:
+            date_str = pr["date"].strftime("%Y-%m-%d")
+            contribution_data[date_str] = contribution_data.get(date_str, 0) + pr["count"]
+
+        issues = (
+            Issue.objects.filter(
+                author=user,
+                created_at__gte=start_date,
+            )
+            .annotate(date=TruncDate("created_at"))
+            .values("date")
+            .annotate(count=Count("id"))
+        )
+
+        for issue in issues:
+            date_str = issue["date"].strftime("%Y-%m-%d")
+            contribution_data[date_str] = contribution_data.get(date_str, 0) + issue["count"]
+
+        return contribution_data

backend/apps/owasp/management/commands/owasp_aggregate_member_contributions.py.bak

@@ -0,0 +1,142 @@
+"""Management command to aggregate user contribution data."""
+
+from datetime import datetime, timedelta
+from typing import Any
+
+from django.core.management.base import BaseCommand
+from django.db.models import Count
+from django.db.models.functions import TruncDate
+from django.utils import timezone
+
+from apps.github.models.commit import Commit
+from apps.github.models.issue import Issue
+from apps.github.models.pull_request import PullRequest
+from apps.github.models.user import User
+
+
+class Command(BaseCommand):
+    """Aggregate contribution data for users."""
+
+    help = "Aggregate contribution data (commits, PRs, issues) for users"
+
+    def add_arguments(self, parser):
+        """Add command arguments."""
+        parser.add_argument(
+            "--user",
+            type=str,
+            help="Specific user login to process",
+        )
+        parser.add_argument(
+            "--days",
+            type=int,
+            default=365,
+            help="Number of days to look back (default: 365)",
+        )
+        parser.add_argument(
+            "--batch-size",
+            type=int,
+            default=100,
+            help="Batch size for processing users (default: 100)",
+        )
+
+    def handle(self, *args: Any, **options: Any) -> None:
+        """Handle the command execution."""
+        user_login = options.get("user")
+        days = options.get("days", 365)
+        batch_size = options.get("batch_size", 100)
+
+        start_date = timezone.now() - timedelta(days=days)
+
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"Aggregating contributions since {start_date.date()} ({days} days back)"
+            )
+        )
+
+        if user_login:
+            users = User.objects.filter(login=user_login)
+            if not users.exists():
+                self.stdout.write(self.style.ERROR(f"Member '{user_login}' not found"))
+                return
+        else:
+            users = User.objects.filter(contributions_count__gt=0)
+
+        total_users = users.count()
+        self.stdout.write(f"Processing {total_users} members...")
+
+        updated_users = []
+        for user in users.iterator(chunk_size=batch_size):
+            if not (contribution_data := self._aggregate_user_contributions(user, start_date)):
+                continue
+            user.contribution_data = contribution_data
+            updated_users.append(user)
+
+        User.bulk_save(updated_users, fields=["contribution_data"])
+
+        self.stdout.write(
+            self.style.SUCCESS(f"Successfully aggregated contributions for {total_users} members")
+        )
+
+    def _aggregate_user_contributions(self, user: User, start_date: datetime) -> dict[str, int]:
+        """Aggregate contributions for a user.
+
+        Args:
+            user: User instance
+            start_date: Start datetime for aggregation
+
+        Returns:
+            Dictionary mapping YYYY-MM-DD to contribution counts
+
+        """
+        contribution_data = {}
+        current_date = start_date.date()
+        end_date = timezone.now().date()
+
+        while current_date <= end_date:
+            date_str = current_date.strftime("%Y-%m-%d")
+            contribution_data[date_str] = 0
+            current_date += timedelta(days=1)
+
+        commits = (
+            Commit.objects.filter(
+                author=user,
+                created_at__gte=start_date,
+            )
+            .annotate(date=TruncDate("created_at"))
+            .values("date")
+            .annotate(count=Count("id"))
+        )
+
+        for commit in commits:
+            date_str = commit["date"].strftime("%Y-%m-%d")
+            contribution_data[date_str] = contribution_data.get(date_str, 0) + commit["count"]
+
+        prs = (
+            PullRequest.objects.filter(
+                author=user,
+                created_at__gte=start_date,
+            )
+            .annotate(date=TruncDate("created_at"))
+            .values("date")
+            .annotate(count=Count("id"))
+        )
+
+        for pr in prs:
+            date_str = pr["date"].strftime("%Y-%m-%d")
+            contribution_data[date_str] = contribution_data.get(date_str, 0) + pr["count"]
+
+        issues = (
+            Issue.objects.filter(
+                author=user,
+                created_at__gte=start_date,
+            )
+            .annotate(date=TruncDate("created_at"))
+            .values("date")
+            .annotate(count=Count("id"))
+        )
+
+        for issue in issues:
+            date_str = issue["date"].strftime("%Y-%m-%d")
+            contribution_data[date_str] = contribution_data.get(date_str, 0) + issue["count"]
+
+        return contribution_data