cuenca-validations 2.1.6.dev2__py3-none-any.whl → 2.1.7.dev1__py3-none-any.whl

cuenca_validations/types/identities.py

@@ -12,7 +12,7 @@ from pydantic import (
 from pydantic_extra_types.phone_numbers import PhoneNumber
 
 from .enums import Country, KYCFileType, State, VerificationStatus
-from .general import SerializableIPvAnyAddress
+from .general import NonEmptyStr, SerializableIPvAnyAddress
 
 Password = Annotated[
     SecretStr,
@@ -45,15 +45,15 @@ Rfc = Annotated[
 
 
 class Address(BaseModel):
-    street: Optional[str] = None
-    ext_number: Optional[str] = None
-    int_number: Optional[str] = None
-    colonia: Optional[str] = None
-    postal_code: Optional[str] = None
+    street: NonEmptyStr
+    ext_number: NonEmptyStr
+    int_number: Optional[NonEmptyStr] = None
+    colonia: NonEmptyStr
+    postal_code: NonEmptyStr
     state: Optional[State] = None
-    country: Optional[Country] = None
-    city: Optional[str] = None
-    full_name: Optional[str] = None
+    country: Country
+    city: NonEmptyStr
+
     model_config = ConfigDict(
         json_schema_extra={
             "example": {
@@ -69,24 +69,13 @@ class Address(BaseModel):
         }
     )
 
-    @model_validator(mode='before')
-    @classmethod
-    def full_name_complete(cls, values: dict[str, Any]) -> dict[str, Any]:
-        if values.get('full_name'):
-            return values
-        if not values.get('street'):
-            raise ValueError('required street')
-        if not values.get('ext_number'):
-            raise ValueError('required ext_number')
-        return values
-
 
 class Beneficiary(BaseModel):
     name: str
     birth_date: dt.date
     phone_number: PhoneNumber
     user_relationship: str
-    percentage: int
+    percentage: Annotated[int, Field(ge=1, le=100)]
     model_config = ConfigDict(
         json_schema_extra={
             "example": {

cuenca_validations/types/requests.py

@@ -410,43 +410,39 @@ class UserTOSAgreementRequest(BaseModel):
 
 
 class UserRequest(BaseModel):
-    id: Optional[str] = Field(
-        None, description='if you want to create with specific `id`'
-    )
     curp: Curp = Field(
         description='Previously validated in `curp_validations`'
     )
-    phone_number: Optional[PhoneNumber] = Field(
-        None, description='Only if you validated previously on your side'
-    )
-    email_address: Optional[EmailStr] = Field(
-        None, description='Only if you validated previously on your side'
-    )
-    profession: Optional[str] = None
-    address: Optional[Address] = None
-    status: Optional[UserStatus] = Field(
-        None,
-        description='Status that the user will have when created. '
-        'Defined by platform',
-    )
-    required_level: Optional[int] = Field(
-        None,
-        ge=1,
-        le=3,
-        description='Maximum level a User can reach. Defined by platform',
-    )
-    phone_verification_id: Optional[str] = Field(
-        None,
+    # curp_verification_id: str = Field(
+    #     ...,
+    #     description='Previously validated in `curp_validations`',
+    # )
+
+    profession: str = None
+    address: Address = None
+    # status: Optional[UserStatus] = Field(
+    #     None,
+    #     description='Status that the user will have when created. '
+    #     'Defined by platform',
+    # )
+    # required_level: Optional[int] = Field(
+    #     None,
+    #     ge=1,
+    #     le=3,
+    #     description='Maximum level a User can reach. Defined by platform',
+    # )
+    phone_verification_id: str = Field(
+        ...,
         description='Only if you validated it previously with the '
         'resource `verifications`',
     )
-    email_verification_id: Optional[str] = Field(
-        None,
+    email_verification_id: str = Field(
+        ...,
         description='Only if you validated it previously with the '
         'resource `verifications`',
     )
-    terms_of_service: Optional[TOSRequest] = None
-    signature: Optional[KYCFile] = None
+    # terms_of_service: Optional[TOSRequest] = None
+    # signature: Optional[KYCFile] = None
     model_config = ConfigDict(
         json_schema_extra={
             'example': {
@@ -454,7 +450,7 @@ class UserRequest(BaseModel):
                 'phone_number': '+525511223344',
                 'email_address': 'user@example.com',
                 'profession': 'engineer',
-                'address': Address.schema().get('example'),
+                'address': Address.model_json_schema().get('example'),
             }
         },
     )

cuenca_validations/version.py

@@ -1 +1 @@
-__version__ = '2.1.6.dev2'
+__version__ = '2.1.7.dev1'

{cuenca_validations-2.1.6.dev2.dist-info → cuenca_validations-2.1.7.dev1.dist-info}/METADATA

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

{cuenca_validations-2.1.6.dev2.dist-info → cuenca_validations-2.1.7.dev1.dist-info}/RECORD

@@ -4,25 +4,25 @@ cuenca_validations/errors.py,sha256=OtM8EgiKqYdz9Hn66AbBO96orL1or7efkyt0vh0Zxbs,
 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=L9jkQV4Xs3OYEoL7u0FxZDhvifZlPogwPYrv8N16pyY,27
+cuenca_validations/version.py,sha256=fdoXTiCTZFruqERsWy__6-loxEsKJco-CGxvzEmN6Vc,27
 cuenca_validations/types/__init__.py,sha256=UNb7auBcD0qp-x9TX7TNNj8IKo7uaI7xHaf9PYmaziY,4765
 cuenca_validations/types/card.py,sha256=UGzz8NTFAverUmdUKAK1oGHnOnjSNTpIRUm93vKSSGY,1295
 cuenca_validations/types/enums.py,sha256=Vm9HGf83jPkEp8iZ-KGtKGWQGx5q-cIUuQj32y_QcvU,18997
 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/identities.py,sha256=-TWRDRpmIaCI4nE4hVy1FQtQtlxuErtmEtzJW1FBzec,4956
+cuenca_validations/types/identities.py,sha256=zt4oCDiXm8k4FN_WvyOlVEfv19NI7LD6qNcfA-XuDdw,4521
 cuenca_validations/types/morals.py,sha256=m8kAedevmwfSPTA9GYe03l7pkgipynwYgKfejyVtnuI,1813
 cuenca_validations/types/queries.py,sha256=KCRx0sPzWDtDDbZysmFGVgANgfqil17EITWaG7tGQ-A,4700
-cuenca_validations/types/requests.py,sha256=6aEoMe7e-FPJs3_ouECV_Y6ZtyyJVyXfTed8wHtx_xw,21338
-cuenca_validations-2.1.6.dev2.dist-info/licenses/LICENSE,sha256=wR76FmxBbfnQpwELkkE5iMF8sFIafEMgXLTE4N4WPTc,1063
+cuenca_validations/types/requests.py,sha256=NQwz9jL9DZcU4ucNjPYRDTx7aDFrJkgVv_PXtskO15E,21104
+cuenca_validations-2.1.7.dev1.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_statement.py,sha256=IOE0rRRBgBZSJv_FLaETEyn5NzzXKMNTqgjv99GX-68,1436
-tests/test_types.py,sha256=K_YNFz0Kac3k8fJNeXuYGkL1hjXDQu084jCX6xEMEE4,19348
-cuenca_validations-2.1.6.dev2.dist-info/METADATA,sha256=EJWfvWsPiRGTgR-Ln3gZss_fi2mlbiN19JhwUaP3n-I,1599
-cuenca_validations-2.1.6.dev2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-cuenca_validations-2.1.6.dev2.dist-info/top_level.txt,sha256=4233xdOs2HtuT-GFRjcDcwK0IwdwvWdczOtk0fPB6Gw,25
-cuenca_validations-2.1.6.dev2.dist-info/RECORD,,
+tests/test_types.py,sha256=ZHdo5q3yvgK887IZFwYcD9-U-YFxnnyjdc-jXkgW-rw,19018
+cuenca_validations-2.1.7.dev1.dist-info/METADATA,sha256=iKdNHS4AlsY8_7FEOGZDG4fDDVHWt18nAedAEkF4u8E,1599
+cuenca_validations-2.1.7.dev1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+cuenca_validations-2.1.7.dev1.dist-info/top_level.txt,sha256=4233xdOs2HtuT-GFRjcDcwK0IwdwvWdczOtk0fPB6Gw,25
+cuenca_validations-2.1.7.dev1.dist-info/RECORD,,

tests/test_types.py

@@ -303,60 +303,50 @@ def test_saving_update_request():
         SavingUpdateRequest(**data)
 
 
-def test_address_validation():
-    data = dict(
-        full_name='Varsovia 36, Col Cuahutemoc',
-    )
-    assert Address(**data)
-    with pytest.raises(ValueError) as v:
-        Address(**dict())
-    assert 'required street' in str(v)
-    data = dict(street='somestreet')
-    with pytest.raises(ValueError) as v:
-        Address(**data)
-    assert 'required ext_number' in str(v)
-    data = dict(
-        street='varsovia',
-        ext_number='36',
-        state=State.DF,
-        country=Country.MX,
-    )
-    assert Address(**data)
-
-
 @freeze_time('2022-01-01')
 def test_user_request():
     request = dict(
-        id=None,
         curp='ABCD920604HDFSRN03',
-        phone_number='+525555555555',
-        email_address='email@email.com',
         profession='worker',
-        status='active',
         address=dict(
             street='calle 1',
             ext_number='2',
             int_number='3',
             colonia='Juarez',
             postal_code='09900',
-            state=State.DF.value,
+            state=State.DF,
             country=Country.MX,
             city='Obrera',
-            full_name=None,
         ),
         phone_verification_id='VE12345678',
         email_verification_id='VE0987654321',
-        required_level=3,
-        terms_of_service=None,
-        signature=None,
     )
     assert UserRequest(**request).model_dump() == request
 
-    # changing curp so user is underage
-    request['curp'] = 'ABCD060604HDFSRN03'
+
+@freeze_time('2022-01-01')
+def test_user_request_underage():
+    request = dict(
+        curp='ABCD060604HDFSRN03',  # underage CURP
+        profession='worker',
+        address=dict(
+            street='calle 1',
+            ext_number='2',
+            int_number='3',
+            colonia='Juarez',
+            postal_code='09900',
+            state=State.DF,
+            country=Country.MX,
+            city='Obrera',
+        ),
+        phone_verification_id='VE12345678',
+        email_verification_id='VE0987654321',
+    )
+
     with pytest.raises(ValueError) as v:
         UserRequest(**request)
-        assert 'User does not meet age requirement.' in str(v)
+
+    assert 'User does not meet age requirement.' in str(v)
 
 
 @freeze_time('2022-01-01')