Proxito: save one queryset (#9980)

readthedocs · Feb 7, 2023 · e85ee7d · e85ee7d
1 parent 5cea411
commit e85ee7d
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/readthedocs/proxito/views/decorators.py b/readthedocs/proxito/views/decorators.py
@@ -1,6 +1,7 @@
-import structlog
 from functools import wraps
 
+import structlog
+from django.db.models import Q
 from django.http import Http404
 
 from readthedocs.projects.models import Project, ProjectRelationship
@@ -25,26 +26,20 @@ def inner_view(  # noqa
             # Try to fetch by subproject alias first, otherwise we might end up
             # redirected to an unrelated project.
             # Depends on a project passed into kwargs
-            rel = ProjectRelationship.objects.filter(
-                parent=kwargs['project'],
-                alias=subproject_slug,
-            ).first()
+            rel = (
+                ProjectRelationship.objects.filter(parent=kwargs["project"])
+                .filter(Q(alias=subproject_slug) | Q(child__slug=subproject_slug))
+                .first()
+            )
             if rel:
                 subproject = rel.child
             else:
-                rel = ProjectRelationship.objects.filter(
-                    parent=kwargs['project'],
-                    child__slug=subproject_slug,
-                ).first()
-                if rel:
-                    subproject = rel.child
-                else:
-                    log.warning(
-                        'The slug is not subproject of project.',
-                        subproject_slug=subproject_slug,
-                        project_slug=kwargs['project'].slug,
-                    )
-                    raise Http404('Invalid subproject slug')
+                log.warning(
+                    "The slug is not subproject of project.",
+                    subproject_slug=subproject_slug,
+                    project_slug=kwargs["project"].slug,
+                )
+                raise Http404("Invalid subproject slug")
         return view_func(request, subproject=subproject, *args, **kwargs)
 
     return inner_view