cuenca-validations 2.1.27__tar.gz → 2.1.29__tar.gz

{cuenca_validations-2.1.27 → cuenca_validations-2.1.29}/PKG-INFO

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

{cuenca_validations-2.1.27 → cuenca_validations-2.1.29}/cuenca_validations/types/general.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass
 from typing import Annotated, Any, Optional
 
 from pydantic import (
+    AfterValidator,
     AnyUrl,
     Field,
     HttpUrl,
@@ -11,7 +12,7 @@ from pydantic import (
     StringConstraints,
 )
 
-from ..validators import sanitize_dict, sanitize_item
+from ..validators import normalize_name, sanitize_dict, sanitize_item
 from .enums import (
     AccountUseType,
     IncomeType,
@@ -33,6 +34,12 @@ NonEmptyStr = Annotated[
     str, StringConstraints(strip_whitespace=True, min_length=1)
 ]
 
+NormalizedName = Annotated[
+    str,
+    StringConstraints(strip_whitespace=True, min_length=2),
+    AfterValidator(normalize_name),
+]
+
 
 class SantizedDict(dict):
     def __init__(self, *args, **kwargs):

{cuenca_validations-2.1.27 → cuenca_validations-2.1.29}/cuenca_validations/types/queries.py

@@ -1,6 +1,7 @@
 import datetime as dt
 from typing import Annotated, Optional
 
+from clabe import Clabe
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -26,6 +27,7 @@ from .enums import (
     TransferNetwork,
     UserStatus,
 )
+from .general import NormalizedName
 from .identities import Curp
 
 MAX_PAGE_SIZE = 100
@@ -157,6 +159,9 @@ class UserQuery(QueryParams):
     status: Optional[UserStatus] = None
     identity_uri: Optional[str] = None
     has_curp_document: Optional[bool] = None
+    clabe: Optional[Clabe] = None
+    curp: Optional[Curp] = None
+    name: Optional[NormalizedName] = None
 
 
 class IdentityQuery(QueryParams):

{cuenca_validations-2.1.27 → cuenca_validations-2.1.29}/cuenca_validations/types/requests.py

@@ -56,6 +56,7 @@ from ..types.enums import (
     WebhookObject,
 )
 from ..typing import DictStrAny
+from ..validators import normalize_email, normalize_phone_number
 from .card import (
     Cvv,
     ExpMonth,
@@ -543,6 +544,16 @@ class UserUpdateRequest(BaseRequest):
             raise ValueError('At least one parameter must be provided')
         return values
 
+    @field_validator('email_address', mode='before')
+    @classmethod
+    def validate_email_address(cls, v: Optional[str]) -> Optional[str]:
+        return normalize_email(v) if v else v
+
+    @field_validator('phone_number', mode='before')
+    @classmethod
+    def validate_phone_number(cls, v: Optional[str]) -> Optional[str]:
+        return normalize_phone_number(v) if v else v
+
     @field_validator('beneficiaries')
     @classmethod
     def beneficiary_percentage(
@@ -641,13 +652,16 @@ class VerificationRequest(BaseRequest):
         },
     )
 
-    @field_validator('recipient')
-    def validate_sender(cls, recipient: str, values):
-        return (
-            EmailStr(recipient)
-            if type == VerificationType.email
-            else PhoneNumber(recipient)
-        )
+    @model_validator(mode='before')
+    @classmethod
+    def normalize_recipient(cls, data):
+        _type = data.get('type')
+        recipient = data.get('recipient')
+        if _type == VerificationType.email:
+            data['recipient'] = normalize_email(recipient)
+        else:
+            data['recipient'] = normalize_phone_number(recipient)
+        return data
 
 
 class VerificationAttemptRequest(BaseRequest):

cuenca_validations-2.1.29/cuenca_validations/validators.py

@@ -0,0 +1,86 @@
+import base64
+import datetime as dt
+import re
+import unicodedata
+from enum import Enum
+from typing import Any, Callable, Optional, Union
+
+SANITIZE_PHONE_NUMBER = re.compile(r'[+.()\-\s]')
+STRIP_MX_MOBILE_PREFIX = re.compile(r'(52)(?:(?:044)|1)?(\d{10})$')
+STRIP_US_DUPLICATE_PREFIX = re.compile(r'^11(\d{10})$')
+
+
+def normalize_email(email: str) -> str:
+    """Lowercase email and strip plus labels from the local part.
+
+    mateohhr@Yahoo.com          -> mateohhr@yahoo.com
+    guerradzul+cuenca@gmail.com -> guerradzul@gmail.com
+    """
+    local, _, domain = email.partition('@')
+    return f'{local.split("+")[0]}@{domain}'.lower()
+
+
+def normalize_phone_number(phone_number: str) -> str:
+    """Sanitize and normalize phone numbers to E.164 format.
+
+    Handles:
+    - Special characters: +52 (55) 1234-5678 -> +525512345678
+    - MX mobile prefix:   +5215512345678     -> +525512345678
+    - MX 044 prefix:      +520445512345678   -> +525512345678
+    - US duplicate prefix: +116504401222     -> +16504401222
+    """
+    pn = SANITIZE_PHONE_NUMBER.sub('', phone_number)
+    pn = STRIP_MX_MOBILE_PREFIX.sub(r'\1\2', pn)
+    pn = STRIP_US_DUPLICATE_PREFIX.sub(r'1\1', pn)
+    return f'+{pn}'
+
+
+def normalize_name(name: str) -> str:
+    """Normalize names for search/index matching.
+
+    Strips accents, lowercases, and collapses internal whitespace.
+
+    Raúl  Andrés   -> raul andres
+    MARÍA JOSÉ     -> maria jose
+    """
+    collapsed = ' '.join(name.split())
+    nfkd = unicodedata.normalize('NFKD', collapsed)
+    return ''.join(c for c in nfkd if not unicodedata.combining(c)).lower()
+
+
+def sanitize_dict(d: dict) -> dict:
+    for k, v in d.items():
+        d[k] = sanitize_item(v)
+    return d
+
+
+def sanitize_item(
+    item: Any, default: Optional[Callable[..., Any]] = None
+) -> Any:
+    """
+    :param item: item to be sanitized
+    :param default: Optional function to be used when there is no case
+    for this type of item, default `None` it returns the item as is.
+    """
+    rv: Union[str, list[Any]]
+    if isinstance(item, dt.date):
+        if isinstance(item, dt.datetime) and not item.tzinfo:
+            rv = item.astimezone(dt.timezone.utc).isoformat()
+        else:
+            rv = item.isoformat()
+    elif isinstance(item, list):
+        rv = [
+            sanitize_dict(e) if isinstance(e, dict) else sanitize_item(e)
+            for e in item
+        ]
+    elif isinstance(item, bytes):
+        rv = base64.b64encode(item).decode('utf-8')
+    elif isinstance(item, Enum):
+        rv = item.value
+    elif hasattr(item, 'to_dict'):
+        rv = item.to_dict()
+    elif default:
+        rv = default(item)
+    else:
+        rv = item
+    return rv

cuenca_validations-2.1.29/cuenca_validations/version.py

@@ -0,0 +1 @@
+__version__ = '2.1.29'

{cuenca_validations-2.1.27 → cuenca_validations-2.1.29}/cuenca_validations.egg-info/PKG-INFO

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

{cuenca_validations-2.1.27 → cuenca_validations-2.1.29}/cuenca_validations.egg-info/SOURCES.txt

@@ -30,4 +30,5 @@ tests/test_errors.py
 tests/test_helpers.py
 tests/test_requests.py
 tests/test_statement.py
-tests/test_types.py
+tests/test_types.py
+tests/test_validators.py

{cuenca_validations-2.1.27 → cuenca_validations-2.1.29}/tests/test_requests.py

@@ -1,9 +1,12 @@
 import pytest
 from pydantic import ValidationError
+from pydantic_extra_types.phone_numbers import PhoneNumber
 
+from cuenca_validations.types.enums import VerificationType
 from cuenca_validations.types.requests import (
     UserTOSAgreementRequest,
     UserUpdateRequest,
+    VerificationRequest,
 )
 from cuenca_validations.typing import DictStrAny
 
@@ -53,3 +56,29 @@ def test_update_user_update_govt() -> None:
     with pytest.raises(ValueError) as ex:
         UserUpdateRequest(**govt_id)
     assert 'uri_back must be provided for type ine' in str(ex.value)
+
+
+def test_verification_request_normalizes_email() -> None:
+    req = VerificationRequest(
+        recipient='user+cuenca@Gmail.com',
+        type=VerificationType.email,
+    )
+    assert req.recipient == 'user@gmail.com'
+
+
+def test_verification_request_normalizes_phone() -> None:
+    req = VerificationRequest(
+        recipient='+116504401222',
+        type=VerificationType.phone,
+    )
+    assert req.recipient == '+16504401222'
+
+
+def test_user_update_request_normalizes_email() -> None:
+    req = UserUpdateRequest(email_address='user+tag@Gmail.com')
+    assert req.email_address == 'user@gmail.com'
+
+
+def test_user_update_request_normalizes_phone() -> None:
+    req = UserUpdateRequest(phone_number=PhoneNumber('+116504401222'))
+    assert req.phone_number == '+16504401222'

{cuenca_validations-2.1.27 → cuenca_validations-2.1.29}/tests/test_types.py

@@ -5,6 +5,7 @@ from enum import Enum
 from typing import Annotated
 
 import pytest
+from clabe import Clabe
 from freezegun import freeze_time
 from pydantic import AfterValidator, BaseModel, SecretStr, ValidationError
 from pydantic.fields import FieldInfo
@@ -16,6 +17,7 @@ from cuenca_validations.types import (
     SantizedDict,
     SessionRequest,
     TransactionStatus,
+    UserQuery,
     digits,
     get_account_use_type_name,
     get_income_type_name,
@@ -201,6 +203,50 @@ def test_card_query_exp_cvv_if_number_not_set(input_value):
         CardQuery(**input_value)
 
 
+def test_user_query_accepts_new_fields():
+    query = UserQuery(
+        clabe='646180157098510917',
+        curp='ABCD920604HDFSRN03',
+        name='Pedro Páramo',
+    )
+    assert isinstance(query.clabe, Clabe)
+    assert query.clabe == '646180157098510917'
+    assert query.curp == 'ABCD920604HDFSRN03'
+    assert query.name == 'pedro paramo'
+
+
+@pytest.mark.parametrize(
+    'raw, normalized',
+    [
+        ('ab', 'ab'),
+        ('  ab  ', 'ab'),
+        ('Raúl Andrés', 'raul andres'),
+        ('raul Andres', 'raul andres'),
+        ('  RAÚL   ANDRÉS  ', 'raul andres'),
+        ('María José', 'maria jose'),
+        ('ÑANDÚ', 'nandu'),
+    ],
+)
+def test_user_query_name_normalizes(raw, normalized):
+    assert UserQuery(name=raw).name == normalized
+
+
+@pytest.mark.parametrize(
+    'field, value',
+    [
+        ('clabe', 'not-a-clabe'),
+        ('curp', 'not-a-curp'),
+        ('name', ''),
+        ('name', ' '),
+        ('name', 'a'),
+        ('name', ' a '),
+    ],
+)
+def test_user_query_rejects_invalid(field, value):
+    with pytest.raises(ValidationError):
+        UserQuery(**{field: value})
+
+
 def test_exclude_none_in_dict():
     request = ApiKeyUpdateRequest(user_id='US123')
     assert request.model_dump() == dict(user_id='US123')

cuenca_validations-2.1.29/tests/test_validators.py

@@ -0,0 +1,52 @@
+import pytest
+
+from cuenca_validations.validators import (
+    normalize_email,
+    normalize_name,
+    normalize_phone_number,
+)
+
+
+@pytest.mark.parametrize(
+    'raw, normalized',
+    [
+        ('user@Yahoo.com', 'user@yahoo.com'),  # uppercase domain
+        ('user@iCloud.com', 'user@icloud.com'),  # uppercase domain
+        ('user@Gmail.com', 'user@gmail.com'),  # uppercase domain
+        ('user+cuenca@gmail.com', 'user@gmail.com'),  # plus label
+        ('user@gmail.com', 'user@gmail.com'),  # already normalized
+    ],
+)
+def test_normalize_email(raw: str, normalized: str) -> None:
+    assert normalize_email(raw) == normalized
+
+
+@pytest.mark.parametrize(
+    'raw, normalized',
+    [
+        ('+116503456789', '+16503456789'),  # US duplicate country code
+        ('+5215512345678', '+525512345678'),  # MX mobile prefix
+        ('+520445512345678', '+525512345678'),  # MX 044 prefix
+        ('+52 (55) 1234-5678', '+525512345678'),  # special characters
+        ('+525512345678', '+525512345678'),  # already correct MX
+        ('+16503456789', '+16503456789'),  # already correct US
+    ],
+)
+def test_normalize_phone_number(raw: str, normalized: str) -> None:
+    assert normalize_phone_number(raw) == normalized
+
+
+@pytest.mark.parametrize(
+    'raw, normalized',
+    [
+        ('Raúl Andrés', 'raul andres'),  # accents + mixed case
+        ('raul andres', 'raul andres'),  # already normalized
+        ('RAÚL ANDRÉS', 'raul andres'),  # uppercase with accents
+        ('ÑANDÚ', 'nandu'),  # ñ and accent
+        ('María  José', 'maria jose'),  # collapse internal whitespace
+        ('  Raúl  ', 'raul'),  # trim + lowercase
+        ('Nuño Garçía', 'nuno garcia'),  # tilde and cedilla
+    ],
+)
+def test_normalize_name(raw: str, normalized: str) -> None:
+    assert normalize_name(raw) == normalized

cuenca_validations-2.1.27/cuenca_validations/validators.py

@@ -1,42 +0,0 @@
-import base64
-import datetime as dt
-from enum import Enum
-from typing import Any, Callable, Optional, Union
-
-
-def sanitize_dict(d: dict) -> dict:
-    for k, v in d.items():
-        d[k] = sanitize_item(v)
-    return d
-
-
-def sanitize_item(
-    item: Any, default: Optional[Callable[..., Any]] = None
-) -> Any:
-    """
-    :param item: item to be sanitized
-    :param default: Optional function to be used when there is no case
-    for this type of item, default `None` it returns the item as is.
-    """
-    rv: Union[str, list[Any]]
-    if isinstance(item, dt.date):
-        if isinstance(item, dt.datetime) and not item.tzinfo:
-            rv = item.astimezone(dt.timezone.utc).isoformat()
-        else:
-            rv = item.isoformat()
-    elif isinstance(item, list):
-        rv = [
-            sanitize_dict(e) if isinstance(e, dict) else sanitize_item(e)
-            for e in item
-        ]
-    elif isinstance(item, bytes):
-        rv = base64.b64encode(item).decode('utf-8')
-    elif isinstance(item, Enum):
-        rv = item.value
-    elif hasattr(item, 'to_dict'):
-        rv = item.to_dict()
-    elif default:
-        rv = default(item)
-    else:
-        rv = item
-    return rv

cuenca_validations-2.1.27/cuenca_validations/version.py

@@ -1 +0,0 @@
-__version__ = '2.1.27'