internal 1.1.35.1__tar.gz → 1.1.35.2__tar.gz

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

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

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

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

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

@@ -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,15 @@ 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()
+            # 建立查詢物件用於取得分頁資料
+            data_query = cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links)
+
+            # 如果有指定要排除的欄位，使用 project() 方法
+            if exclude_fields:
+                projection = {field: 0 for field in exclude_fields}
+                data_query = data_query.project(projection)
+
+            page_data = await data_query.sort(*final_sort).limit(page_size).skip((page_no - 1) * page_size).to_list()
 
         return page_no, page_size, total_num, page_data
 
@@ -114,14 +116,15 @@ 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_obj = cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links)
 
-        data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links,
-                              **pymongo_kwargs).sort(*final_sort).to_list()
+        # 如果有指定要排除的欄位，使用 project() 方法
+        if exclude_fields:
+            projection = {field: 0 for field in exclude_fields}
+            query_obj = query_obj.project(projection)
 
+        data = await query_obj.sort(*final_sort).to_list()
         return data
 
     def model_dump(