refactor: 使用校验器替代Field正则

Author: sunlin92

app/validator/schema.py

@@ -1,11 +1,12 @@
+import re
 from enum import Enum
 from inspect import Parameter
 from typing import Any, List, Optional
 
 from flask import g
 from lin import BaseModel
 from lin.exception import ParameterError
-from pydantic import Field
+from pydantic import Field, validator
 
 datetime_regex = "^((([1-9][0-9][0-9][0-9]-(0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|(20[0-3][0-9]-(0[2469]|11)-(0[1-9]|[12][0-9]|30))) (20|21|22|23|[0-1][0-9]):[0-5][0-9]:[0-5][0-9])$"
 
@@ -25,15 +26,17 @@ class NameListSchema(BaseModel):
 class LogQuerySearchSchema(BaseModel):
     keyword: Optional[str] = None
     name: Optional[str] = None
-    start: Optional[str] = Field(
-        None, regex=datetime_regex, description="YY-MM-DD HH:MM:SS"
-    )
-    end: Optional[str] = Field(
-        None, regex=datetime_regex, description="YY-MM-DD HH:MM:SS"
-    )
+    start: Optional[str] = Field(None, description="YY-MM-DD HH:MM:SS")
+    end: Optional[str] = Field(None, description="YY-MM-DD HH:MM:SS")
     count: int = Field(5, gt=0, lt=16, description="0 < count < 16")
     page: int = 0
 
+    @validator("start", "end")
+    def datetime_match(cls, v, values, **kwargs):
+        if re.match(datetime_regex, v):
+            return v
+        raise ValueError("时间格式有误")
+
     @staticmethod
     def offset_handler(req, resp, req_validation_error, instance):
         g.offset = req.context.query.count * req.context.query.page