From 93daf3d1915d1a057b6ecf3a5edd3ea9d3ec160b Mon Sep 17 00:00:00 2001
From: Mariatta Wijaya <mariattaw@google.com>
Date: Tue, 25 Apr 2023 12:24:27 -0600
Subject: [PATCH 1/2] fix: expose Count, FieldFilter, Or, and And to firestore
 module

Expose the `Count`, `FieldFilter`, `Or`, and `And` to the `firestore` module from the `firestore_v1`.
---
 google/cloud/firestore/__init__.py    | 8 ++++++++
 google/cloud/firestore_v1/__init__.py | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/google/cloud/firestore/__init__.py b/google/cloud/firestore/__init__.py
index fb974af783..6fe060acbe 100644
--- a/google/cloud/firestore/__init__.py
+++ b/google/cloud/firestore/__init__.py
@@ -19,6 +19,7 @@
 
 __version__ = package_version.__version__
 
+from google.cloud.firestore_v1 import And
 from google.cloud.firestore_v1 import ArrayRemove
 from google.cloud.firestore_v1 import ArrayUnion
 from google.cloud.firestore_v1 import AsyncClient
@@ -28,6 +29,7 @@
 from google.cloud.firestore_v1 import async_transactional
 from google.cloud.firestore_v1 import AsyncTransaction
 from google.cloud.firestore_v1 import AsyncWriteBatch
+from google.cloud.firestore_v1 import CountAggregation
 from google.cloud.firestore_v1 import Client
 from google.cloud.firestore_v1 import CollectionGroup
 from google.cloud.firestore_v1 import CollectionReference
@@ -36,11 +38,13 @@
 from google.cloud.firestore_v1 import DocumentSnapshot
 from google.cloud.firestore_v1 import DocumentTransform
 from google.cloud.firestore_v1 import ExistsOption
+from google.cloud.firestore_v1 import FieldFilter
 from google.cloud.firestore_v1 import GeoPoint
 from google.cloud.firestore_v1 import Increment
 from google.cloud.firestore_v1 import LastUpdateOption
 from google.cloud.firestore_v1 import Maximum
 from google.cloud.firestore_v1 import Minimum
+from google.cloud.firestore_v1 import Or
 from google.cloud.firestore_v1 import Query
 from google.cloud.firestore_v1 import ReadAfterWriteError
 from google.cloud.firestore_v1 import SERVER_TIMESTAMP
@@ -55,6 +59,7 @@
 
 __all__: List[str] = [
     "__version__",
+    "And",
     "ArrayRemove",
     "ArrayUnion",
     "AsyncClient",
@@ -67,16 +72,19 @@
     "Client",
     "CollectionGroup",
     "CollectionReference",
+    "CountAggregation",
     "DELETE_FIELD",
     "DocumentReference",
     "DocumentSnapshot",
     "DocumentTransform",
     "ExistsOption",
+    "FieldFilter",
     "GeoPoint",
     "Increment",
     "LastUpdateOption",
     "Maximum",
     "Minimum",
+    "Or",
     "Query",
     "ReadAfterWriteError",
     "SERVER_TIMESTAMP",
diff --git a/google/cloud/firestore_v1/__init__.py b/google/cloud/firestore_v1/__init__.py
index 3ad2740b69..1d143556fe 100644
--- a/google/cloud/firestore_v1/__init__.py
+++ b/google/cloud/firestore_v1/__init__.py
@@ -29,6 +29,10 @@
 from google.cloud.firestore_v1._helpers import LastUpdateOption
 from google.cloud.firestore_v1._helpers import ReadAfterWriteError
 from google.cloud.firestore_v1._helpers import WriteOption
+from google.cloud.firestore_v1.base_aggregation import CountAggregation
+from google.cloud.firestore_v1.base_query import And
+from google.cloud.firestore_v1.base_query import FieldFilter
+from google.cloud.firestore_v1.base_query import Or
 from google.cloud.firestore_v1.async_batch import AsyncWriteBatch
 from google.cloud.firestore_v1.async_client import AsyncClient
 from google.cloud.firestore_v1.async_collection import AsyncCollectionReference
@@ -107,6 +111,7 @@
 
 __all__: List[str] = [
     "__version__",
+    "And",
     "ArrayRemove",
     "ArrayUnion",
     "AsyncClient",
@@ -117,6 +122,7 @@
     "AsyncTransaction",
     "AsyncWriteBatch",
     "Client",
+    "CountAggregation",
     "CollectionGroup",
     "CollectionReference",
     "DELETE_FIELD",
@@ -124,11 +130,13 @@
     "DocumentSnapshot",
     "DocumentTransform",
     "ExistsOption",
+    "FieldFilter",
     "GeoPoint",
     "Increment",
     "LastUpdateOption",
     "Maximum",
     "Minimum",
+    "Or",
     "Query",
     "ReadAfterWriteError",
     "SERVER_TIMESTAMP",

From e3da9a07edc067ce8cf61edbb1e8d3a84af4dc31 Mon Sep 17 00:00:00 2001
From: Mariatta Wijaya <mariattaw@google.com>
Date: Tue, 25 Apr 2023 12:33:45 -0600
Subject: [PATCH 2/2] reorder imports

---
 google/cloud/firestore/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/google/cloud/firestore/__init__.py b/google/cloud/firestore/__init__.py
index 6fe060acbe..79095778db 100644
--- a/google/cloud/firestore/__init__.py
+++ b/google/cloud/firestore/__init__.py
@@ -29,8 +29,8 @@
 from google.cloud.firestore_v1 import async_transactional
 from google.cloud.firestore_v1 import AsyncTransaction
 from google.cloud.firestore_v1 import AsyncWriteBatch
-from google.cloud.firestore_v1 import CountAggregation
 from google.cloud.firestore_v1 import Client
+from google.cloud.firestore_v1 import CountAggregation
 from google.cloud.firestore_v1 import CollectionGroup
 from google.cloud.firestore_v1 import CollectionReference
 from google.cloud.firestore_v1 import DELETE_FIELD
@@ -70,9 +70,9 @@
     "AsyncTransaction",
     "AsyncWriteBatch",
     "Client",
+    "CountAggregation",
     "CollectionGroup",
     "CollectionReference",
-    "CountAggregation",
     "DELETE_FIELD",
     "DocumentReference",
     "DocumentSnapshot",