Merge pull request #38 from nitrictech/feature/collection-subcollections

Feature/collection subcollections

Author: jyecusch

examples/documents/sub_col_query.py

@@ -1,13 +1,13 @@
-# # [START import]
-# from nitric.api import Documents
-# # [END import]
-# async def documents_sub_col_query():
-# # [START snippet]
-#   docs = Documents()
+# [START import]
+from nitric.api import Documents
+# [END import]
+async def documents_sub_col_query():
+# [START snippet]
+  docs = Documents()
 
-#   query = (docs.collection("Customers")
-#           .collection("Orders")
-#           .query())
+  query = (docs.collection("Customers")
+          .collection("Orders")
+          .query())
 
-#   results = await query.fetch()
-# # [END snippet]
+  results = await query.fetch()
+# [END snippet]

nitric/api/documents.py

@@ -36,6 +36,8 @@
 )
 from nitric.utils import new_default_channel, _dict_from_struct, _struct_from_dict
 
+NIL_DOC_ID = ""
+
 
 class CollectionDepthException(Exception):
     """The max depth of document sub-collections has been exceeded."""
@@ -147,6 +149,23 @@ def doc(self, doc_id: str) -> DocumentRef:
         """Return a reference to a document in the collection."""
         return DocumentRef(_documents=self._documents, parent=self, id=doc_id)
 
+    def collection(self, name: str) -> CollectionGroupRef:
+        """
+        Return a reference to a sub-collection of this document.
+
+        This is currently only supported to one level of depth.
+        e.g. Documents().collection('a').collection('b').doc('c') is valid,
+        Documents().collection('a').doc('b').collection('c').collection('d') is invalid (1 level too deep).
+        """
+        current_depth = self.sub_collection_depth()
+        if current_depth >= MAX_SUB_COLLECTION_DEPTH:
+            # Collection nesting is only supported to a maximum depth.
+            raise CollectionDepthException(
+                f"sub-collections supported to a depth of {MAX_SUB_COLLECTION_DEPTH}, "
+                f"attempted to create new collection with depth {current_depth + 1}"
+            )
+        return CollectionGroupRef(_documents=self._documents, name=name, parent=self)
+
     def query(
         self,
         paging_token: Any = None,
@@ -174,6 +193,66 @@ def is_sub_collection(self):
         return self.parent is not None
 
 
+@dataclass(frozen=True, order=True)
+class CollectionGroupRef:
+    """A reference to a collection group."""
+
+    _documents: Documents
+    name: str
+    parent: Union[CollectionRef, None] = field(default_factory=lambda: None)
+
+    def query(
+        self,
+        paging_token: Any = None,
+        limit: int = 0,
+        expressions: Union[Expression, List[Expression]] = None,
+    ) -> QueryBuilder:
+        """Return a query builder scoped to this collection."""
+        return QueryBuilder(
+            documents=self._documents,
+            collection=self.to_collection_ref(),
+            paging_token=paging_token,
+            limit=limit,
+            expressions=[expressions] if isinstance(expressions, Expression) else expressions,
+        )
+
+    def sub_collection_depth(self) -> int:
+        """Return the depth of this collection group, which is a count of the parents above this collection."""
+        if not self.is_sub_collection():
+            return 0
+        else:
+            return self.parent.sub_collection_depth() + 1
+
+    def is_sub_collection(self):
+        """Return True if this collection is a sub-collection of a document in another collection."""
+        return self.parent is not None
+
+    def to_collection_ref(self):
+        """Return this collection group as a collection ref"""
+        return CollectionRef(
+            self._documents,
+            self.name,
+            DocumentRef(
+                self._documents,
+                self.parent,
+                NIL_DOC_ID,
+            ),
+        )
+
+    @staticmethod
+    def from_collection_ref(collectionRef: CollectionRef, documents: Documents) -> CollectionGroupRef:
+        """Return a collection ref as a collection group"""
+        if collectionRef.parent is not None:
+            return CollectionGroupRef(
+                documents,
+                collectionRef.name,
+                CollectionGroupRef.from_collection_ref(
+                    collectionRef.parent,
+                    documents,
+                ),
+            )
+
+
 class Operator(Enum):
     """Valid query expression operators."""
 

tests/api/test_documents.py

@@ -200,6 +200,24 @@ async def test_nested_subcollections_fail(self):
             "sub-collections supported to a depth of 1, attempted to create new collection with depth 2", str(e.value)
         )
 
+    def test_build_collection_subcollection(self):
+        col_ref = Documents().collection("test-collection").collection("test-subcollection")
+
+        assert col_ref == col_ref
+
+    def test_nested_subcollections_depth(self):
+        col_ref = Documents().collection("test-collection").collection("test-subcollection")
+
+        assert col_ref.sub_collection_depth() == 1
+
+    async def test_nested_subcollectiongroup_fail(self):
+        with pytest.raises(Exception) as e:
+            Documents().collection("a").doc("b").collection("c").collection("should-fail")
+
+        self.assertIn(
+            "sub-collections supported to a depth of 1, attempted to create new collection with depth 2", str(e.value)
+        )
+
     async def test_collection_query_fetch(self):
         mock_query = AsyncMock()
         mock_query.return_value = DocumentQueryResponse(
@@ -241,6 +259,48 @@ async def test_collection_query_fetch(self):
         self.assertEqual({"b": "c"}, results.paging_token)
         self.assertEqual([{"a": i} for i in range(3)], [doc.content for doc in results.documents])
 
+    async def test_subcollection_query_fetch(self):
+        mock_query = AsyncMock()
+        mock_query.return_value = DocumentQueryResponse(
+            documents=[
+                Document(
+                    content=Struct(fields={"a": Value(number_value=i)}),
+                    key=Key(id="test-doc", collection=Collection(name="a")),
+                )
+                for i in range(3)
+            ],
+            paging_token={"b": "c"},
+        )
+
+        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.query", mock_query):
+            results = (
+                await Documents()
+                .collection("a")
+                .collection("b")
+                .query()
+                .where("name", "startsWith", "test")
+                .where("age", ">", 3)
+                .where("dollar", "<", 2.0)
+                .where("true", "==", True)
+                .limit(3)
+                .fetch()
+            )
+
+        mock_query.assert_called_once_with(
+            collection=Collection(name="b", parent=Key(Collection(name="a"), id="")),
+            expressions=[
+                Expression(operand="name", operator="startsWith", value=ExpressionValue(string_value="test")),
+                Expression(operand="age", operator=">", value=ExpressionValue(int_value=3)),
+                Expression(operand="dollar", operator="<", value=ExpressionValue(double_value=2.0)),
+                Expression(operand="true", operator="==", value=ExpressionValue(bool_value=True)),
+            ],
+            limit=3,
+            paging_token=None,
+        )
+
+        self.assertEqual({"b": "c"}, results.paging_token)
+        self.assertEqual([{"a": i} for i in range(3)], [doc.content for doc in results.documents])
+
     async def test_has_more_pages(self):
         page = QueryResultsPage(paging_token="anything", documents=[])
         assert page.has_more_pages()

tests/examples/test_documents_example.py

@@ -1,3 +1,4 @@
+from examples.documents.sub_col_query import documents_sub_col_query
 from nitric.proto.nitric.document.v1 import Collection, DocumentGetResponse, DocumentQueryStreamResponse, Document, Key
 from examples.documents.set import documents_set
 from examples.documents.get import documents_get
@@ -96,6 +97,14 @@ async def test_sub_doc_query_document(self):
 
         mock_query.assert_called_once()
 
+    async def test_sub_col_query_document(self):
+        mock_query = AsyncMock()
+
+        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.query", mock_query):
+            await documents_sub_col_query()
+
+        mock_query.assert_called_once()
+
     async def test_streamed_document(self):
         stream_calls = 0
         call_args = {}