wagtail-write-api 0.2.1__tar.gz → 0.2.2__tar.gz

{wagtail_write_api-0.2.1 → wagtail_write_api-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wagtail-write-api
-Version: 0.2.1
+Version: 0.2.2
 Summary: A read/write REST API for Wagtail CMS
 Project-URL: Homepage, https://tomdyson.github.io/wagtail-write-api/
 Project-URL: Repository, https://github.com/tomdyson/wagtail-write-api

{wagtail_write_api-0.2.1 → wagtail_write_api-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "wagtail-write-api"
-version = "0.2.1"
+version = "0.2.2"
 description = "A read/write REST API for Wagtail CMS"
 readme = "README.md"
 license = "BSD-3-Clause"

wagtail_write_api-0.2.2/src/wagtail_write_api/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.2"

{wagtail_write_api-0.2.1 → wagtail_write_api-0.2.2}/src/wagtail_write_api/endpoints/pages.py

@@ -19,8 +19,8 @@ router = Router(tags=["pages"], auth=WagtailTokenAuth())
 def list_pages(
     request,
     type: Optional[str] = None,
-    parent: Optional[int] = None,
-    descendant_of: Optional[int] = None,
+    parent: Optional[str] = None,
+    descendant_of: Optional[str] = None,
     status: Optional[str] = None,
     search: Optional[str] = None,
     order: Optional[str] = None,
@@ -44,17 +44,23 @@ def list_pages(
 
     if parent:
         try:
-            parent_page = Page.objects.get(id=parent)
+            parent_page = Page.objects.get(id=int(parent))
+        except (ValueError, Page.DoesNotExist):
+            parent_page = _resolve_page_by_path(parent)
+        if parent_page:
             qs = qs.child_of(parent_page)
-        except Page.DoesNotExist:
-            pass
+        else:
+            qs = qs.none()
 
     if descendant_of:
         try:
-            ancestor = Page.objects.get(id=descendant_of)
+            ancestor = Page.objects.get(id=int(descendant_of))
+        except (ValueError, Page.DoesNotExist):
+            ancestor = _resolve_page_by_path(descendant_of)
+        if ancestor:
             qs = qs.descendant_of(ancestor)
-        except Page.DoesNotExist:
-            pass
+        else:
+            qs = qs.none()
 
     if status == "live":
         qs = qs.filter(live=True, has_unpublished_changes=False)

{wagtail_write_api-0.2.1 → wagtail_write_api-0.2.2}/tests/test_pages_read.py

@@ -66,6 +66,18 @@ class TestListPages:
         data = response.json()
         assert len(data["items"]) == 2  # blog1 and blog2
 
+    def test_filter_by_parent_path(self, api_client, auth_header, page_tree):
+        response = api_client.get("/api/write/v1/pages/?parent=/blog/", **auth_header)
+        assert response.status_code == 200
+        data = response.json()
+        assert len(data["items"]) == 2  # blog1 and blog2
+
+    def test_filter_by_parent_invalid_returns_empty(self, api_client, auth_header, page_tree):
+        response = api_client.get("/api/write/v1/pages/?parent=/nonexistent/", **auth_header)
+        assert response.status_code == 200
+        data = response.json()
+        assert len(data["items"]) == 0
+
     def test_filter_by_status_live(self, api_client, auth_header, page_tree):
         response = api_client.get("/api/write/v1/pages/?status=live", **auth_header)
         assert response.status_code == 200

wagtail_write_api-0.2.1/src/wagtail_write_api/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.1"