internal 1.1.35.1__tar.gz → 1.1.35.3__tar.gz

{internal-1.1.35.1 → internal-1.1.35.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: internal
-Version: 1.1.35.1
+Version: 1.1.35.3
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-1.1.35.1 → internal-1.1.35.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "internal"
-version = "1.1.35.1"
+version = "1.1.35.3"
 description = ""
 authors = [{ name = "Ray", email = "ray@cruisys.com" }]
 readme = "README.md"

{internal-1.1.35.1 → internal-1.1.35.3}/src/internal/model/base_model.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from idlelib import query
 
 from typing import List, Tuple, Union, Dict, Type, Optional, Any, Literal, Union, Set, Mapping
 import typing_extensions
@@ -27,8 +28,7 @@ class InternalBaseDocument(Document):
     @classmethod
     async def get_pagination_list(cls, app: FastAPI, query: list = None, sort: List[Tuple] = None,
                                   page_size: int = DEF_PAGE_SIZE, page_no: int = DEF_PAGE_NO,
-                                  ignore_cache: bool = False, fetch_links: bool = False,
-                                  exclude_fields: List[str] = None):
+                                  ignore_cache: bool = False, fetch_links: bool = False, exclude: Dict = None):
         if not query:
             final_query = []
         else:
@@ -48,10 +48,6 @@ class InternalBaseDocument(Document):
                     continue
             final_sort.append((cls.id, pymongo.ASCENDING))
 
-        pymongo_kwargs = {}
-        if exclude_fields:
-            pymongo_kwargs['projection'] = {field: 0 for field in exclude_fields}
-
         total_num = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
             *final_sort).count()
 
@@ -63,9 +59,11 @@ class InternalBaseDocument(Document):
         else:
             page_no = max(1, min(page_no, total_pages))
 
-            page_data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links,
-                                       **pymongo_kwargs).sort(*final_sort).limit(page_size).skip(
-                (page_no - 1) * page_size).to_list()
+            _query = cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links)
+            if exclude:
+                _query = _query.project(exclude)
+
+            page_data = await _query.sort(*final_sort).limit(page_size).skip((page_no - 1) * page_size).to_list()
 
         return page_no, page_size, total_num, page_data
 
@@ -94,7 +92,7 @@ class InternalBaseDocument(Document):
 
     @classmethod
     async def get_list(cls, app: FastAPI, query: list = None, sort: List[Tuple] = None, ignore_cache: bool = False,
-                       fetch_links: bool = False, exclude_fields: List[str] = None):
+                       fetch_links: bool = False, exclude: Dict = None):
         if not query:
             final_query = []
         else:
@@ -114,13 +112,11 @@ class InternalBaseDocument(Document):
                     continue
             final_sort.append((cls.id, pymongo.ASCENDING))
 
-        # 準備 pymongo 的 projection 參數
-        pymongo_kwargs = {}
-        if exclude_fields:
-            pymongo_kwargs['projection'] = {field: 0 for field in exclude_fields}
+        _query = cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links)
+        if exclude:
+            _query = _query.project(exclude)
 
-        data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links,
-                              **pymongo_kwargs).sort(*final_sort).to_list()
+        data = await _query.sort(*final_sort).to_list()
 
         return data