internal 1.0.46__tar.gz → 1.0.48__tar.gz

{internal-1.0.46 → internal-1.0.48}/PKG-INFO

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

{internal-1.0.46 → internal-1.0.48}/pyproject.toml

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

{internal-1.0.46 → internal-1.0.48}/src/internal/base_factory.py

@@ -3,6 +3,7 @@ import logging.handlers
 import os
 import traceback
 from abc import ABCMeta, abstractmethod
+from contextlib import asynccontextmanager
 from functools import lru_cache
 
 import dotenv
@@ -44,6 +45,12 @@ class BaseFactory(metaclass=ABCMeta):
         Each factory should define what model it wants.
         """
 
+    async def init_state_scheduler_app(self, app, app_config):
+        """
+        Each factory should define what model it wants.
+        """
+        pass
+
     @abstractmethod
     @lru_cache()
     def get_app_config(self):
@@ -52,15 +59,31 @@ class BaseFactory(metaclass=ABCMeta):
         """
 
     def create_app(self, title=None) -> FastAPI:
+
+        @asynccontextmanager
+        async def lifespan(app: FastAPI):
+            await mongodb.connect()
+            document_model_list = await self.get_document_model_list()
+            await init_beanie(database=app.state.db.get_database(), document_models=document_model_list)
+            app.state.logger.info("Database connected")
+            await self.init_state_cache(app, self.get_app_config())
+            app.state.logger.info("Initialization state cache done")
+            await self.init_state_scheduler_app(app, self.get_app_config())
+            app.state.logger.info("Initialization state scheduler app done")
+            yield
+            await mongodb.close()
+            app.state.logger.info("Database disconnected")
+
         if title is None:
             title = self.DEFAULT_APP_NAME
 
         if self.get_app_config().DEBUG:
             app = FastAPI(openapi_url=self.get_app_config().OPEN_API_URL, title=title,
-                          debug=self.get_app_config().DEBUG, version=self.API_VERSION)
+                          debug=self.get_app_config().DEBUG, version=self.API_VERSION, lifespan=lifespan)
         else:
             app = FastAPI(openapi_url=self.get_app_config().OPEN_API_URL, title=title,
-                          debug=self.get_app_config().DEBUG, version=self.API_VERSION, docs_url=None, redoc_url=None)
+                          debug=self.get_app_config().DEBUG, version=self.API_VERSION, lifespan=lifespan, docs_url=None,
+                          redoc_url=None)
 
         origins = ["*"]
 
@@ -92,17 +115,11 @@ class BaseFactory(metaclass=ABCMeta):
 
         @app.on_event("startup")
         async def startup_db_client():
-            await mongodb.connect()
-            document_model_list = await self.get_document_model_list()
-            await init_beanie(database=app.state.db.get_database(), document_models=document_model_list)
-            app.state.logger.info("Database connected")
-            await self.init_state_cache(app, self.get_app_config())
-            app.state.logger.info("Initialization state cache done")
+            print("startup_db_client================run")
 
         @app.on_event("shutdown")
         async def shutdown_db_client():
-            await mongodb.close()
-            app.state.logger.info("Database disconnected")
+            print("shutdown_db_client============run")
 
         app.state.db = mongodb
         app.state.config = self.get_app_config()

{internal-1.0.46 → internal-1.0.48}/src/internal/common_enum/event_trigger_type.py

@@ -7,6 +7,7 @@ class EventTriggerTypeEnum(str, Enum):
     MANUAL_TRACING_STOP_SERVICE_TICKET = "manual_tracking_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_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_BOOKING_MESSAGE_SERVICE_TICKET = "manual_booking_message_service_ticket"
@@ -15,5 +16,10 @@ class EventTriggerTypeEnum(str, Enum):
     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"
-    LPNR_IN = "lpnr_in"
+
+    LPNR_IN_ESTABLISHED = "lpnr_in_established"
+    LPNR_IN_RECEPTION = "lpnr_in_reception"
+    LPNR_IN_WORKING = "lpnr_in_working"
     LPNR_OUT = "lpnr_out"
+    LPNR_OUT_GENERAL = "lpnr_out_general"
+    LPNR_OUT_NO_SERVE = "lpnr_out_no_serve"

{internal-1.0.46 → internal-1.0.48}/src/internal/database.py

@@ -5,12 +5,6 @@ from .exception.internal_exception import DatabaseInitializeFailureException, Da
 
 
 class MongoDB:
-    # def __init__(self, connection_url: str, db_name: str, ssl: bool = False, ssl_ca_certs: str = None):
-    #     self.client = None
-    #     self.connection_url = connection_url
-    #     self.db_name = db_name
-    #     self.ssl = ssl
-    #     self.ssl_ca_certs = ssl_ca_certs
     def __init__(self, user_name: str, password: str, host: str, port: int, db_name: str, server_selection_timeout: int,
                  connection_timeout: int, auth_source: str, ssl: bool = False, ssl_ca_certs: str = None):
         self.client = None
@@ -49,3 +43,12 @@ class MongoDB:
         if not self.client:
             raise DatabaseConnectFailureException()
         return self.client[self.db_name]
+
+    def get_mongodb_uri(self) -> str:
+        uri = f"mongodb://{self.user_name}:{self.password}@{self.host}:{self.port}/{self.db_name}?authSource={self.auth_source}&connectTimeoutMS={self.connection_timeout}&serverSelectionTimeoutMS={self.server_selection_timeout}&retryWrites=false"
+        if self.ssl:
+            uri += "&ssl=true"
+        if self.ssl_ca_certs and self.ssl_ca_certs != "":
+            uri += f"&tlsCAFile={self.ssl_ca_certs}"
+
+        return uri