fixes #65 issue when expanding list of multiple relations (#66)

vaphes · Aug 31, 2023 · a840a1b · a840a1b
1 parent 4fc9b3f
commit a840a1b
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 0 deletions.
diff --git a/pocketbase/models/record.py b/pocketbase/models/record.py
@@ -19,6 +19,8 @@ def load(self, data: dict) -> None:
 
     @classmethod
     def parse_expanded(cls, data: dict):
+        if isinstance(data, list):
+            return [cls(a) for a in data]
         return cls(data)
 
     def load_expanded(self) -> None:

diff --git a/tests/integration/test_record.py b/tests/integration/test_record.py
@@ -34,6 +34,18 @@ def test_init_collection(self, client: PocketBase, state):
                 },
             },
         )
+        schema.append(
+            {
+                "name": "multirel",
+                "type": "relation",
+                "required": False,
+                "options": {
+                    "collectionId": state.coll.id,
+                    "cascadeDelete": False,
+                    "maxSelect": 5,
+                },
+            },
+        )
         state.coll = srv.update(state.coll.id, {"schema": schema})
 
     def test_create_record(self, client: PocketBase, state):
@@ -61,6 +73,22 @@ def test_create_multiple_record(self, client: PocketBase, state):
                 .id
             )
 
+    def test_create_multi_relation_record(self, client: PocketBase, state):
+        state.chained_multi_records = [
+            state.record.id,
+        ]
+        for _ in range(4):
+            state.chained_multi_records.append(
+                client.collection(state.coll.id)
+                .create(
+                    {
+                        "title": uuid4().hex,
+                        "multirel": state.chained_multi_records[:],
+                    }
+                )
+                .id
+            )
+
     def test_get_record(self, client: PocketBase, state):
         state.get_record = client.collection(state.coll.id).get_one(state.record.id)
         assert state.get_record.title is not None
@@ -79,6 +107,18 @@ def test_get_record_expand(self, client: PocketBase, state):
                 break
             rel = rel.expand["rel"]
 
+    def test_get_record_expand_multirel(self, client: PocketBase, state):
+        rel = client.collection(state.coll.id).get_one(
+            state.chained_multi_records[-1],
+            {"expand": "multirel.multirel.multirel.multirel"},
+        )
+        for i, r in enumerate(reversed(state.chained_multi_records)):
+            assert rel.id == r
+            if i >= 4:
+                break
+            assert len(rel.expand["multirel"]) == 4 - i
+            rel = rel.expand["multirel"][-1]
+
     def test_get_record_expand_full_list(self, client: PocketBase, state):
         rel = client.collection(state.coll.id).get_full_list(
             query_params={"expand": "rel.rel"}