fastapi-mongo-base 0.12.3__tar.gz → 0.12.4__tar.gz

fastapi_mongo_base-0.12.4/MANIFEST.in

@@ -0,0 +1 @@
+include pytest.ini

{fastapi_mongo_base-0.12.3/src/fastapi_mongo_base.egg-info → fastapi_mongo_base-0.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-mongo-base
-Version: 0.12.3
+Version: 0.12.4
 Summary: A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>
@@ -33,6 +33,8 @@ Requires-Dist: uvicorn[standard]>=0.13.0
 Provides-Extra: image
 Requires-Dist: Pillow>=9.0.0; extra == "image"
 Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: mongomock_motor; extra == "test"
 Requires-Dist: coverage; extra == "test"
 Dynamic: license-file
 

{fastapi_mongo_base-0.12.3 → fastapi_mongo_base-0.12.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fastapi-mongo-base"
-version = "0.12.3"
+version = "0.12.4"
 description = "A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -33,7 +33,16 @@ dependencies = [
   "fastapi>=0.65.0",
   "uvicorn[standard]>=0.13.0",
 ]
-optional-dependencies = { "image" = ["Pillow>=9.0.0"], "test" = ["coverage"] }
+
+[project.optional-dependencies]
+image = [
+  "Pillow>=9.0.0",
+]
+test = [
+  "pytest",
+  "mongomock_motor",
+  "coverage",
+]
 
 [project.urls]
 "Homepage" = "https://github.com/mahdikiani/fastapi-mongo-base-app"

{fastapi_mongo_base-0.12.3 → fastapi_mongo_base-0.12.4}/src/fastapi_mongo_base/models.py

@@ -50,13 +50,13 @@ class BaseEntity(BaseEntitySchema, Document):
     @classmethod
     def get_queryset(
         cls,
+        *,
         user_id: str | None = None,
         tenant_id: str | None = None,
         is_deleted: bool = False,
         uid: str | None = None,
-        *args,
         **kwargs,
-    ) -> list[dict]:
+    ) -> dict:
         """Build a MongoDB query filter based on provided parameters.
 
         Args:
@@ -71,19 +71,19 @@ class BaseEntity(BaseEntitySchema, Document):
             List of MongoDB query conditions
         """
         # Start with basic filters
-        base_query = []
+        base_query = {}
 
         # Add standard filters if applicable
-        base_query.append({"is_deleted": is_deleted})
-
-        if hasattr(cls, "user_id") and user_id:
-            base_query.append({"user_id": user_id})
+        base_query.update({"is_deleted": is_deleted})
 
         if hasattr(cls, "tenant_id"):
-            base_query.append({"tenant_id": tenant_id})
+            base_query.update({"tenant_id": tenant_id})
+
+        if hasattr(cls, "user_id") and user_id:
+            base_query.update({"user_id": user_id})
 
         if uid:
-            base_query.append({"uid": uid})
+            base_query.update({"uid": uid})
 
         # Process additional filters from kwargs
         for key, value in kwargs.items():
@@ -110,29 +110,27 @@ class BaseEntity(BaseEntitySchema, Document):
             # Handle range queries and array operators
             if key.endswith("_from") or key.endswith("_to"):
                 if basic.is_valid_range_value(value):
-                    if key.endswith("_from"):
-                        base_query.append({base_field: {"$gte": value}})
-                    elif key.endswith("_to"):
-                        base_query.append({base_field: {"$lte": value}})
+                    op = "$gte" if key.endswith("_from") else "$lte"
+                    base_query.setdefault(base_field, {}).update({op: value})
             elif key.endswith("_in") or key.endswith("_nin"):
                 value_list = basic.parse_array_parameter(value)
                 operator = "$in" if key.endswith("_in") else "$nin"
-                base_query.append({base_field: {operator: value_list}})
+                base_query.update({base_field: {operator: value_list}})
             else:
-                base_query.append({key: value})
+                base_query.update({key: value})
 
         return base_query
 
     @classmethod
     def get_query(
         cls,
+        *,
         user_id: str | None = None,
         tenant_id: str | None = None,
         is_deleted: bool = False,
         uid: str | None = None,
         created_at_from: datetime = None,
         created_at_to: datetime = None,
-        *args,
         **kwargs,
     ) -> FindMany:
         base_query = cls.get_queryset(
@@ -142,7 +140,6 @@ class BaseEntity(BaseEntitySchema, Document):
             uid=uid,
             created_at_from=created_at_from,
             created_at_to=created_at_to,
-            *args,  # noqa: B026
             **kwargs,
         )
         query = cls.find({"$and": base_query})
@@ -203,7 +200,6 @@ class BaseEntity(BaseEntitySchema, Document):
             user_id=user_id,
             tenant_id=tenant_id,
             is_deleted=is_deleted,
-            *args,  # noqa: B026
             **kwargs,
         )
 
@@ -307,7 +303,7 @@ class UserOwnedEntity(UserOwnedEntitySchema, BaseEntity):
         __abstract__ = True
 
         indexes = BaseEntity.Settings.indexes + [
-            IndexModel([("user_id", ASCENDING)]),
+            IndexModel([("user_id", ASCENDING), ("uid", ASCENDING)]),
         ]
 
     @classmethod
@@ -333,7 +329,7 @@ class TenantScopedEntity(TenantScopedEntitySchema, BaseEntity):
         __abstract__ = True
 
         indexes = BaseEntity.Settings.indexes + [
-            IndexModel([("tenant_id", ASCENDING)]),
+            IndexModel([("tenant_id", ASCENDING), ("uid", ASCENDING)]),
         ]
 
     @classmethod
@@ -361,8 +357,12 @@ class TenantUserEntity(TenantUserEntitySchema, BaseEntity):
     class Settings(TenantScopedEntity.Settings):
         __abstract__ = True
 
-        indexes = TenantScopedEntity.Settings.indexes + [
-            IndexModel([("user_id", ASCENDING)])
+        indexes = UserOwnedEntity.Settings.indexes + [
+            IndexModel([
+                ("tenant_id", ASCENDING),
+                ("user_id", ASCENDING),
+                ("uid", ASCENDING),
+            ]),
         ]
 
     @classmethod

{fastapi_mongo_base-0.12.3 → fastapi_mongo_base-0.12.4/src/fastapi_mongo_base.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-mongo-base
-Version: 0.12.3
+Version: 0.12.4
 Summary: A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>
@@ -33,6 +33,8 @@ Requires-Dist: uvicorn[standard]>=0.13.0
 Provides-Extra: image
 Requires-Dist: Pillow>=9.0.0; extra == "image"
 Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: mongomock_motor; extra == "test"
 Requires-Dist: coverage; extra == "test"
 Dynamic: license-file
 

{fastapi_mongo_base-0.12.3 → fastapi_mongo_base-0.12.4}/src/fastapi_mongo_base.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 LICENSE.txt
+MANIFEST.in
 README.md
 pyproject.toml
 src/fastapi_mongo_base/__init__.py

{fastapi_mongo_base-0.12.3 → fastapi_mongo_base-0.12.4}/src/fastapi_mongo_base.egg-info/requires.txt

@@ -11,4 +11,6 @@ uvicorn[standard]>=0.13.0
 Pillow>=9.0.0
 
 [test]
+pytest
+mongomock_motor
 coverage