internal 1.0.10__tar.gz → 1.0.12__tar.gz

{internal-1.0.10 → internal-1.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: internal
-Version: 1.0.10
+Version: 1.0.12
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-1.0.10 → internal-1.0.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "internal"
-version = "1.0.10"
+version = "1.0.12"
 description = ""
 authors = ["Ray <ray@cruisys.com>"]
 readme = "README.md"

internal-1.0.12/src/internal/common_enum/order_type.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class OrderTypeEnum(str, Enum):
+    ASC = "ASC"
+    DESC = "DESC"

{internal-1.0.10 → internal-1.0.12}/src/internal/model/base_model.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from enum import Enum
+
 from typing import List, Tuple, Union, Dict, Type
 
 import arrow
@@ -11,6 +11,7 @@ from pydantic import Field, BaseModel
 from .operate import Operate
 from ..const import DEF_PAGE_SIZE, DEF_PAGE_NO
 from ..exception.internal_exception import NoChangeException
+from ..common_enum.order_type import OrderTypeEnum
 
 
 class InternalBaseDocument(Document):
@@ -39,6 +40,7 @@ class InternalBaseDocument(Document):
                 else:
                     print(f"order type value error: temp_sort:{temp_sort}")
                     continue
+            final_sort.append((cls.id, pymongo.ASCENDING))
 
         total_num = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
             *final_sort).count()
@@ -50,7 +52,8 @@ class InternalBaseDocument(Document):
 
         return page_no, page_size, total_num, page_data
 
-    async def update_wrap(self, schema: Union[Dict, Type[BaseModel]]) -> Tuple[Operate, 'InternalBaseDocument', 'InternalBaseDocument']:
+    async def update_wrap(self, schema: Union[Dict, Type[BaseModel]]) -> Tuple[
+        Operate, 'InternalBaseDocument', 'InternalBaseDocument']:
         if not issubclass(type(schema), dict) and not issubclass(type(schema), BaseModel):
             raise TypeError("Schema must be a subclass of BaseModel or dict")
 
@@ -71,8 +74,3 @@ class InternalBaseDocument(Document):
 
         await self.save()
         return operate, original_model, self
-
-
-class OrderTypeEnum(str, Enum):
-    ASC = "ASC"
-    DESC = "DESC"

internal-1.0.10/src/internal/common_enum/event_type.py

@@ -1,6 +0,0 @@
-from enum import Enum
-
-
-class EventTypeEnum(str, Enum):
-    SYSTEM = "SYSTEM"
-    CUSTOMIZATION = "CUSTOMIZATION"