cuenca-validations 2.1.14.dev4__py3-none-any.whl → 2.1.14.dev5__py3-none-any.whl

cuenca_validations/types/helpers.py

@@ -1,10 +1,13 @@
+import datetime as dt
 import uuid
 from base64 import urlsafe_b64encode
-from typing import Callable, Optional
+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]:
@@ -20,3 +23,22 @@ def get_log_config(field: FieldInfo) -> Optional[LogConfig]:
         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/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/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/version.py

@@ -1 +1 @@
-__version__ = '2.1.14.dev4'
+__version__ = '2.1.14.dev5'

{cuenca_validations-2.1.14.dev4.dist-info → cuenca_validations-2.1.14.dev5.dist-info}/METADATA

@@ -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.dist-info → cuenca_validations-2.1.14.dev5.dist-info}/RECORD

@@ -3,27 +3,27 @@ cuenca_validations/card_bins.py,sha256=9OpK0mCrG7DlmRI8UoyXj962uFkP9J6eCbYeF-C1S
 cuenca_validations/errors.py,sha256=OtM8EgiKqYdz9Hn66AbBO96orL1or7efkyt0vh0Zxbs,1873
 cuenca_validations/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cuenca_validations/typing.py,sha256=1QCu81IbVZZpyInjyeAuO-nF36gpT5Gi4o6V9PozuOU,204
-cuenca_validations/validators.py,sha256=wzwLnJ4wHggZvqp3mearbFkzvDERGeTNvJkuofQnuMc,1484
-cuenca_validations/version.py,sha256=_76tfT7c3a3V-c4iI9jqt2Jk13KLPL0_aJFlTrJV1E8,28
+cuenca_validations/validators.py,sha256=mYJDXxJVokl5jZIA4FYn8wkaMUnOxAH54t1Pfg_0kmQ,1190
+cuenca_validations/version.py,sha256=_Zbqb594Hnr6hA3Q3GKN9hcYfmwlfYTMaIopzvMLZJ8,28
 cuenca_validations/types/__init__.py,sha256=fPmHzU6mY6l3qK2R8cOhjcrICTOnoHS6VQteX663FRE,4843
 cuenca_validations/types/card.py,sha256=UGzz8NTFAverUmdUKAK1oGHnOnjSNTpIRUm93vKSSGY,1295
 cuenca_validations/types/enums.py,sha256=533fUCip5CXMD7m4Ww8VAcB5Yr4A0EmT5GBRt2mF4b0,19510
 cuenca_validations/types/files.py,sha256=2CszbwF9ytXV9suFFwyDjYG4XxY8UhCjRw3HttVXXNw,269
 cuenca_validations/types/general.py,sha256=vJmQBD_Iv_hsxD8x3_Bip-NlYAiE2rmXSPQKj4kTtto,2621
-cuenca_validations/types/helpers.py,sha256=6rHUhwoQ7jJZtGcW3LX-W5ZDl42PWE1RoBpGme7KCkk,610
+cuenca_validations/types/helpers.py,sha256=XPiYVTLDtmBB5R1heWUy1c35zZMh7nh-BmS6rtwEltg,1379
 cuenca_validations/types/identities.py,sha256=1wkutHzL9Gpd9oAZdyiikNxWKe5iBVAQT3TabR6YG1o,5451
 cuenca_validations/types/morals.py,sha256=davabh5hAnFVQyM7-yCyDaT5ewXnm0cr1BtqDIwzkX8,1833
 cuenca_validations/types/queries.py,sha256=3KWQfIawcXpyfD2SxBlUJpJVkc3CXL5rNMpHU-9GZXY,4992
-cuenca_validations/types/requests.py,sha256=XYK4aczPm_TH7gMB2GdqKEDFftLMuiAohw1pC1NwidI,21691
-cuenca_validations-2.1.14.dev4.dist-info/licenses/LICENSE,sha256=wR76FmxBbfnQpwELkkE5iMF8sFIafEMgXLTE4N4WPTc,1063
+cuenca_validations/types/requests.py,sha256=2c9txv5i-yfvUccPPJbGoGs96RlOJIYnsMWmnx7mZQI,20949
+cuenca_validations-2.1.14.dev5.dist-info/licenses/LICENSE,sha256=wR76FmxBbfnQpwELkkE5iMF8sFIafEMgXLTE4N4WPTc,1063
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_card.py,sha256=QAfRz7e11gWICPnFJZ2tiYgUsFV3C9TwzJXrDnDNXFw,1202
 tests/test_errors.py,sha256=ixiIgEuBuzfsL5p4uCFdF32XqFRtTPF6EVhGJ0keOrI,930
 tests/test_helpers.py,sha256=ubzpi1UXCryLQdgsT_Zm2IX-XE_4L0dnHnhLwH06xK8,748
 tests/test_requests.py,sha256=HGKybPNlN-Vbf2Ew34csfMR5UzZdVPoX9J8eeD4yCiI,1095
 tests/test_statement.py,sha256=IOE0rRRBgBZSJv_FLaETEyn5NzzXKMNTqgjv99GX-68,1436
-tests/test_types.py,sha256=__nBVJiYki2LMVtsHS5uQ3ATxUlCUlapqCYvFVFCUdM,19086
-cuenca_validations-2.1.14.dev4.dist-info/METADATA,sha256=NJy7KiUUBhqws5hGz4IuNc84UbvK4mV1JJLfOxB4mVo,1600
-cuenca_validations-2.1.14.dev4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cuenca_validations-2.1.14.dev4.dist-info/top_level.txt,sha256=4233xdOs2HtuT-GFRjcDcwK0IwdwvWdczOtk0fPB6Gw,25
-cuenca_validations-2.1.14.dev4.dist-info/RECORD,,
+tests/test_types.py,sha256=g7dsNxIxFT1hzBWx92JQbtMoTWBg1EQdCEwEGEFqGFk,19030
+cuenca_validations-2.1.14.dev5.dist-info/METADATA,sha256=gnwdx9XP99rPX09ukIplwO5R5-zK2WT-2Ps1KGMPxaI,1600
+cuenca_validations-2.1.14.dev5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cuenca_validations-2.1.14.dev5.dist-info/top_level.txt,sha256=4233xdOs2HtuT-GFRjcDcwK0IwdwvWdczOtk0fPB6Gw,25
+cuenca_validations-2.1.14.dev5.dist-info/RECORD,,

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)