Merge branch 'main' into pr/rudransh-shrivastava/2223

Author: arkid15r

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

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

backend/apps/api/__init__.py

@@ -0,0 +1 @@
+"""OWASP API."""

backend/apps/api/admin/__init__.py

@@ -0,0 +1 @@
+from .api_key import ApiKeyAdmin

backend/apps/nest/admin/api_key.py renamed to backend/apps/api/admin/api_key.py

@@ -1,8 +1,8 @@
-"""Nest app APIKey model admin."""
+"""API key model admin."""
 
 from django.contrib import admin
 
-from apps.nest.models.api_key import ApiKey
+from apps.api.models.api_key import ApiKey
 
 
 class ApiKeyAdmin(admin.ModelAdmin):

backend/apps/api/apps.py

@@ -0,0 +1,9 @@
+"""API app config."""
+
+from django.apps import AppConfig
+
+
+class ApiConfig(AppConfig):
+    """API app config."""
+
+    name = "apps.api"

backend/tests/apps/github/api/rest/__init__.py renamed to backend/apps/api/internal/__init__.py

@@ -0,0 +1,10 @@
+"""API app mutations."""
+
+import strawberry
+
+from .api_key import ApiKeyMutations
+
+
+@strawberry.type
+class ApiMutations(ApiKeyMutations):
+    """API mutations."""

backend/apps/api/internal/mutations/__init__.py

@@ -1,4 +1,4 @@
-"""Nest API key api.internal Mutations."""
+"""API app mutations."""
 
 import logging
 from datetime import datetime
@@ -9,9 +9,9 @@
 from django.utils import timezone
 from strawberry.types import Info
 
-from apps.nest.api.internal.nodes.api_key import ApiKeyNode
+from apps.api.internal.nodes.api_key import ApiKeyNode
+from apps.api.models.api_key import MAX_ACTIVE_KEYS, MAX_WORD_LENGTH, ApiKey
 from apps.nest.api.internal.permissions import IsAuthenticated
-from apps.nest.models.api_key import MAX_ACTIVE_KEYS, MAX_WORD_LENGTH, ApiKey
 
 logger = logging.getLogger(__name__)
 
@@ -38,7 +38,7 @@ class CreateApiKeyResult:
 
 @strawberry.type
 class ApiKeyMutations:
-    """api.internal mutation class for API keys."""
+    """API key mutations."""
 
     @strawberry.mutation(permission_classes=[IsAuthenticated])
     def create_api_key(self, info: Info, name: str, expires_at: datetime) -> CreateApiKeyResult:

backend/apps/nest/api/internal/mutations/api_key.py renamed to backend/apps/api/internal/mutations/api_key.py

@@ -3,7 +3,7 @@
 import strawberry
 import strawberry_django
 
-from apps.nest.models.api_key import ApiKey
+from apps.api.models.api_key import ApiKey
 
 
 @strawberry_django.type(