feat: Add Contribution Heatmap to Chapter and Project Pages

backend/Makefile

@@ -138,6 +138,7 @@ update-data: \
 	github-update-related-organizations \
 	github-update-users \
 	owasp-aggregate-projects \
+	owasp-aggregate-contributions \
 	owasp-update-events \
 	owasp-sync-posts \
 	owasp-update-sponsors \

backend/apps/owasp/Makefile

@@ -2,6 +2,11 @@ owasp-aggregate-projects:
 	@echo "Aggregating OWASP projects"
 	@CMD="python manage.py owasp_aggregate_projects" $(MAKE) exec-backend-command
 
+owasp-aggregate-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
+
 owasp-create-project-metadata-file:
 	@echo "Generating metadata"
 	@CMD="python manage.py owasp_create_project_metadata_file $(entity_key)" $(MAKE) exec-backend-command

backend/apps/owasp/api/internal/nodes/chapter.py

@@ -18,6 +18,8 @@ class GeoLocationType:
 @strawberry_django.type(
     Chapter,
     fields=[
+        "contribution_data",
+        "contribution_stats",
         "country",
         "is_active",
         "meetup_group",

backend/apps/owasp/api/internal/nodes/project.py

@@ -23,6 +23,8 @@
 @strawberry_django.type(
     Project,
     fields=[
+        "contribution_data",
+        "contribution_stats",
         "contributors_count",
         "created_at",
         "forks_count",

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

@@ -0,0 +1,263 @@
+"""Management command to aggregate contributions for chapters and projects."""
+
+from datetime import datetime, timedelta
+
+from django.core.management.base import BaseCommand
+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.release import Release
+from apps.owasp.models.chapter import Chapter
+from apps.owasp.models.project import Project
+
+
+class Command(BaseCommand):
+    """Aggregate contribution data for chapters and projects."""
+
+    help = "Aggregate contributions (commits, issues, PRs, releases) for chapters and projects"
+
+    def add_arguments(self, parser):
+        """Add command arguments."""
+        parser.add_argument(
+            "--entity-type",
+            choices=["chapter", "project"],
+            help="Entity type to aggregate: chapter, project",
+            required=True,
+            type=str,
+        )
+        parser.add_argument(
+            "--days",
+            default=365,
+            help="Number of days to look back for contributions (default: 365)",
+            type=int,
+        )
+        parser.add_argument(
+            "--key",
+            help="Specific chapter or project key to aggregate",
+            type=str,
+        )
+        parser.add_argument(
+            "--offset",
+            default=0,
+            help="Skip the first N entities",
+            type=int,
+        )
+
+    def _aggregate_contribution_dates(
+        self,
+        queryset,
+        date_field: str,
+        contribution_map: dict[str, int],
+    ) -> None:
+        """Aggregate contribution dates from a queryset into the contribution map.
+
+        Args:
+            queryset: Django queryset to aggregate
+            date_field: Name of the date field to aggregate on
+            contribution_map: Dictionary to update with counts
+
+        """
+        for date_value in queryset.values_list(date_field, flat=True):
+            if not date_value:
+                continue
+
+            date_key = date_value.date().isoformat()
+            contribution_map[date_key] = contribution_map.get(date_key, 0) + 1
+
+    def _get_repository_ids(self, entity):
+        """Extract repository IDs from chapter or project."""
+        repo_ids = []
+
+        # Handle single owasp_repository
+        if hasattr(entity, "owasp_repository") and entity.owasp_repository:
+            repo_ids.append(entity.owasp_repository.id)
+
+        # Handle multiple repositories (for projects)
+        if hasattr(entity, "repositories"):
+            repo_ids.extend([r.id for r in entity.repositories.all()])
+
+        return repo_ids
+
+    def aggregate_contributions(self, entity, start_date: datetime) -> dict[str, int]:
+        """Aggregate contributions for a chapter or project.
+
+        Args:
+            entity: Chapter or Project instance
+            start_date: Start date for aggregation
+
+        Returns:
+            Dictionary mapping YYYY-MM-DD to contribution count
+
+        """
+        contribution_map: dict[str, int] = {}
+
+        repo_ids = self._get_repository_ids(entity)
+        if not repo_ids:
+            return contribution_map
+
+        # Aggregate commits
+        self._aggregate_contribution_dates(
+            Commit.objects.filter(
+                repository_id__in=repo_ids,
+                created_at__gte=start_date,
+            ),
+            "created_at",
+            contribution_map,
+        )
+
+        # Aggregate issues
+        self._aggregate_contribution_dates(
+            Issue.objects.filter(
+                repository_id__in=repo_ids,
+                created_at__gte=start_date,
+            ),
+            "created_at",
+            contribution_map,
+        )
+
+        # Aggregate pull requests
+        self._aggregate_contribution_dates(
+            PullRequest.objects.filter(
+                repository_id__in=repo_ids,
+                created_at__gte=start_date,
+            ),
+            "created_at",
+            contribution_map,
+        )
+
+        # Aggregate releases
+        self._aggregate_contribution_dates(
+            Release.objects.filter(
+                repository_id__in=repo_ids,
+                published_at__gte=start_date,
+                is_draft=False,
+            ),
+            "published_at",
+            contribution_map,
+        )
+
+        return contribution_map
+
+    def calculate_contribution_stats(self, entity, start_date: datetime) -> dict[str, int]:
+        """Calculate contribution statistics for a chapter or project.
+
+        Args:
+            entity: Chapter or Project instance
+            start_date: Start date for calculation
+
+        Returns:
+            Dictionary with commits, issues, pull requests, releases counts
+
+        """
+        stats = {
+            "commits": 0,
+            "issues": 0,
+            "pull_requests": 0,
+            "releases": 0,
+            "total": 0,
+        }
+
+        repo_ids = self._get_repository_ids(entity)
+        if not repo_ids:
+            return stats
+
+        # Count commits
+        stats["commits"] = Commit.objects.filter(
+            repository_id__in=repo_ids,
+            created_at__gte=start_date,
+        ).count()
+
+        # Count issues
+        stats["issues"] = Issue.objects.filter(
+            repository_id__in=repo_ids,
+            created_at__gte=start_date,
+        ).count()
+
+        # Count pull requests
+        stats["pull_requests"] = PullRequest.objects.filter(
+            repository_id__in=repo_ids,
+            created_at__gte=start_date,
+        ).count()
+
+        # Count releases
+        stats["releases"] = Release.objects.filter(
+            repository_id__in=repo_ids,
+            published_at__gte=start_date,
+            is_draft=False,
+        ).count()
+
+        stats["total"] = (
+            stats["commits"] + stats["issues"] + stats["pull_requests"] + stats["releases"]
+        )
+
+        return stats
+
+    def handle(self, *args, **options):
+        """Execute the command."""
+        entity_type = options["entity_type"]
+        days = options["days"]
+        key = options.get("key")
+        offset = options["offset"]
+
+        start_date = timezone.now() - timedelta(days=days)
+
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"Aggregating contributions from {start_date.date()} ({days} days back)",
+            ),
+        )
+
+        if entity_type == "chapter":
+            self._process_chapters(start_date, key, offset)
+        elif entity_type == "project":
+            self._process_projects(start_date, key, offset)
+
+        self.stdout.write(self.style.SUCCESS("Done!"))
+
+    def _process_chapters(self, start_date, key, offset):
+        """Process chapters for contribution aggregation."""
+        queryset = Chapter.objects.filter(is_active=True).order_by("id")
+
+        if key:
+            queryset = queryset.filter(key=key)
+
+        queryset = queryset.select_related("owasp_repository")
+
+        if offset:
+            queryset = queryset[offset:]
+
+        self._process_entities(queryset, start_date, "chapters", Chapter)
+
+    def _process_projects(self, start_date, key, offset):
+        """Process projects for contribution aggregation."""
+        queryset = (
+            Project.objects.filter(is_active=True)
+            .order_by("id")
+            .select_related("owasp_repository")
+            .prefetch_related("repositories")
+        )
+
+        if key:
+            queryset = queryset.filter(key=key)
+
+        if offset:
+            queryset = queryset[offset:]
+
+        self._process_entities(queryset, start_date, "projects", Project)
+
+    def _process_entities(self, queryset, start_date, label, model_class):
+        """Process entities (chapters or projects) for contribution aggregation."""
+        count = queryset.count()
+        self.stdout.write(f"Processing {count} {label}...")
+
+        entities = []
+        for entity in queryset:
+            entity.contribution_data = self.aggregate_contributions(entity, start_date)
+            entity.contribution_stats = self.calculate_contribution_stats(entity, start_date)
+            entities.append(entity)
+
+        if entities:
+            model_class.bulk_save(entities, fields=("contribution_data", "contribution_stats"))
+            self.stdout.write(self.style.SUCCESS(f"Updated {count} {label}"))

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

@@ -0,0 +1,32 @@
+# Generated by Django 5.2.8 on 2025-11-16 18:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0065_memberprofile_linkedin_page_id"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="chapter",
+            name="contribution_data",
+            field=models.JSONField(
+                blank=True,
+                default=dict,
+                help_text="Daily contribution counts (YYYY-MM-DD -> count mapping)",
+                verbose_name="Contribution Data",
+            ),
+        ),
+        migrations.AddField(
+            model_name="project",
+            name="contribution_data",
+            field=models.JSONField(
+                blank=True,
+                default=dict,
+                help_text="Daily contribution counts (YYYY-MM-DD -> count mapping)",
+                verbose_name="Contribution Data",
+            ),
+        ),
+    ]

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

@@ -0,0 +1,32 @@
+# Generated by Django 5.2.8 on 2025-11-29 19:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0066_chapter_contribution_data_project_contribution_data"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="chapter",
+            name="contribution_stats",
+            field=models.JSONField(
+                blank=True,
+                default=dict,
+                help_text="Detailed contribution breakdown (commits, issues, pullRequests, releases)",
+                verbose_name="Contribution Statistics",
+            ),
+        ),
+        migrations.AddField(
+            model_name="project",
+            name="contribution_stats",
+            field=models.JSONField(
+                blank=True,
+                default=dict,
+                help_text="Detailed contribution breakdown (commits, issues, pullRequests, releases)",
+                verbose_name="Contribution Statistics",
+            ),
+        ),
+    ]