internal 1.0.126__tar.gz → 1.0.128__tar.gz

{internal-1.0.126 → internal-1.0.128}/PKG-INFO

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

{internal-1.0.126 → internal-1.0.128}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "internal"
-version = "1.0.126"
+version = "1.0.128"
 description = ""
 authors = [{ name = "Ray", email = "ray@cruisys.com" }]
 readme = "README.md"

{internal-1.0.126 → internal-1.0.128}/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"

{internal-1.0.126 → internal-1.0.128}/src/internal/middleware/log_request.py

@@ -20,10 +20,12 @@ class LogRequestMiddleware(BaseHTTPMiddleware):
         headers = request.headers
         request_id = headers.get(CORRELATION_ID_HEADER_KEY_NAME, "")
 
-        params = defaultdict(list)
-        for key, value in request.query_params.multi_items():
-            params[key].append(value)
-        params = dict(params)
+        query_params = request.query_params
+        temp = defaultdict(list)
+        for key, value in query_params.multi_items():
+            temp[key].append(value)
+        # 如果只有一個值就轉成單一值
+        params = {k: v[0] if len(v) == 1 else v for k, v in temp.items()}
 
         body = await request.body()
         self.logger.info(

{internal-1.0.126 → internal-1.0.128}/src/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()