changed the try expect block to ContentNodeTreeViewset

learningequality · Nov 19, 2024 · a6cbeeb · a6cbeeb
1 parent e1902fe
commit a6cbeeb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/kolibri/core/content/api.py b/kolibri/core/content/api.py
@@ -864,13 +864,6 @@ def retrieve(self, request, pk=None):
         if pk is None:
             raise Http404
 
-        try:
-            UUID(pk)
-        except ValueError:
-            return Response(
-                {"error": "Invalid UUID format."}, status=status.HTTP_400_BAD_REQUEST
-            )
-
         if self._should_proxy_request(request):
             if self.get_queryset().filter(admin_imported=True, pk=pk).exists():
                 # Used in the update method for remote request retrieval
@@ -1175,6 +1168,14 @@ class ContentNodeTreeViewset(BaseContentNodeTreeViewset, RemoteMixin):
     def retrieve(self, request, pk=None):
         if pk is None:
             raise Http404
+
+        try:
+            UUID(pk)
+        except ValueError:
+            return Response(
+                {"error": "Invalid UUID format."}, status=status.HTTP_400_BAD_REQUEST
+            )
+
         if self._should_proxy_request(request):
             try:
                 queryset = self.get_tree_queryset(request, pk)

diff --git a/kolibri/core/content/test/test_content_app.py b/kolibri/core/content/test/test_content_app.py
@@ -513,7 +513,7 @@ def test_contentnode_tree_none_pk(self):
                 kwargs={"pk": None},
             )
         )
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 400)
 
     def test_contentnode_tree_bad_pk(self):
         response = self.client.get(
@@ -523,6 +523,7 @@ def test_contentnode_tree_bad_pk(self):
             )
         )
         self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.data["error"], "Invalid UUID format.")
 
     @unittest.skipIf(
         getattr(settings, "DATABASES")["default"]["ENGINE"]

diff --git a/kolibri/core/content/test/test_public_api.py b/kolibri/core/content/test/test_public_api.py
@@ -102,7 +102,7 @@ def test_import_metadata_none_pk(self):
                 kwargs={"pk": None},
             )
         )
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 400)
 
     def test_import_metadata_bad_pk(self):
         response = self.client.get(