cuenca-validations 2.1.14.dev4__tar.gz → 2.1.14.dev5__tar.gz

{cuenca_validations-2.1.14.dev4 → cuenca_validations-2.1.14.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuenca_validations
-Version: 2.1.14.dev4
+Version: 2.1.14.dev5
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca

cuenca_validations-2.1.14.dev5/cuenca_validations/types/helpers.py

@@ -0,0 +1,44 @@
+import datetime as dt
+import uuid
+from base64 import urlsafe_b64encode
+from typing import Callable, Optional, Union
+
+from dateutil.relativedelta import relativedelta
+from pydantic.fields import FieldInfo
+
+from .general import LogConfig
+from .identities import Curp
+
+
+def uuid_field(prefix: str = '') -> Callable[[], str]:
+    def base64_uuid_func() -> str:
+        return prefix + urlsafe_b64encode(uuid.uuid4().bytes).decode()[:-2]
+
+    return base64_uuid_func
+
+
+def get_log_config(field: FieldInfo) -> Optional[LogConfig]:
+    """Helper function to find LogConfig in field metadata"""
+    try:
+        return next(m for m in field.metadata if isinstance(m, LogConfig))
+    except StopIteration:
+        return None
+
+
+def get_birth_date_from_curp(curp: Curp) -> dt.date:
+    curp_date = curp[4:10]  # YYMMDD
+    yy = int(curp_date[:2])
+    current_yy = dt.date.today().year % 100
+    century = '19' if yy > current_yy else '20'
+    birth_date = dt.datetime.strptime(century + curp_date, '%Y%m%d').date()
+    return birth_date
+
+
+def validate_age_requirement(birth_date: Union[dt.date, Curp]) -> dt.date:
+    if isinstance(birth_date, str):
+        birth_date = get_birth_date_from_curp(birth_date)
+
+    current_date = dt.date.today()
+    if relativedelta(current_date, birth_date).years < 18:
+        raise ValueError('User does not meet age requirement.')
+    return birth_date

{cuenca_validations-2.1.14.dev4 → cuenca_validations-2.1.14.dev5}/cuenca_validations/types/requests.py

@@ -50,7 +50,6 @@ from ..types.enums import (
     WebhookObject,
 )
 from ..typing import DictStrAny
-from ..validators import validate_age_requirement
 from .card import (
     Cvv,
     ExpMonth,
@@ -66,6 +65,7 @@ from .general import (
     SerializableIPvAnyAddress,
     StrictPositiveInt,
 )
+from .helpers import validate_age_requirement
 from .identities import (
     AddressRequest,
     Beneficiary,
@@ -329,14 +329,14 @@ class CurpValidationRequest(BaseModel):
     names: Optional[str] = None
     first_surname: Optional[str] = None
     second_surname: Optional[str] = Field(
-        None, description='Not necessary for foreigners'
+        default=None, description='Not necessary for foreigners'
     )
     date_of_birth: Optional[dt.date] = None
     state_of_birth: Optional[State] = Field(
-        None, description='In format ISO 3166 Alpha-2'
+        default=None, description='In format ISO 3166 Alpha-2'
     )
     country_of_birth: Optional[Country] = Field(
-        None, description='In format ISO 3166 Alpha-2'
+        default=None, description='In format ISO 3166 Alpha-2'
     )
     gender: Optional[Gender] = None
     manual_curp: Optional[Curp] = Field(
@@ -381,16 +381,7 @@ class CurpValidationRequest(BaseModel):
         cls, manual_curp: Optional[Curp]
     ) -> Optional[Curp]:
         if manual_curp:
-            current_date = dt.datetime.utcnow()
-            curp_date = manual_curp[4:10]
-            yy = int(curp_date[:2])
-            current_yy = current_date.year % 100
-            century = '19' if yy > current_yy else '20'
-            birth_date = dt.datetime.strptime(century + curp_date, '%Y%m%d')
-            try:
-                validate_age_requirement(birth_date)
-            except ValueError:
-                raise
+            validate_age_requirement(manual_curp)
         return manual_curp
 
     @model_validator(mode="before")
@@ -485,16 +476,7 @@ class UserRequest(BaseModel):
     @classmethod
     def validate_birth_date(cls, curp: Optional[Curp]) -> Optional[Curp]:
         if curp:
-            current_date = dt.datetime.utcnow()
-            curp_date = curp[4:10]
-            yy = int(curp_date[:2])
-            current_yy = current_date.year % 100
-            century = '19' if yy > current_yy else '20'
-            birth_date = dt.datetime.strptime(century + curp_date, '%Y%m%d')
-            try:
-                validate_age_requirement(birth_date)
-            except ValueError:
-                raise
+            validate_age_requirement(curp)
         return curp
 
 

{cuenca_validations-2.1.14.dev4 → cuenca_validations-2.1.14.dev5}/cuenca_validations/validators.py

@@ -3,8 +3,6 @@ import datetime as dt
 from enum import Enum
 from typing import Any, Callable, Optional, Union
 
-from dateutil.relativedelta import relativedelta
-
 
 def sanitize_dict(d: dict) -> dict:
     for k, v in d.items():
@@ -42,10 +40,3 @@ def sanitize_item(
     else:
         rv = item
     return rv
-
-
-def validate_age_requirement(birth_date: dt.date) -> dt.date:
-    current_date = dt.date.today()
-    if relativedelta(current_date, birth_date).years < 18:
-        raise ValueError('User does not meet age requirement.')
-    return birth_date

cuenca_validations-2.1.14.dev5/cuenca_validations/version.py

@@ -0,0 +1 @@
+__version__ = '2.1.14.dev5'

{cuenca_validations-2.1.14.dev4 → cuenca_validations-2.1.14.dev5}/cuenca_validations.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuenca_validations
-Version: 2.1.14.dev4
+Version: 2.1.14.dev5
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca

{cuenca_validations-2.1.14.dev4 → cuenca_validations-2.1.14.dev5}/tests/test_types.py

@@ -385,14 +385,9 @@ def test_curp_validation_request():
     assert 'state_of_birth required' in str(v)
 
 
-def test_curp_validation_request_underage():
-    request = dict(
-        manual_curp='ABCD240614HDFSRN03',  # underage CURP
-    )
-
+def test_curp_validation_request_underage() -> None:
     with pytest.raises(ValueError) as v:
-        CurpValidationRequest(**request)
-
+        CurpValidationRequest(manual_curp='ABCD240614HDFSRN03')
     assert 'User does not meet age requirement.' in str(v)
 
 

cuenca_validations-2.1.14.dev4/cuenca_validations/types/helpers.py

@@ -1,22 +0,0 @@
-import uuid
-from base64 import urlsafe_b64encode
-from typing import Callable, Optional
-
-from pydantic.fields import FieldInfo
-
-from .general import LogConfig
-
-
-def uuid_field(prefix: str = '') -> Callable[[], str]:
-    def base64_uuid_func() -> str:
-        return prefix + urlsafe_b64encode(uuid.uuid4().bytes).decode()[:-2]
-
-    return base64_uuid_func
-
-
-def get_log_config(field: FieldInfo) -> Optional[LogConfig]:
-    """Helper function to find LogConfig in field metadata"""
-    try:
-        return next(m for m in field.metadata if isinstance(m, LogConfig))
-    except StopIteration:
-        return None

cuenca_validations-2.1.14.dev4/cuenca_validations/version.py

@@ -1 +0,0 @@
-__version__ = '2.1.14.dev4'