internal 1.0.54__tar.gz → 1.0.56__tar.gz

{internal-1.0.54 → internal-1.0.56}/PKG-INFO

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

{internal-1.0.54 → internal-1.0.56}/pyproject.toml

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

{internal-1.0.54 → internal-1.0.56}/src/internal/common_enum/event_trigger_type.py

@@ -10,12 +10,14 @@ class EventTriggerTypeEnum(str, Enum):
     MANUAL_MODIFY_USER_SERVICE_TICKET = "manual_modify_user_service_ticket"
     MANUAL_MODIFY_ESTIMATED_ARRIVAL_TIME_SERVICE_TICKET = "manual_modify_estimated_arrival_time_service_ticket"
     MANUAL_MODIFY_ESTIMATED_DELIVERY_TIME_SERVICE_TICKET = "manual_modify_estimated_delivery_time_service_ticket"
+    MANUAL_DELETE_ESTIMATED_DELIVERY_TIME_SERVICE_TICKET = "manual_delete_estimated_delivery_time_service_ticket"
     MANUAL_BOOKING_MESSAGE_SERVICE_TICKET = "manual_booking_message_service_ticket"
     MANUAL_DELIVERY_MESSAGE_SERVICE_TICKET = "manual_delivery_message_service_ticket"
 
     NOSHOW_SERVICE_TICKET_AUTO_CANCEL = "noshow_service_ticket_auto_cancel"
     IMPORT_RESERVATION_CONFLICT_AUTO_CANCEL = "import_reservation_conflict_auto_cancel"
     BOOKING_REMINDING_SERVICE_TICKET = "booking_reminding_service_ticket"
+    TODAY_REPAIR_WORKING_SERVICE_TICKET_AUTO_CLOSED = "today_repair_working_service_ticket_auto_closed"
 
     LPNR_IN_ESTABLISHED = "lpnr_in_established"
     LPNR_IN_RECEPTION = "lpnr_in_reception"

{internal-1.0.54 → internal-1.0.56}/src/internal/model/operate.py

@@ -1,6 +1,6 @@
 import arrow
 from datetime import datetime
-from typing import Optional
+from typing import Optional, Dict
 
 import dictdiffer
 from pydantic import BaseModel
@@ -42,7 +42,8 @@ class Operate(BaseModel):
                 for j in range(0, len(diff[2])):
                     diff_result[diff[0]][diff[2][j][0]] = diff[2][j][1]
 
-        return Operate(**diff_result)
+        final_diff_result = cls.split_keys(diff_result)
+        return Operate(**final_diff_result)
 
     @classmethod
     async def remove_ignore_field(cls, model_dict: dict):
@@ -54,3 +55,21 @@ class Operate(BaseModel):
         for k, v in model_dict.items():
             if isinstance(v, datetime):
                 model_dict[k] = arrow.get(v).datetime
+
+    @classmethod
+    def split_keys(cls, diff_result: Dict):
+        result = {}
+        for key, value in diff_result.items():
+            if '.' in key:
+                parts = key.split('.')
+                current_level = result
+                for i, part in enumerate(parts):
+                    if i == len(parts) - 1:
+                        current_level[part] = cls.split_keys(value) if isinstance(value, dict) else value
+                    else:
+                        if part not in current_level:
+                            current_level[part] = {}
+                        current_level = current_level[part]
+            else:
+                result[key] = cls.split_keys(value) if isinstance(value, dict) else value
+        return result