internal 1.0.127__py3-none-any.whl → 1.0.129__py3-none-any.whl

internal/common_enum/event_code.py

@@ -3,8 +3,8 @@ from enum import Enum
 
 class EventCodeEnum(str, Enum):
     MANUAL_CANCEL_SERVICE_TICKET = "manual_cancel_service_ticket"
-    MANUAL_TRACING_START_SERVICE_TICKET = "manual_tracking_start_service_ticket"
-    MANUAL_TRACING_STOP_SERVICE_TICKET = "manual_tracking_stop_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"

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"

internal/validator_utils.py

@@ -1,7 +1,7 @@
 import re
 
 from .exception.app_exception import PlateNoFormatException, VinLengthOrFormatException, PhoneFormatException, \
-    DateFormatException
+    DateFormatException, EMailFormatException
 from .utils import sanitize_plate_no
 
 
@@ -29,7 +29,7 @@ def verify_phone(value: str, is_require: bool = False):
         raise PhoneFormatException()
 
     if value:
-        if not re.match(r'^\d+$', value):
+        if not re.match(r'^09\d{8}$', value):
             raise PhoneFormatException()
 
 
@@ -40,3 +40,12 @@ def verify_date(value: str, is_require: bool = False):
     if value:
         if not re.match(r'^\d{4}-\d{2}-\d{2}$', value):
             raise DateFormatException()
+
+
+def verify_mail(value: str, is_require: bool = False):
+    if is_require and not value:
+        raise EMailFormatException()
+
+    if value:
+        if not re.match(r'^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$', value):
+            raise EMailFormatException()

{internal-1.0.127.dist-info → internal-1.0.129.dist-info}/METADATA

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

{internal-1.0.127.dist-info → internal-1.0.129.dist-info}/RECORD

@@ -6,7 +6,7 @@ internal/common_enum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 internal/common_enum/contact_type.py,sha256=7QkTQ71UxpaT1YHI40FpjmLz3r-UbRU-sd0m5ajH1as,142
 internal/common_enum/description_type.py,sha256=kGwkFQh6dMnjDl6ipWYpA-qbNRrhEpnPq3NleTsNwwk,118
 internal/common_enum/device_code.py,sha256=lDTqRmP8zl6-k62HCsRehNAKCTXxH6WltZnvijy8Ijc,223
-internal/common_enum/event_code.py,sha256=UNEPeMyCs8c6cfTfZMExo6oQSFgeiYngD4hG1VW_VM0,1962
+internal/common_enum/event_code.py,sha256=XjceRiGEKkIH92XcKret2oErmnllxRNo_YoEYI6xoZc,1960
 internal/common_enum/lpr_direction.py,sha256=glCGSkcXHUB6_p2jO_7IdEHycyFVhu0vHDDDXbFJ174,113
 internal/common_enum/notify_type.py,sha256=p01d9ODiJ9vDpFBJ55bhu7WOyO7Te3slToOhvFKxQbk,188
 internal/common_enum/operator_type.py,sha256=XfHwGDsuOG6-ajitDoRuLFLT1LhHKoXXzFRW4e5vmJ8,173
@@ -15,7 +15,7 @@ internal/common_enum/websocket_channel.py,sha256=BIhdE2z_xF3lgStS8GiaS5M8BXm4_g3
 internal/const.py,sha256=d-F_tJ8GvxR1GwhEsqAt92XBwU53RAq8sZSGwWenb7o,1173
 internal/database.py,sha256=1u53JnFJ0jvP7H4HPY2faA2ABdPQ8SlsZigYmQAPktI,2470
 internal/exception/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/exception/app_exception.py,sha256=z7BGD0iw0VW5rczQb-sjnfxk1O_E6CPWMnBUfddU-0g,3467
+internal/exception/app_exception.py,sha256=4HE1BrXBuMTuukwEYJhz_gxS6eIqHpSBFB99J62BHJ0,3803
 internal/exception/base_exception.py,sha256=8ctp525A3up9mZrHCq_-Jj0hWr_4NfZsXGg1e4ftVuQ,473
 internal/exception/internal_exception.py,sha256=DDJg2tZtbcy4xlAhinJNzntSU1HcpGZ_XFP_perMzzo,2957
 internal/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -33,7 +33,7 @@ internal/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/model/base_model.py,sha256=NWjysNOp2MfXvAHGFqaQA_l8ZfTFvJbXQPUPuOXN_2g,5361
 internal/model/operate.py,sha256=QSM6yXYXpJMwrqkUGEWZLrEBaUgqHwVHY_Fi4S42hKc,3190
 internal/utils.py,sha256=i6YZdiXsiWnOjRdlJ6afNCGpyMe3Uo9mhm3xlQBy3Ls,2824
-internal/validator_utils.py,sha256=5ZLcNIgw1hvkYOj1f6gS9AYxe7Y3ufW9FyDxUS7FsMQ,1226
-internal-1.0.127.dist-info/METADATA,sha256=yUniTCqIZwoCzUVf7564BFtGpY7nt8Fla6tcgIn1gUE,809
-internal-1.0.127.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-internal-1.0.127.dist-info/RECORD,,
+internal/validator_utils.py,sha256=CqjaVFoAu5MqvBG_AkTP-r7AliWawtUWB851USj4moI,1519
+internal-1.0.129.dist-info/METADATA,sha256=A8-BySfVWAKQFYezTq7vUcw3lRtzlpfYS9m35TnH4tM,809
+internal-1.0.129.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+internal-1.0.129.dist-info/RECORD,,