Apply rabbit suggestions on the e2e feature branch (OWASP#3389)

* Update dump_data

* Apply rabbit suggestions

* Update tests and dump_data command

* Update update-nest-test-images.yaml

Author: ahmedxgouda

.github/workflows/update-nest-test-images.yaml

@@ -82,8 +82,8 @@ jobs:
           cache-to: |
             type=gha,compression=zstd
             type=registry,ref=owasp/nest:test-fuzz-backend-cache
-          context: backend/docker
-          file: Dockerfile.fuzz
+          context: backend
+          file: docker/backend/Dockerfile.fuzz
           platforms: linux/amd64
           push: true
           tags: owasp/nest:test-fuzz-backend-latest

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

@@ -7,7 +7,7 @@
 
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
-from psycopg2 import ProgrammingError, connect, sql
+from psycopg2 import OperationalError, ProgrammingError, connect, sql
 
 DEFAULT_DATABASE = settings.DATABASES["default"]
 DB_HOST = DEFAULT_DATABASE.get("HOST", "localhost")
@@ -52,7 +52,14 @@ def handle(self, *args, **options):
 
         temp_db = f"temp_{DB_NAME}"
         try:
-            self._execute_sql("postgres", [f"CREATE DATABASE {temp_db} TEMPLATE {DB_NAME};"])
+            self._execute_sql(
+                "postgres",
+                [
+                    sql.SQL("CREATE DATABASE {temp_db} TEMPLATE {DB_NAME};").format(
+                        temp_db=sql.Identifier(temp_db), DB_NAME=sql.Identifier(DB_NAME)
+                    )
+                ],
+            )
 
             self.stdout.write(self.style.SUCCESS(f"Created temporary DB: {temp_db}"))
 
@@ -86,20 +93,27 @@ def handle(self, *args, **options):
             raise CommandError(message) from e
         finally:
             try:
-                self._execute_sql("postgres", [f"DROP DATABASE IF EXISTS {temp_db};"])
-            except CalledProcessError:
+                self._execute_sql(
+                    "postgres",
+                    [
+                        sql.SQL("DROP DATABASE IF EXISTS {temp_db};").format(
+                            temp_db=sql.Identifier(temp_db)
+                        )
+                    ],
+                )
+            except (ProgrammingError, OperationalError):
                 self.stderr.write(
                     self.style.WARNING(f"Failed to drop temp DB {temp_db} (ignored).")
                 )
 
-    def _table_list_query(self) -> str:
-        return """
+    def _table_list_query(self) -> sql.Composable:
+        return sql.SQL("""
         SELECT table_name
         FROM information_schema.columns
         WHERE table_schema = 'public' AND column_name = 'email';
-        """
+        """)
 
-    def _remove_emails(self, tables: list[str]) -> list[str]:
+    def _remove_emails(self, tables: list[str]) -> list[sql.Composable]:
         return [
             sql.SQL("UPDATE {table} SET email = '';").format(table=sql.Identifier(table))
             for table in tables
@@ -108,7 +122,7 @@ def _remove_emails(self, tables: list[str]) -> list[str]:
     def _execute_sql(
         self,
         dbname: str,
-        sql_queries: list[str],
+        sql_queries: list[sql.Composable],
     ):
         connection = connect(
             dbname=dbname,

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

@@ -38,4 +38,4 @@ def repository_name(self, root: PullRequest) -> str | None:
     @strawberry_django.field
     def url(self, root: PullRequest) -> str:
         """Resolve URL."""
-        return root.url or ""
+        return root.url

backend/apps/github/api/internal/queries/issue.py

@@ -48,7 +48,7 @@ def recent_issues(
         """Resolve recent issues with optional filtering.
 
         Args:
-            distinct (bool): Whether to return unique issues per author and repository.
+            distinct (bool): Whether to return unique issues per author.
             limit (int): Maximum number of issues to return.
             login (str, optional): Filter issues by a specific author's login.
             organization (str, optional): Filter issues by a specific organization's login.

backend/apps/github/api/internal/queries/pull_request.py

@@ -49,7 +49,7 @@ def recent_pull_requests(
         """Resolve recent pull requests.
 
         Args:
-            distinct (bool): Whether to return unique pull requests per author and repository.
+            distinct (bool): Whether to return unique pull requests per author.
             limit (int): Maximum number of pull requests to return.
             login (str, optional): Filter pull requests by a specific author's login.
             organization (str, optional): Filter pull requests by a specific organization's login.

backend/apps/github/api/internal/queries/release.py

@@ -33,7 +33,7 @@ def recent_releases(
         """Resolve recent releases with optional distinct filtering.
 
         Args:
-            distinct (bool): Whether to return unique releases per author and repository.
+            distinct (bool): Whether to return unique releases per author.
             limit (int): Maximum number of releases to return.
             login (str, optional): Filter releases by a specific author's login.
             organization (str, optional): Filter releases by a specific organization's login.

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

@@ -37,7 +37,9 @@ def top_contributed_repositories(
             .order_by("-contributions_count")
         ]
 
-    @strawberry_django.field(select_related=["owasp_profile", "user_badges__badge"])
+    @strawberry_django.field(
+        select_related=["owasp_profile"], prefetch_related=["user_badges__badge"]
+    )
     def user(
         self,
         login: str,

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

@@ -16,7 +16,7 @@ def contributors_count(self, root: Committee) -> int:
         return root.owasp_repository.contributors_count if root.owasp_repository else 0
 
     @strawberry_django.field
-    def created_at(self, root: Committee) -> float:
+    def created_at(self, root: Committee) -> float | None:
         """Resolve created at."""
         return root.idx_created_at
 

backend/apps/owasp/api/internal/queries/post.py

@@ -15,5 +15,5 @@ class PostQuery:
 
     @strawberry_django.field
     def recent_posts(self, limit: int = 5) -> list[PostNode]:
-        """Return the 5 most recent posts."""
+        """Return the most recent posts."""
         return Post.recent_posts()[:limit] if (limit := min(limit, MAX_LIMIT)) > 0 else []

backend/apps/owasp/models/project_health_metrics.py

@@ -149,7 +149,7 @@ def owasp_page_last_update_days_requirement(self) -> int:
     @cached_property
     def project_requirements(self) -> ProjectHealthRequirements | None:
         """Get the project health requirements for the project's level."""
-        return ProjectHealthRequirements.objects.get(level=self.project.level)
+        return ProjectHealthRequirements.objects.filter(level=self.project.level).first()
 
     @staticmethod
     def bulk_save(metrics: list, fields: list | None = None) -> None:  # type: ignore[override]