aiteamutils 0.2.113__py3-none-any.whl → 0.2.115__py3-none-any.whl

aiteamutils/database.py

@@ -468,7 +468,18 @@ async def list_entities(
         # 정렬 조건 적용
         if order:
             for order_item in order:
-                query = query.order_by(getattr(model, order_item["field"]).desc() if order_item["direction"] == "desc" else getattr(model, order_item["field"]).asc())
+                query = query.order_by(
+                    getattr(
+                        model, 
+                        order_item["field"]
+                    ).desc() 
+                    if order_item["direction"] == "desc" 
+                    else 
+                    getattr(
+                        model, 
+                        order_item["field"]
+                    ).asc()
+                )
 
         # 페이지네이션 적용
         query = query.limit(limit).offset(skip)

aiteamutils/validators.py

@@ -193,14 +193,13 @@ class Validator:
     @staticmethod
     def validate_date(value: Any, field_name: str = "date") -> Optional[date]:
         """날짜 형식 검증을 수행하는 메서드."""
-        if value is None:
+        # 빈 값 처리를 가장 먼저
+        if not value or str(value).strip() == "":
             return None
         if isinstance(value, date):
             return value
         if isinstance(value, datetime):
             return value.date()
-        if value == "" or not value:
-            return None
         try:
             return datetime.strptime(str(value), '%Y-%m-%d').date()
         except Exception as e:
@@ -214,14 +213,13 @@ class Validator:
     @staticmethod
     def validate_datetime(value: Any, field_name: str = "datetime") -> Optional[datetime]:
         """날짜+시간 형식 검증을 수행하는 메서드."""
-        if value is None:
+        # 빈 값 처리를 가장 먼저
+        if not value or str(value).strip() == "":
             return None
         if isinstance(value, datetime):
             return value
         if isinstance(value, date):
             return datetime.combine(value, datetime.min.time())
-        if value == "" or not value:
-            return None
         try:
             # ISO 형식 (YYYY-MM-DDTHH:MM:SS) 먼저 시도
             try:
@@ -237,54 +235,63 @@ class Validator:
                 original_error=str(e)
             )
 
-def date_validator(*field_names: str):
-    """날짜 필드 유효성 검사 데코레이터
+def _create_validator(field_names: tuple[str, ...], 
+                     validate_func: Callable,
+                     field_type: Type,
+                     error_code: ErrorCode,
+                     source_prefix: str):
+    """공통 validator 생성 함수
     Args:
         field_names: 검증할 필드명들
+        validate_func: 실제 검증을 수행할 함수
+        field_type: 필드 타입 (date 또는 datetime)
+        error_code: 에러 발생시 사용할 에러 코드
+        source_prefix: 에러 발생시 사용할 source_function 접두사
     """
     def decorator(cls):
         for field_name in field_names:
+            field = cls.model_fields.get(field_name)
+            if field:
+                field.annotation = Optional[field_type]
+                field.default = None
+                
             @field_validator(field_name, mode='before')
             @classmethod
             def validate(cls, value: Any, info: Any) -> Any:
+                # 빈 값 처리를 가장 먼저, 더 엄격하게
+                if not value or str(value).strip() == "":
+                    return None
                 try:
-                    if value == "" or value is None:
-                        return None
-                    return Validator.validate_date(value, field_name)
+                    return validate_func(value, field_name)
                 except CustomException as e:
                     raise e
                 except Exception as e:
                     raise CustomException(
-                        error_code=ErrorCode.INVALID_DATE_FORMAT,
+                        error_code=error_code,
                         detail=f"{field_name}|{value}",
-                        source_function=f"date_validator.{field_name}",
+                        source_function=f"{source_prefix}.{field_name}",
                         original_error=str(e)
                     )
             setattr(cls, f'validate_{field_name}', validate)
         return cls
     return decorator
 
+def date_validator(*field_names: str):
+    """날짜 필드 유효성 검사 데코레이터"""
+    return _create_validator(
+        field_names=field_names,
+        validate_func=Validator.validate_date,
+        field_type=date,
+        error_code=ErrorCode.INVALID_DATE_FORMAT,
+        source_prefix="date_validator"
+    )
+
 def datetime_validator(*field_names: str):
-    """날짜+시간 필드 유효성 검사 데코레이터
-    Args:
-        field_names: 검증할 필드명들
-    """
-    def decorator(cls):
-        for field_name in field_names:
-            @field_validator(field_name, mode='before')
-            @classmethod
-            def validate(cls, value: Any, info: Any) -> Any:
-                try:
-                    return Validator.validate_datetime(value, field_name)
-                except CustomException as e:
-                    raise e
-                except Exception as e:
-                    raise CustomException(
-                        error_code=ErrorCode.INVALID_DATETIME_FORMAT,
-                        detail=f"{field_name}|{value}",
-                        source_function=f"datetime_validator.{field_name}",
-                        original_error=str(e)
-                    )
-            setattr(cls, f'validate_{field_name}', validate)
-        return cls
-    return decorator
+    """날짜+시간 필드 유효성 검사 데코레이터"""
+    return _create_validator(
+        field_names=field_names,
+        validate_func=Validator.validate_datetime,
+        field_type=datetime,
+        error_code=ErrorCode.INVALID_DATETIME_FORMAT,
+        source_prefix="datetime_validator"
+    )

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.113"
+__version__ = "0.2.115"

{aiteamutils-0.2.113.dist-info → aiteamutils-0.2.115.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiteamutils
-Version: 0.2.113
+Version: 0.2.115
 Summary: AI Team Utilities
 Project-URL: Homepage, https://github.com/yourusername/aiteamutils
 Project-URL: Issues, https://github.com/yourusername/aiteamutils/issues

{aiteamutils-0.2.113.dist-info → aiteamutils-0.2.115.dist-info}/RECORD

@@ -4,12 +4,12 @@ aiteamutils/base_repository.py,sha256=vzBw3g3jCJetTDblZvZenEGXk89Qu_65_02C7QTcf8
 aiteamutils/base_service.py,sha256=nHikjwGp29QrQPr2W8Ye9sKxmVS_8prRG3Nu42TU1Ms,10670
 aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
 aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
-aiteamutils/database.py,sha256=SmE6JiyQoqCNlrV4AVxrp1tsrNryyZSQWJM0dHN4MQA,19696
+aiteamutils/database.py,sha256=2D4YX8sfxZCvhKoqKSNbxyIZTb9Wc2-jsNBpLA7T7s0,19939
 aiteamutils/enums.py,sha256=7WLqlcJqQWtETAga2WAxNp3dJTQIAd2TW-4WzkoHHa8,2498
 aiteamutils/exceptions.py,sha256=pgf3ersezObyl17wAO3I2fb8m9t2OzWDX1mSjwAWm2Y,16035
 aiteamutils/security.py,sha256=McUl3t5Z5SyUDVUHymHdDkYyF4YSeg4g9fFMML4W6Kw,11630
-aiteamutils/validators.py,sha256=FYDgL7Vb6jdqncqtTUa-8bN42VTNImP6bqcYFjcrvJs,11624
-aiteamutils/version.py,sha256=LN7TnPE-1ym25kZeV1ozyOzkgWvMbthv7Niyw4ZUQ8U,43
-aiteamutils-0.2.113.dist-info/METADATA,sha256=m8OpUio7xQajektSPKKpAw6sSQ86AVdmHPSxH62K3HY,1719
-aiteamutils-0.2.113.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.113.dist-info/RECORD,,
+aiteamutils/validators.py,sha256=9JY-92sSj6Bm_AcmZFqPc6hgxS57RzPpLXO1PPkDk3M,11968
+aiteamutils/version.py,sha256=yOY-U_JbPxKh_qtXMmCE0w-8SQ5lpFBwa4dzb9rXxBY,43
+aiteamutils-0.2.115.dist-info/METADATA,sha256=NYVmi0mcYhlaEjDGidOl_pF8dXq5wkHEA8jWEr1q61c,1719
+aiteamutils-0.2.115.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.115.dist-info/RECORD,,