Revert "Support the 'field' argument in collection 'where' query calls (#1)"

This reverts commit f91d895.

Author: MaitreyaBuddha

.github/workflows/pr_agent.yml

@@ -1,19 +1,17 @@
 name: Test
-on: [ push, pull_request ]
+on: [push, pull_request]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.9', '3.10', '3.11', '3.12' ]
+        python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10' ]
 
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-
+      - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

.github/workflows/test.yml

@@ -106,4 +106,3 @@ venv.bak/
 .mypy_cache/
 
 .idea/
-.qodo

.gitignore

@@ -3,7 +3,7 @@
 
 from mockfirestore import AlreadyExists
 from mockfirestore._helpers import generate_random_string, Store, get_by_path, set_by_path, Timestamp
-from mockfirestore.query import Query, FieldFilter
+from mockfirestore.query import Query
 from mockfirestore.document import DocumentReference, DocumentSnapshot
 
 
@@ -41,10 +41,9 @@ def add(self, document_data: Dict, document_id: str = None) \
         timestamp = Timestamp.from_now()
         return timestamp, doc_ref
 
-    def where(self, field: str = None, op: str = None, value: Any = None, *, filter: FieldFilter = None) -> Query:
-        if filter is not None:
-            return Query(self, field_filters=[(filter.field, filter.op, filter.value)])
-        return Query(self, field_filters=[(field, op, value)])
+    def where(self, field: str, op: str, value: Any) -> Query:
+        query = Query(self, field_filters=[(field, op, value)])
+        return query
 
     def order_by(self, key: str, direction: Optional[str] = None) -> Query:
         query = Query(self, orders=[(key, direction)])
@@ -83,4 +82,4 @@ def list_documents(self, page_size: Optional[int] = None) -> Sequence[DocumentRe
     def stream(self, transaction=None) -> Iterable[DocumentSnapshot]:
         for key in sorted(get_by_path(self._data, self._path)):
             doc_snapshot = self.document(key).get()
-            yield doc_snapshot
+            yield doc_snapshot

agent-coding-standards.md

@@ -1,22 +1,10 @@
 import warnings
 from itertools import islice, tee
 from typing import Iterator, Any, Optional, List, Callable, Union
-from dataclasses import dataclass
 
 from mockfirestore.document import DocumentSnapshot
 from mockfirestore._helpers import T
 
-@dataclass
-class FieldFilter:
-    field: str
-    op: str
-    value: Any
-
-    def __init__(self, field: str, op: str, value: Any):
-        self.field = field
-        self.op = op
-        self.value = value
-
 
 class Query:
     def __init__(self, parent: 'CollectionReference', projection=None,
@@ -73,11 +61,8 @@ def _add_field_filter(self, field: str, op: str, value: Any):
         compare = self._compare_func(op)
         self._field_filters.append((field, compare, value))
 
-    def where(self, field: str = None, op: str = None, value: Any = None, *, filter: FieldFilter = None) -> 'Query':
-        if filter is not None:
-            self._add_field_filter(filter.field, filter.op, filter.value)
-        else:
-            self._add_field_filter(field, op, value)
+    def where(self, field: str, op: str, value: Any) -> 'Query':
+        self._add_field_filter(field, op, value)
         return self
 
     def order_by(self, key: str, direction: Optional[str] = 'ASCENDING') -> 'Query':
@@ -151,4 +136,4 @@ def _compare_func(self, op: str) -> Callable[[T, T], bool]:
         elif op == 'array_contains':
             return lambda x, y: y in x
         elif op == 'array_contains_any':
-            return lambda x, y: any([val in y for val in x])
+            return lambda x, y: any([val in y for val in x])

mockfirestore/collection.py

@@ -1 +1 @@
-google-cloud-firestore
+google-cloud-firestore

mockfirestore/query.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="mock-firestore",
-    version="0.12.0",
+    version="0.11.0",
     author="Matt Dowds",
     description="In-memory implementation of Google Cloud Firestore for use in tests",
     long_description=long_description,
@@ -14,9 +14,11 @@
     packages=setuptools.find_packages(),
     test_suite='',
     classifiers=[
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
         "License :: OSI Approved :: MIT License",
     ],
 )