Merge branch 'main' of github.com:OWASP/Nest into pr/sameersharmadev/2869

Author: kasya

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,14 +15,14 @@ If you want to be assigned on any available issue, comment on it and wait for co
 
 ## Proposed change
 
-<!-- Don't forget to link your PR to an existing issue if any.-->
+<!-- Don't forget to link your PR to an existing issue.-->
 Resolves #(put the issue number here)
 
 <!-- Describe the big picture of your changes.-->
 Add the PR description here.
 
 ## Checklist
 
-- [ ] I read and followed the [contributing guidelines](https://github.com/OWASP/Nest/blob/main/CONTRIBUTING.md)
-- [ ] I ran `make check-test` locally and all tests passed
+- [ ] **Required:** I read and followed the [contributing guidelines](https://github.com/OWASP/Nest/blob/main/CONTRIBUTING.md)
+- [ ] **Required:** I ran `make check-test` locally and all tests passed
 - [ ] I used AI for code, documentation, or tests in this PR

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

@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412
+        uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e
         with:
           languages: ${{ matrix.language }}
 
@@ -55,6 +55,6 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412
+        uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e
         with:
           category: /language:${{ matrix.language }}

backend/apps/slack/common/handlers/chapters.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from django.conf import settings
+from django.template.defaultfilters import pluralize
 
 from apps.common.constants import NL
 from apps.common.utils import get_absolute_url, truncate
@@ -73,7 +74,7 @@ def get_blocks(
         location = chapter["idx_suggested_location"] or chapter["idx_country"]
         leaders = chapter.get("idx_leaders", [])
         leaders_text = (
-            f"_Leader{'' if len(leaders) == 1 else 's'}: {', '.join(leaders)}_{NL}"
+            f"_Leader{pluralize(len(leaders))}: {', '.join(leaders)}_{NL}"
             if leaders and presentation.include_metadata
             else ""
         )

backend/apps/slack/common/handlers/users.py

@@ -72,7 +72,6 @@ def get_blocks(
         ),
     ]
 
-    blocks = []
     for idx, user in enumerate(users):
         user_name_raw = user.get("idx_name") or user.get("idx_login", "")
         user_name = truncate(escape(user_name_raw), presentation.name_truncation)

backend/data/nest.json.gz

@@ -16,7 +16,7 @@ class MockPaginatedList:
 
     def __init__(self, items):
         self._items = items
-        self.totalCount = len(items)
+        self.totalCount = len(items)  # NOSONAR (for consistency with PyGithub).
 
     def __iter__(self):
         """Return an iterator for the items."""

backend/poetry.lock

@@ -37,8 +37,9 @@ def test_get_blocks_with_results(self, mocker, mock_users_data):
         """Tests the happy path, ensuring user data is formatted correctly into blocks."""
         mocker.patch("apps.github.index.search.user.get_users", return_value=mock_users_data)
         blocks = get_blocks(search_query="john")
-        assert len(blocks) > 1
-        user_block_text = blocks[0]["text"]["text"]
+        user_block_text = blocks[1]["text"]["text"]
+
+        assert "OWASP users that I found" in blocks[0]["text"]["text"]
         assert "1. <https://github.com/johndoe|*John Doe*>" in user_block_text
         assert "Company: OWASP" in user_block_text
         assert "Location: San Francisco" in user_block_text

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

@@ -66,6 +66,7 @@ geoloc
 geopy
 graphiql
 gunicorn
+hackathon
 heroui
 hsl
 igoat