Use schema_url in SpectacularElementsView (#1067)

* Use schema_url in SpectacularElementsView * Add _get_schema_url * remove schema_url var * Add _get_schema_url to RapidocView
tfranzel · Sep 6, 2023 · 949ad85 · 949ad85
1 parent 3b028c2
commit 949ad85
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/docs/blueprints/elements.py b/docs/blueprints/elements.py
@@ -20,8 +20,6 @@ class SpectacularElementsView(APIView):
 
      @extend_schema(exclude=True)
      def get(self, request, *args, **kwargs):
-        schema_url = self.url or get_relative_url(reverse(self.url_name, request=request))
-        schema_url = set_query_parameters(schema_url, lang=request.GET.get('lang'), version=request.GET.get('version'))
         return Response(
             data={
                 'title': self.title,
@@ -31,3 +29,11 @@ def get(self, request, *args, **kwargs):
             },
             template_name=self.template_name
         )
+
+    def _get_schema_url(self, request):
+        schema_url = self.url or get_relative_url(reverse(self.url_name, request=request))
+        return set_query_parameters(
+            url=schema_url,
+            lang=request.GET.get('lang'),
+            version=request.GET.get('version')
+        )
diff --git a/docs/blueprints/rapidoc.py b/docs/blueprints/rapidoc.py
@@ -20,13 +20,19 @@ class SpectacularRapiDocView(APIView):
 
     @extend_schema(exclude=True)
     def get(self, request, *args, **kwargs):
-        schema_url = self.url or get_relative_url(reverse(self.url_name, request=request))
-        schema_url = set_query_parameters(schema_url, lang=request.GET.get('lang'))
         return Response(
             data={
                 'title': self.title,
                 'dist': 'https://cdn.jsdelivr.net/npm/rapidoc@latest',
-                'schema_url': schema_url,
+                'schema_url': self._get_schema_url(request),
             },
             template_name=self.template_name,
         )
+
+    def _get_schema_url(self, request):
+        schema_url = self.url or get_relative_url(reverse(self.url_name, request=request))
+        return set_query_parameters(
+            url=schema_url,
+            lang=request.GET.get('lang'),
+            version=request.GET.get('version')
+        )