Merge branch 'main' into bugFix/aligned-placement-show-more-btn

Author: nipunh

.github/workflows/run-ci-cd.yaml

@@ -58,7 +58,7 @@ jobs:
           run_install: false
 
       - name: Set up Node
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
         with:
           node-version: 22
           cache: 'pnpm'

.github/workflows/run-code-ql.yaml

@@ -41,7 +41,7 @@ jobs:
 
       - name: Set up Node
         if: matrix.language == 'javascript-typescript'
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
         with:
           node-version: 22
           cache: 'pnpm'

backend/apps/core/utils/index.py

@@ -125,6 +125,7 @@ def get_params_for_index(index_name):
                 "idx_location",
                 "idx_login",
                 "idx_name",
+                "idx_public_repositories_count",
                 "idx_url",
             ]
 

backend/apps/github/graphql/nodes/issue.py

@@ -1,19 +1,26 @@
 """GitHub issue GraphQL node."""
 
+import graphene
+
 from apps.common.graphql.nodes import BaseNode
 from apps.github.models.issue import Issue
 
 
 class IssueNode(BaseNode):
     """GitHub issue node."""
 
+    repository_name = graphene.String()
+
     class Meta:
         model = Issue
         fields = (
             "author",
-            "comments_count",
             "created_at",
             "state",
             "title",
             "url",
         )
+
+    def resolve_repository_name(self, info):
+        """Resolve the repository name."""
+        return self.repository.name

backend/apps/github/graphql/nodes/pull_request.py

@@ -9,6 +9,7 @@
 class PullRequestNode(BaseNode):
     """GitHub pull request node."""
 
+    repository_name = graphene.String()
     url = graphene.String()
 
     class Meta:
@@ -19,6 +20,10 @@ class Meta:
             "title",
         )
 
+    def resolve_repository_name(self, info):
+        """Resolve repository name."""
+        return self.repository.name
+
     def resolve_url(self, info):
         """Resolve URL."""
         return self.url

backend/apps/github/graphql/nodes/repository_contributor.py

@@ -10,5 +10,5 @@ class RepositoryContributorNode(graphene.ObjectType):
     contributions_count = graphene.Int()
     login = graphene.String()
     name = graphene.String()
+    project_key = graphene.String()
     project_name = graphene.String()
-    project_url = graphene.String()

backend/apps/github/graphql/queries/repository_contributor.py

@@ -1,13 +1,12 @@
 """OWASP repository contributor GraphQL queries."""
 
 import graphene
-from django.db.models import F, OuterRef, Subquery, Window
+from django.db.models import F, Window
 from django.db.models.functions import Rank
 
 from apps.common.graphql.queries import BaseQuery
 from apps.github.graphql.nodes.repository_contributor import RepositoryContributorNode
 from apps.github.models.repository_contributor import RepositoryContributor
-from apps.owasp.models.project import Project
 
 
 class RepositoryContributorQuery(BaseQuery):
@@ -36,6 +35,14 @@ def resolve_top_contributors(root, info, limit, organization=None):
             RepositoryContributor.objects.by_humans()
             .to_community_repositories()
             .filter(repository__project__isnull=False)
+            .select_related("repository__project", "user")
+            .annotate(
+                rank=Window(
+                    expression=Rank(),
+                    order_by=F("contributions_count").desc(),
+                    partition_by=F("user__login"),
+                )
+            )
         )
 
         if organization:
@@ -46,34 +53,18 @@ def resolve_top_contributors(root, info, limit, organization=None):
             )
 
         top_contributors = (
-            queryset.annotate(
-                project_id=Subquery(
-                    Project.repositories.through.objects.filter(
-                        repository=OuterRef("repository_id")
-                    )
-                    .values("project_id")
-                    .order_by("project_id")[:1]  # Select the first project ID per repository
-                ),
-                project_name=Subquery(
-                    Project.objects.filter(id=OuterRef("project_id")).values("name")[:1]
-                ),
-                project_url=Subquery(
-                    Project.objects.filter(id=OuterRef("project_id")).values("key")[:1]
-                ),
-                rank=Window(
-                    expression=Rank(),
-                    order_by=F("contributions_count").desc(),
-                    partition_by=F("user__login"),
-                ),
+            queryset.filter(rank=1)
+            .annotate(
+                project_name=F("repository__project__name"),
+                project_key=F("repository__project__key"),
             )
-            .filter(rank=1)  # Keep only the highest contribution per user
             .values(
                 "contributions_count",
                 "user__avatar_url",
                 "user__login",
                 "user__name",
+                "project_key",
                 "project_name",
-                "project_url",
             )
             .order_by("-contributions_count")[:limit]
         )
@@ -84,8 +75,8 @@ def resolve_top_contributors(root, info, limit, organization=None):
                 contributions_count=trc["contributions_count"],
                 login=trc["user__login"],
                 name=trc["user__name"],
+                project_key=trc["project_key"].replace("www-project-", ""),
                 project_name=trc["project_name"],
-                project_url=trc["project_url"],
             )
             for trc in top_contributors
         ]

backend/apps/github/index/organization.py

@@ -19,6 +19,7 @@ class OrganizationIndex(IndexBase):
         "idx_location",
         "idx_login",
         "idx_name",
+        "idx_public_repositories_count",
         "idx_url",
     )
 

backend/apps/github/migrations/0021_release_release_published_at_idx.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.2 on 2025-04-14 07:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("github", "0020_repositorycontributor_user_contrib_idx"),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name="release",
+            index=models.Index(fields=["-published_at"], name="release_published_at_desc_idx"),
+        ),
+    ]

backend/apps/github/models/mixins/organization.py

@@ -66,6 +66,11 @@ def idx_name(self):
         """Return name for indexing."""
         return self.name or ""
 
+    @property
+    def idx_public_repositories_count(self):
+        """Return public repositories count for indexing."""
+        return self.public_repositories_count
+
     @property
     def idx_url(self):
         """Return URL for indexing."""

backend/apps/github/models/release.py

@@ -14,6 +14,7 @@ class Meta:
         db_table = "github_releases"
         indexes = [
             models.Index(fields=["-created_at"]),
+            models.Index(fields=["-published_at"], name="release_published_at_desc_idx"),
         ]
         verbose_name_plural = "Releases"
 

backend/apps/owasp/graphql/queries/sponsor.py

@@ -14,12 +14,14 @@ class SponsorQuery(BaseQuery):
 
     def resolve_sponsors(root, info):
         """Resolve sponsors."""
-        priority_order = {
-            Sponsor.SponsorType.DIAMOND: 1,
-            Sponsor.SponsorType.PLATINUM: 2,
-            Sponsor.SponsorType.GOLD: 3,
-            Sponsor.SponsorType.SILVER: 4,
-            Sponsor.SponsorType.SUPPORTER: 5,
-            Sponsor.SponsorType.NOT_SPONSOR: 6,
-        }
-        return sorted(Sponsor.objects.all(), key=lambda x: priority_order[x.sponsor_type])
+        return sorted(
+            Sponsor.objects.all(),
+            key=lambda x: {
+                Sponsor.SponsorType.DIAMOND: 1,
+                Sponsor.SponsorType.PLATINUM: 2,
+                Sponsor.SponsorType.GOLD: 3,
+                Sponsor.SponsorType.SILVER: 4,
+                Sponsor.SponsorType.SUPPORTER: 5,
+                Sponsor.SponsorType.NOT_SPONSOR: 6,
+            }[x.sponsor_type],
+        )

backend/apps/owasp/graphql/queries/stats.py

@@ -36,14 +36,9 @@ def resolve_stats_overview(self, info, **kwargs):
             .count()
         )
 
-        active_projects_stats = (active_projects_stats // 10) * 10  # nearest 10
-        active_chapters_stats = (active_chapters_stats // 10) * 10
-        contributors_stats = (contributors_stats // 100) * 100  # nearest 100
-        countries_stats = (countries_stats // 10) * 10
-
         return StatsNode(
-            active_projects_stats,
-            active_chapters_stats,
-            contributors_stats,
-            countries_stats,
+            (active_projects_stats // 10) * 10,  # nearest 10
+            (active_chapters_stats // 10) * 10,  # nearest 10
+            (contributors_stats // 100) * 100,  # nearest 100
+            (countries_stats // 10) * 10,  # nearest 10
         )

backend/apps/owasp/migrations/0031_alter_chapter_created_at_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.2 on 2025-04-14 07:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("github", "0020_repositorycontributor_user_contrib_idx"),
+        ("owasp", "0030_chapter_is_leaders_policy_compliant_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="chapter",
+            name="created_at",
+            field=models.DateTimeField(default=None, verbose_name="Created at"),
+        ),
+        migrations.AddIndex(
+            model_name="chapter",
+            index=models.Index(fields=["-created_at"], name="chapter_created_at_desc_idx"),
+        ),
+        migrations.AddIndex(
+            model_name="event",
+            index=models.Index(fields=["-start_date"], name="event_start_date_desc_idx"),
+        ),
+        migrations.AddIndex(
+            model_name="post",
+            index=models.Index(fields=["-published_at"], name="post_published_at_desc_idx"),
+        ),
+        migrations.AddIndex(
+            model_name="project",
+            index=models.Index(fields=["-created_at"], name="project_created_at_desc_idx"),
+        ),
+    ]

backend/apps/owasp/models/chapter.py

@@ -28,6 +28,9 @@ class Chapter(
 
     class Meta:
         db_table = "owasp_chapters"
+        indexes = [
+            models.Index(fields=["-created_at"], name="chapter_created_at_desc_idx"),
+        ]
         verbose_name_plural = "Chapters"
 
     level = models.CharField(verbose_name="Level", max_length=5, default="", blank=True)

backend/apps/owasp/models/event.py

@@ -17,6 +17,9 @@ class Event(BulkSaveModel, TimestampedModel):
 
     class Meta:
         db_table = "owasp_events"
+        indexes = [
+            models.Index(fields=["-start_date"], name="event_start_date_desc_idx"),
+        ]
         verbose_name_plural = "Events"
 
     class Category(models.TextChoices):

backend/apps/owasp/models/post.py

@@ -13,6 +13,9 @@ class Post(BulkSaveModel, TimestampedModel):
 
     class Meta:
         db_table = "owasp_posts"
+        indexes = [
+            models.Index(fields=["-published_at"], name="post_published_at_desc_idx"),
+        ]
         verbose_name_plural = "Posts"
 
     author_image_url = models.URLField(verbose_name="Author image URL", blank=True, default="")

backend/apps/owasp/models/project.py

@@ -28,6 +28,9 @@ class Project(
 
     class Meta:
         db_table = "owasp_projects"
+        indexes = [
+            models.Index(fields=["-created_at"], name="project_created_at_desc_idx"),
+        ]
         verbose_name_plural = "Projects"
 
     class ProjectLevel(models.TextChoices):