internal 1.0.86__tar.gz → 1.1.49.1__tar.gz

{internal-1.0.86 → internal-1.1.49.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: internal
-Version: 1.0.86
+Version: 1.1.49.1
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com
@@ -10,12 +10,17 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: arrow (>=1.3.0,<2.0.0)
+Requires-Dist: asgi-correlation-id (>=4.3.4,<5.0.0)
 Requires-Dist: beanie (>=1.29.0,<2.0.0)
 Requires-Dist: dictdiffer (>=0.9.0,<0.10.0)
 Requires-Dist: fastapi (>=0.115.6,<0.116.0)
 Requires-Dist: httpx (>=0.28.1,<0.29.0)
 Requires-Dist: pydantic-settings (>=2.7.1,<3.0.0)
+Requires-Dist: pytest (>=8.4.1,<9.0.0)
+Requires-Dist: pytest-asyncio (>=1.0.0,<2.0.0)
+Requires-Dist: pytest-sugar (>=1.0.0,<2.0.0)
 Requires-Dist: redis (>=5.2.1,<6.0.0)
+Requires-Dist: uvicorn (>=0.34.0,<0.35.0)
 Requires-Dist: watchtower (>=3.3.1,<4.0.0)
 Description-Content-Type: text/markdown
 

{internal-1.0.86 → internal-1.1.49.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "internal"
-version = "1.0.86"
+version = "1.1.49.1"
 description = ""
 authors = [{ name = "Ray", email = "ray@cruisys.com" }]
 readme = "README.md"
@@ -18,6 +18,11 @@ httpx = "^0.28.1"
 beanie = "^1.29.0"
 dictdiffer = "^0.9.0"
 redis = "^5.2.1"
+uvicorn = "^0.34.0"
+asgi-correlation-id = "^4.3.4"
+pytest = "^8.4.1"
+pytest-asyncio = "^1.0.0"
+pytest-sugar = "^1.0.0"
 
 [build-system]
 requires = ["poetry-core"]

{internal-1.0.86 → internal-1.1.49.1}/src/internal/base_config.py

@@ -11,13 +11,17 @@ class BaseConfig(BaseSettings):
     LOGGER_REQUEST_ENABLE: bool = True
 
     # Request
-    REQUEST_VERIFY_SSL: bool = True
+    REQUEST_VERIFY_SSL: bool = False
     REQUEST_PROXY: str = ''
-    REQUEST_RETRY: int = 5
-    REQUEST_CONN_POOL_TIMEOUT: float = 5
-    REQUEST_CONN_TIMEOUT: float = 5
-    REQUEST_WRITE_TIMEOUT: float = 5
-    RESPONSE_READ_TIMEOUT: float = 5
+    REQUEST_RETRY_COUNT: int = 0
+    REQUEST_RETRY_DELAY_INITIAL_SECONDS: float = 1.0
+    REQUEST_RETRY_DELAY_FACTOR: float = 1.5
+    REQUEST_RETRY_DELAY_RANDOM_JITTER_MIN: float = 0.0
+    REQUEST_RETRY_DELAY_RANDOM_JITTER_MAX: float = 0.3
+    REQUEST_CONN_POOL_TIMEOUT: float = 5.0
+    REQUEST_CONN_TIMEOUT: float = 5.0
+    REQUEST_WRITE_TIMEOUT: float = 5.0
+    RESPONSE_READ_TIMEOUT: float = 10.0
 
     # AWS
     AWS_ACCESS_KEY_ID: str = ""
@@ -48,9 +52,15 @@ class BaseConfig(BaseSettings):
     NOTIFY_BASE_URL: str = "http://notify-service-api:5000"
     THIRD_PARTY_BASE_URL: str = "http://third-party-service-api:5000"
     SCHEDULER_BASE_URL: str = "http://scheduler-service-api:5000"
+    AUTO_DATA_PROCESSING_BASE_URL: str = "http://auto-data-processing-service-api:5000"
 
     # Exception Notify
     WEBHOOK_BASE_URL: str = ""
+    WEBHOOK_RETRY_COUNT: int = 5
+    WEBHOOK_RETRY_DELAY_INITIAL_SECONDS: float = 1.0
+    WEBHOOK_RETRY_DELAY_FACTOR: float = 2.0
+    WEBHOOK_RETRY_DELAY_RANDOM_JITTER_MIN: float = 0.0
+    WEBHOOK_RETRY_DELAY_RANDOM_JITTER_MAX: float = 0.5
 
     # Default System Account Password
     SYSTEM_ACCOUNT: str = "cruisys"

{internal-1.0.86 → internal-1.1.49.1}/src/internal/base_factory.py

@@ -5,6 +5,7 @@ import traceback
 from abc import ABCMeta, abstractmethod
 from contextlib import asynccontextmanager
 from functools import lru_cache
+from asgi_correlation_id import CorrelationIdMiddleware, CorrelationIdFilter
 
 import dotenv
 import watchtower
@@ -14,11 +15,11 @@ from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
 
 from . import database, cache_redis
-from .const import LOG_FMT, LOG_FMT_NO_DT, LOG_DT_FMT, DEFAULT_LOGGER_NAME
+from .const import LOG_FMT, LOG_FMT_NO_DT, LOG_DT_FMT, DEFAULT_LOGGER_NAME, CORRELATION_ID_HEADER_KEY_NAME
 from .exception.base_exception import InternalBaseException
 from .exception.internal_exception import BadGatewayException, GatewayTimeoutException
 from .ext.amazon import aws
-from .http.requests import async_request
+from .http.requests import send_webhook_message
 from .http.responses import async_response
 from .middleware.log_request import LogRequestMiddleware
 from .utils import update_dict_with_cast
@@ -40,12 +41,6 @@ class BaseFactory(metaclass=ABCMeta):
         Each factory should define what model it wants.
         """
 
-    @abstractmethod
-    async def init_state_cache(self, app, app_config):
-        """
-        Each factory should define what model it wants.
-        """
-
     async def init_redis(self, app, app_config):
         if app_config.REDIS_URL:
             redis_cache = cache_redis.CacheRedis(app_config.REDIS_URL)
@@ -55,12 +50,24 @@ class BaseFactory(metaclass=ABCMeta):
         else:
             app.state.logger.info("skip initialization redis")
 
+    async def init_state_cache(self, app, app_config):
+        """
+        Each factory should define what model it wants.
+        """
+        pass
+
     async def init_state_scheduler_app(self, app, app_config):
         """
         Each factory should define what model it wants.
         """
         pass
 
+    async def close_scheduler_app(self, app, app_config):
+        """
+        Each factory should define what model it wants.
+        """
+        pass
+
     @abstractmethod
     @lru_cache()
     def get_app_config(self):
@@ -87,6 +94,8 @@ class BaseFactory(metaclass=ABCMeta):
             # code to execute when app is shutting down
             await mongodb.close()
             app.state.logger.info("Database disconnected")
+            await self.close_scheduler_app(app, self)
+            app.state.logger.info("State scheduler closed")
 
         if title is None:
             title = self.DEFAULT_APP_NAME
@@ -99,6 +108,18 @@ class BaseFactory(metaclass=ABCMeta):
                           debug=self.get_app_config().DEBUG, version=self.API_VERSION, lifespan=lifespan, docs_url=None,
                           redoc_url=None)
 
+        self.__load_local_config()
+        app.state.config = self.get_app_config()
+        self.__setup_main_logger(app, level=logging.DEBUG)
+        app.state.aws_session = aws.init_app(app)
+        self.__setup_cloud_log(app)
+        self.__load_cloud_config(app)
+
+        # 不重要的middleware請加在這之前
+        if self.get_app_config().LOGGER_REQUEST_ENABLE:
+            app.add_middleware(LogRequestMiddleware, logger=app.state.logger)
+
+
         origins = ["*"]
 
         app.add_middleware(
@@ -107,17 +128,14 @@ class BaseFactory(metaclass=ABCMeta):
             allow_credentials=True,
             allow_methods=["*"],
             allow_headers=["*"],
+            expose_headers=[CORRELATION_ID_HEADER_KEY_NAME]
         )
 
-        self.__load_local_config()
-        app.state.config = self.get_app_config()
-        self.__setup_main_logger(app, level=logging.DEBUG)
-        app.state.aws_session = aws.init_app(app)
-        self.__setup_cloud_log(app)
-        self.__load_cloud_config(app)
-
-        if self.get_app_config().LOGGER_REQUEST_ENABLE:
-            app.add_middleware(LogRequestMiddleware, logger=app.state.logger)
+        app.add_middleware(
+            CorrelationIdMiddleware,
+            header_name=CORRELATION_ID_HEADER_KEY_NAME,
+            update_request_header=True
+        )
 
         mongodb = database.MongoDB(self.get_app_config().DATABASE_USERNAME, self.get_app_config().DATABASE_PASSWORD,
                                    self.get_app_config().DATABASE_HOST, self.get_app_config().DATABASE_PORT,
@@ -137,21 +155,11 @@ class BaseFactory(metaclass=ABCMeta):
             detail = exc.detail
 
             if isinstance(exc, BadGatewayException):
-                if self.get_app_config().WEBHOOK_BASE_URL:
-                    message = f"【{self.DEFAULT_APP_NAME}】Bad gateway, request:{request.__dict__}, exc:{exc}"
-                    payload = {"text": message}
-                    try:
-                        await async_request(app, "POST", self.get_app_config().WEBHOOK_BASE_URL, json=payload)
-                    except Exception as e:
-                        app.state.logger.warn(f"Notify failure, Exception:{e}")
+                message = f"【{self.DEFAULT_APP_NAME}】Bad gateway, request:{request.__dict__}, exc:{exc}"
+                await send_webhook_message(app, message)
             elif isinstance(exc, GatewayTimeoutException):
-                if self.get_app_config().WEBHOOK_BASE_URL:
-                    message = f"【{self.DEFAULT_APP_NAME}】Gateway timeout, request:{request.__dict__}, exc:{exc}"
-                    payload = {"text": message}
-                    try:
-                        await async_request(app, "POST", self.get_app_config().WEBHOOK_BASE_URL, json=payload)
-                    except Exception as e:
-                        app.state.logger.warn(f"Notify failure, Exception:{e}")
+                message = f"【{self.DEFAULT_APP_NAME}】Gateway timeout, request:{request.__dict__}, exc:{exc}"
+                await send_webhook_message(app, message)
 
             return await async_response(data=detail.get("data"), code=detail.get("code"), message=detail.get("message"),
                                         status_code=exc.status_code)
@@ -169,13 +177,8 @@ class BaseFactory(metaclass=ABCMeta):
         async def http_exception_handler(request: Request, exc: Exception):
             app.state.logger.warn(f"Exception, request:{request.__dict__}, exc:{exc}")
             app.state.logger.warn(traceback.format_exc())
-            if self.get_app_config().WEBHOOK_BASE_URL:
-                message = f"【{self.DEFAULT_APP_NAME}】Unprocessed Exception, request:{request.__dict__}, exc:{exc}"
-                payload = {"text": message}
-                try:
-                    await async_request(app, "POST", self.get_app_config().WEBHOOK_BASE_URL, json=payload)
-                except Exception as e:
-                    app.state.logger.warn(f"Notify failure, Exception:{e}")
+            message = f"【{self.DEFAULT_APP_NAME}】Unprocessed Exception, request:{request.__dict__}, exc:{exc}"
+            await send_webhook_message(app, message)
 
             return await async_response(code="error_internal_server", message="Internal server error",
                                         status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -224,6 +227,7 @@ class BaseFactory(metaclass=ABCMeta):
 
         stream_handler = logging.StreamHandler()
         stream_handler.setFormatter(logging.Formatter(fmt=LOG_FMT))
+        stream_handler.addFilter(CorrelationIdFilter())
         logger.addHandler(stream_handler)
 
         return logger
@@ -235,6 +239,7 @@ class BaseFactory(metaclass=ABCMeta):
                 log_group_name=self.get_app_config().AWS_LOGGROUP_NAME,
                 boto3_client=logs_client, create_log_group=False)
             watchtower_handler.setFormatter(logging.Formatter(fmt=LOG_FMT_NO_DT, datefmt=LOG_DT_FMT))
+            watchtower_handler.addFilter(CorrelationIdFilter())
             app.state.logger.addHandler(watchtower_handler)
 
     def __init_builtin_api(self, app):

internal-1.0.86/src/internal/common_enum/contact_type.py → internal-1.1.49.1/src/internal/common_enum/car_relation_type.py

@@ -1,7 +1,7 @@
 from enum import Enum
 
 
-class ContactTypeEnum(str, Enum):
+class CarRelationTypeEnum(str, Enum):
     OWNER = "owner"
     DRIVER = "driver"
     BUYER = "buyer"

internal-1.1.49.1/src/internal/common_enum/device_code.py

@@ -0,0 +1,10 @@
+from enum import Enum
+
+
+class DeviceCodeEnum(str, Enum):
+    DOOR_IN = "door_in"
+    DOOR_OUT = "door_out"
+    REPAIR_IN = "repair_in"
+    REPAIR_OUT = "repair_out"
+    DETAIL_IN = "detail_in"
+    DETAIL_OUT = "detail_out"

internal-1.1.49.1/src/internal/common_enum/event_code.py

@@ -0,0 +1,48 @@
+from enum import Enum
+
+
+class EventCodeEnum(str, Enum):
+    MANUAL_CANCEL_SERVICE_TICKET = "manual_cancel_service_ticket"
+    MANUAL_TRACING_START_SERVICE_TICKET = "manual_tracing_start_service_ticket"
+    MANUAL_TRACING_STOP_SERVICE_TICKET = "manual_tracing_stop_service_ticket"
+    MANUAL_CREATE_SERVICE_TICKET = "manual_create_service_ticket"
+    MANUAL_IMPORT_RESERVATION_SMWS = "manual_import_reservation_smws"
+    MANUAL_MODIFY_USER_SERVICE_TICKET = "manual_modify_user_service_ticket"
+    MANUAL_MODIFY_ENABLE_NOTIFY_SERVICE_TICKET = "manual_modify_enable_notify_service_ticket"
+    MANUAL_MODIFY_DISABLE_NOTIFY_SERVICE_TICKET = "manual_modify_disable_notify_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_IMPORT_RESERVATION_MODIFY_USER_SERVICE_TICKET = "manual_import_reservation_modify_user_service_ticket"
+    MANUAL_IMPORT_RESERVATION_MODIFY_ESTIMATED_ARRIVAL_TIME_SERVICE_TICKET = "manual_import_reservation_modify_estimated_arrival_time_service_ticket"
+    MANUAL_IMPORT_RESERVATION_MODIFY_ESTIMATED_DELIVERY_TIME_SERVICE_TICKET = "manual_import_reservation_modify_estimated_delivery_time_service_ticket"
+    MANUAL_IMPORT_RESERVATION_DELETE_ESTIMATED_DELIVERY_TIME_SERVICE_TICKET = "manual_import_reservation_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"
+
+    SYSTEM_TRACING_START_SERVICE_TICKET = "system_tracing_start_service_ticket"
+    SYSTEM_TRACING_STOP_SERVICE_TICKET = "system_tracing_stop_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"
+
+    CAR_IN_ESTABLISHED = "car_in_established"
+    CAR_IN_RECEPTION = "car_in_reception"
+    CAR_IN_WORKING = "car_in_working"
+    CAR_IN_DISPATCH = "car_in_dispatch"
+    CAR_IN_DETAILING = "car_in_detailing"
+    CAR_IN_NO_TICKET = "car_in_no_ticket"
+    CAR_OUT_FINISHED = "car_out_finished"
+    CAR_OUT_GENERAL = "car_out_general"
+    CAR_OUT_NO_SERVE = "car_out_no_serve"
+    CAR_OUT_TEST = "car_out_test"
+    CAR_OUT_ACC = "car_out_acc"
+
+    LPR_CHANGE_STATE = "lpr_change_state"
+    LPR_CHANGE_POSITION = "lpr_change_position"
+
+    REPAIR_OVERDUE = "repair_overdue"
+    DETAILING_OVERDUE = "detailing_overdue"
+    DELIVERY_OVERDUE = "delivery_overdue"

internal-1.0.86/src/internal/common_enum/lpnr_direction.py → internal-1.1.49.1/src/internal/common_enum/lpr_direction.py

@@ -1,7 +1,7 @@
 from enum import Enum
 
 
-class LpnrDirectionEnum(str, Enum):
+class LPRDirectionEnum(str, Enum):
     IN = "in"
     OUT = "out"
     UNKNOWN = "unknown"

{internal-1.0.86 → internal-1.1.49.1}/src/internal/common_enum/notify_type.py

@@ -2,8 +2,8 @@ from enum import Enum
 
 
 class NotifyTypeEnum(str, Enum):
-    APP = "app"
     LINE = "line"
     SMS = "sms"
-    NOTIFICATION = "notification"
-    WEBSOCKET = "websocket"
+    APP = "app"
+    USER_BELL_NOTIFICATION = "user_bell_notification"
+    WEBSOCKET = "websocket"

{internal-1.0.86 → internal-1.1.49.1}/src/internal/common_enum/operator_type.py

@@ -5,3 +5,6 @@ class OperatorTypeEnum(str, Enum):
     SYSTEM = "system"
     USER = "user"
     CUSTOMER = "customer"
+    PROVIDER = "provider"
+    CLIENT = "client"
+    ADMIN = "admin"

internal-1.1.49.1/src/internal/common_enum/point_type.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class PointTypeEnum(str, Enum):
+    INVOICE_REWARD = "invoice_reward"
+    ACTIVITY = "activity"

internal-1.1.49.1/src/internal/common_enum/websocket_channel.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+class WebsocketChannelEnum(str, Enum):
+    OVER_ALL = "over_all"  # 儀表板
+    RECEPTION_CENTER = "reception_center"  # 接待中心
+    CAR_MOVEMENT = "car_movement"  # 車輛動態
+    USER_BELL_NOTIFICATION = "user_bell_notification"  # 個人小鈴噹
+    DAILY_DELIVERY_SUMMARY = "daily_delivery_summary"  # 當日交車統計

internal-1.1.49.1/src/internal/const.py

@@ -0,0 +1,61 @@
+# -*- coding: UTF-8 -*-
+
+
+DATE_FMT = "%Y-%m-%d"
+TIME_FMT = "%H:%M"
+DT_FMT = f"{DATE_FMT} {TIME_FMT}:%S"
+
+DEFAULT_LOGGER_NAME = "uvicorn"
+LOG_DT_FMT = f"{DT_FMT},%03d"
+LOG_FMT_NO_DT = "[%(levelname)7s][%(correlation_id)s][%(name)s][%(filename)s::%(funcName)s(%(lineno)s)]: %(message)s"
+LOG_FMT = "[%(asctime)s]" + LOG_FMT_NO_DT
+
+ARR_EXPORT_SHORT_FMT = "MM/DD HH:mm"
+ARR_DASH_SHORT_FMT = "MM-DD HH:mm"
+ARR_EXPORT_DATE_FMT = "YYYY/MM/DD"
+ARR_EXPORT_DATE_ONLY_FMT = "MM/DD"
+ARR_DATE_FMT = "YYYY-MM-DD"
+ARR_DATE_FMT_NO_DASH = "YYYYMMDD"
+ARR_EXPORT_DATETIME_FMT = "YYYY/MM/DD HH:mm"
+ARR_TIME_FMT = "HH:mm:ss"
+ARR_TIME_ONLY_FMT = "HH:mm"
+ARR_RFC3339_DT_FMT = f"{ARR_DATE_FMT}T{ARR_TIME_FMT}ZZ"
+ARR_DATETIME_FMT_NO_DASH = "YYYYMMDDHHmmss"
+ARR_HUMAN_READ_FMT = f"{ARR_DATE_FMT} {ARR_TIME_FMT}"
+ARR_IMPORT_TS_FMT = "YYYYMMDDHHmmss.SSSSSS"
+ARR_STR_DAY = "day"
+
+STR_EMPTY = ""
+STR_SPACE = " "
+STR_DASH = "-"
+STR_UNDERSCORE = "_"
+STR_SLASH = "/"
+STR_COMMA = ","
+
+SECONDS_PER_YEAR = 30758400
+SECONDS_PER_DAY = 86400
+SECONDS_PER_MIN = 60
+
+DEF_PAGE_NO = 1
+DEF_PAGE_SIZE = 15
+DEF_ORDER_BY = "_id"
+
+REDIS_LPR_DATA_LIST_PREFIX = "lpr_data_list"
+
+CORRELATION_ID_HEADER_KEY_NAME = "X-Request-ID"
+
+SOURCE_SMART_WORKSHOP_IMPORTED_SERVICE_TICKET = 'SmartWorkshopImportedServiceTicket'
+SOURCE_SMART_WORKSHOP_UPDATE_SERVICE_TICKET = 'SmartWorkshopUpdateServiceTicket'
+SOURCE_SMART_WORKSHOP_IMPORTED_UPDATE_SERVICE_TICKET = 'SmartWorkshopImportedUpdateServiceTicket'
+SOURCE_SMART_WORKSHOP_IMPORTED_DMS_DATA = 'SmartWorkshopImportedDMSData'
+SOURCE_SMART_WORKSHOP_IMPORTED_SELF_SELLING_DATA = 'SmartWorkshopImportedSelfSellingData'
+SOURCE_WEBHOOK = 'Webhook'
+SOURCE_SMART_WORKSHOP = 'SmartWorkshopManual'
+SOURCE_SERVICE_GO_LOGIN = 'ServiceGoLogin'
+SOURCE_SERVICE_GO_REGISTER = 'ServiceGoRegister'
+SOURCE_VIP_CODE_MANUAL_APPROVE = 'VIPCodeManualApprove'
+SOURCE_BINDING_SERVICE_GO = 'BindingFromServiceGo'
+SOURCE_BINDING_VIP_CODE = 'BindingFromVIPCode'
+SOURCE_BINDING_SMART_WORKSHOP = 'BindingFromSmartWorkshop'
+SOURCE_UNBINDING_SERVICE_GO = 'UnbindingFromServiceGo'
+SOURCE_UNBINDING_SMART_WORKSHOP = 'UnbindingFromSmartWorkshop'

{internal-1.0.86 → internal-1.1.49.1}/src/internal/database.py

@@ -2,6 +2,18 @@ from motor.motor_asyncio import AsyncIOMotorClient
 from pymongo.errors import ServerSelectionTimeoutError
 
 from .exception.internal_exception import DatabaseInitializeFailureException, DatabaseConnectFailureException
+from bson import Decimal128
+from bson.codec_options import CodecOptions, TypeDecoder, TypeRegistry
+from decimal import Decimal
+
+
+class Decimal128Decoder(TypeDecoder):
+    """自定義 Decimal128 解碼器，自動轉換為 Python Decimal"""
+    bson_type = Decimal128
+    python_type = Decimal
+
+    def transform_bson(self, value):
+        return value.to_decimal()
 
 
 class MongoDB:
@@ -39,10 +51,20 @@ class MongoDB:
         if self.client:
             self.client.close()
 
-    def get_database(self):
+    def get_database(self, db_name: str = None):
         if not self.client:
             raise DatabaseConnectFailureException()
-        return self.client[self.db_name]
+
+        type_registry = TypeRegistry([Decimal128Decoder()])
+        codec_options = CodecOptions(type_registry=type_registry)
+
+        name = db_name if db_name else self.db_name
+        return self.client.get_database(name, codec_options=codec_options)
+
+    def get_collection(self, collection_name: str, db_name: str = None):
+        """直接取得指定的集合"""
+        db = self.get_database(db_name)
+        return db[collection_name]
 
     async def get_mongodb_uri(self) -> str:
         if self.user_name and self.password:

{internal-1.0.86 → internal-1.1.49.1}/src/internal/exception/app_exception.py

@@ -58,7 +58,7 @@ class VinLengthOrFormatException(InternalBaseException):
 
 class PhoneFormatException(InternalBaseException):
     code = "error_phone_format"
-    message = "Phone only allow numeric"
+    message = "Phone only allow start with 09 and add 8 digits"
 
     def __init__(self, message: str = None, **kwargs):
         _message = message or self.message
@@ -74,6 +74,15 @@ class DateFormatException(InternalBaseException):
         super().__init__(status.HTTP_422_UNPROCESSABLE_ENTITY, self.code, _message, **kwargs)
 
 
+class EMailFormatException(InternalBaseException):
+    code = "error_email_format"
+    message = "Email format error"
+
+    def __init__(self, message: str = None, **kwargs):
+        _message = message or self.message
+        super().__init__(status.HTTP_422_UNPROCESSABLE_ENTITY, self.code, _message, **kwargs)
+
+
 class LineUidNullPointException(InternalBaseException):
     code = "error_line_uid_not_be_null"
     message = "Line uid can not be null"