Merge branch 'main' into feature/improve-leaders-presentation

Author: kasya

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

@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@d6bbdef45e766d081b84a2def353b0055f728d3e
+        uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8
         with:
           languages: ${{ matrix.language }}
 
@@ -53,6 +53,6 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@d6bbdef45e766d081b84a2def353b0055f728d3e
+        uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8
         with:
           category: /language:${{ matrix.language }}

.github/workflows/test-schema.yaml

@@ -64,12 +64,12 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@d6bbdef45e766d081b84a2def353b0055f728d3e
+        uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8
         with:
           languages: ${{ matrix.language }}
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@d6bbdef45e766d081b84a2def353b0055f728d3e
+        uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8
         with:
           category: /language:${{ matrix.language }}
 

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
         exclude: (.github|pnpm-lock.yaml)
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.4
+    rev: v0.12.5
     hooks:
       - id: ruff
         args:

backend/apps/common/management/commands/purge_data.py

@@ -1,5 +1,7 @@
 """A command to purge OWASP Nest data."""
 
+# ruff: noqa: SLF001 https://docs.astral.sh/ruff/rules/private-member-access/
+
 from django.apps import apps
 from django.core.management.base import BaseCommand
 from django.db import connection

backend/apps/common/models.py

@@ -1,5 +1,7 @@
 """Common app models."""
 
+# ruff: noqa: SLF001 https://docs.astral.sh/ruff/rules/private-member-access/
+
 from django.db import models
 
 BATCH_SIZE = 1000

backend/apps/github/models/milestone.py

@@ -84,7 +84,7 @@ def bulk_save(milestones, fields=None):
         BulkSaveModel.bulk_save(Milestone, milestones, fields=fields)
 
     @staticmethod
-    def update_data(gh_milestone, author=None, repository=None, save=True):
+    def update_data(gh_milestone, *, author=None, repository=None, save=True):
         """Update Milestone data.
 
         Args:

backend/poetry.lock

@@ -29,7 +29,7 @@ django-cors-headers = "^4.7.0"
 django-ninja = "^1.4.3"
 django-redis = "^5.4.0"
 django-storages = { extras = ["s3"], version = "^1.14.4" }
-emoji= "^2.14.1"
+emoji = "^2.14.1"
 geopy = "^2.4.1"
 gunicorn = "^23.0.0"
 humanize = "^4.11.0"
@@ -39,7 +39,7 @@ langchain-community = "^0.3.26"
 lxml = "^5.3.0"
 markdown = "^3.7"
 openai = "^1.60.1"
-pgvector= "^0.4.1"
+pgvector = "^0.4.1"
 psycopg2-binary = "^2.9.9"
 pydantic = "^2.11.1"
 pydantic-core = "^2.33.0"
@@ -52,7 +52,7 @@ requests = "^2.32.3"
 sentry-sdk = { extras = ["django"], version = "^2.20.0" }
 slack-bolt = "^1.22.0"
 slack-sdk = "^3.35.0"
-strawberry-graphql = {extras = ["django"], version = "^0.270.1"}
+strawberry-graphql = { extras = ["django"], version = "^0.270.1" }
 strawberry-graphql-django = "^0.59.1"
 thefuzz = "^0.22.1"
 
@@ -123,58 +123,59 @@ target-version = "py313"
 [tool.ruff.lint]
 extend-select = ["I"]
 ignore = [
-    "ANN",      # https://docs.astral.sh/ruff/rules/#flake8-annotations-ann/
-    "ARG002",   # https://docs.astral.sh/ruff/rules/unused-method-argument/
-    "C901",     # https://docs.astral.sh/ruff/rules/complex-structure/
-    "COM812",   # https://docs.astral.sh/ruff/rules/missing-trailing-comma/
-    "D407",     # https://docs.astral.sh/ruff/rules/missing-dashed-underline-after-section/
-    "DJ012",    # https://docs.astral.sh/ruff/rules/django-unordered-body-content-in-model/
-    "FBT002",   # https://docs.astral.sh/ruff/rules/boolean-default-value-positional-argument/
-    "FIX002",   # https://docs.astral.sh/ruff/rules/line-contains-todo/
-    "PD",       # https://docs.astral.sh/ruff/rules/#pandas-vet-pd
-    "PERF203",  # https://docs.astral.sh/ruff/rules/try-except-in-loop/
-    "PLC0414",  # https://docs.astral.sh/ruff/rules/useless-import-alias/
-    "PLC0415",  # https://docs.astral.sh/ruff/rules/import-outside-top-level/
-    "PLR0912",  # https://docs.astral.sh/ruff/rules/too-many-branches/
-    "PLR0913",  # https://docs.astral.sh/ruff/rules/too-many-arguments/
-    "PLR0915",  # https://docs.astral.sh/ruff/rules/too-many-statements/
-    "RUF012",   # https://docs.astral.sh/ruff/rules/mutable-class-default/
-    "SLF001",   # https://docs.astral.sh/ruff/rules/private-member-access/
-    "TD003",    # https://docs.astral.sh/ruff/rules/missing-todo-link/
+    "ANN",     # https://docs.astral.sh/ruff/rules/#flake8-annotations-ann/
+    "ARG002",  # https://docs.astral.sh/ruff/rules/unused-method-argument/
+    "C901",    # https://docs.astral.sh/ruff/rules/complex-structure/
+    "COM812",  # https://docs.astral.sh/ruff/rules/missing-trailing-comma/
+    "D407",    # https://docs.astral.sh/ruff/rules/missing-dashed-underline-after-section/
+    "DJ012",   # https://docs.astral.sh/ruff/rules/django-unordered-body-content-in-model/
+    "FIX002",  # https://docs.astral.sh/ruff/rules/line-contains-todo/
+    "PLC0415", # https://docs.astral.sh/ruff/rules/import-outside-top-level/
+    "PLR0912", # https://docs.astral.sh/ruff/rules/too-many-branches/
+    "PLR0913", # https://docs.astral.sh/ruff/rules/too-many-arguments/
+    "PLR0915", # https://docs.astral.sh/ruff/rules/too-many-statements/
+    "RUF012",  # https://docs.astral.sh/ruff/rules/mutable-class-default/
+    "TD003",   # https://docs.astral.sh/ruff/rules/missing-todo-link/
 ]
 select = ["ALL"]
 
 [tool.ruff.lint.per-file-ignores]
 "**/__init__.py" = [
     "D104", # https://docs.astral.sh/ruff/rules/undocumented-public-package/
-    "F401"  # https://docs.astral.sh/ruff/rules/unused-import/
+    "F401", # https://docs.astral.sh/ruff/rules/unused-import/
 ]
 "**/management/commands/*.py" = [
     "D101", # https://docs.astral.sh/ruff/rules/undocumented-public-class/
     "D102", # https://docs.astral.sh/ruff/rules/undocumented-public-method/
-    "T201"  # https://docs.astral.sh/ruff/rules/print/
+    "T201", # https://docs.astral.sh/ruff/rules/print/
 ]
 "**/migrations/*.py" = [
-    "D100", # https://docs.astral.sh/ruff/rules/undocumented-public-module/
-    "D101", # https://docs.astral.sh/ruff/rules/undocumented-public-class/
-    "D104", # https://docs.astral.sh/ruff/rules/undocumented-public-package/
-    "E501"  # https://docs.astral.sh/ruff/rules/line-too-long/
+    "D100",   # https://docs.astral.sh/ruff/rules/undocumented-public-module/
+    "D101",   # https://docs.astral.sh/ruff/rules/undocumented-public-class/
+    "D104",   # https://docs.astral.sh/ruff/rules/undocumented-public-package/
+    "E501",   # https://docs.astral.sh/ruff/rules/line-too-long/
+    "RUF012", # https://docs.astral.sh/ruff/rules/mutable-class-default/
 ]
 "**/models/*.py" = [
-    "D106" # https://docs.astral.sh/ruff/rules/undocumented-public-nested-class/
+    "D106", # https://docs.astral.sh/ruff/rules/undocumented-public-nested-class/
 ]
 "**/rest/v1/*.py" = [
     "ARG001", # https://docs.astral.sh/ruff/rules/unused-function-argument/
     "B008",   # https://docs.astral.sh/ruff/rules/function-call-in-default-argument/
 ]
+"**/settings/*.py" = [
+    "RUF012", # https://docs.astral.sh/ruff/rules/mutable-class-default/
+]
 "**/tests/**/*.py" = [
     "D100",    # https://docs.astral.sh/ruff/rules/undocumented-public-module/
     "D101",    # https://docs.astral.sh/ruff/rules/undocumented-public-class/
     "D102",    # https://docs.astral.sh/ruff/rules/undocumented-public-method/
     "D103",    # https://docs.astral.sh/ruff/rules/undocumented-public-function/
     "D107",    # https://docs.astral.sh/ruff/rules/undocumented-public-init/
     "PLR2004", # https://docs.astral.sh/ruff/rules/magic-value-comparison/
-    "S101"     # https://docs.astral.sh/ruff/rules/assert/
+    "RUF012",  # https://docs.astral.sh/ruff/rules/mutable-class-default/
+    "S101",    # https://docs.astral.sh/ruff/rules/assert/
+    "SLF001",  # https://docs.astral.sh/ruff/rules/private-member-access/
 ]
 
 [build-system]

backend/pyproject.toml

@@ -0,0 +1,33 @@
+from unittest.mock import MagicMock
+
+import pytest
+from django.contrib.admin.sites import AdminSite
+
+from apps.github.admin.issue import IssueAdmin
+from apps.github.models.issue import Issue
+
+
+@pytest.fixture
+def issue_admin_instance():
+    return IssueAdmin(model=Issue, admin_site=AdminSite())
+
+
+class TestIssueAdmin:
+    """Test suite for the IssueAdmin class."""
+
+    def test_custom_field_github_url(self, issue_admin_instance):
+        """Test that custom_field_github_url generates the correct HTML link."""
+        mock_issue = MagicMock()
+        mock_issue.url = "https://github.com/mock-org/mock-repo/issues/1"
+
+        result = issue_admin_instance.custom_field_github_url(mock_issue)
+
+        expected_html = (
+            "<a href='https://github.com/mock-org/mock-repo/issues/1' target='_blank'>↗️</a>"
+        )
+
+        assert result == expected_html
+
+    def test_list_display_contains_custom_field(self, issue_admin_instance):
+        """Test that the list_display includes custom fields."""
+        assert "custom_field_github_url" in issue_admin_instance.list_display