cuenca-validations 2.1.6.dev2__tar.gz → 2.1.7.dev1__tar.gz

{cuenca_validations-2.1.6.dev2 → cuenca_validations-2.1.7.dev1}/PKG-INFO

@@ -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 → cuenca_validations-2.1.7.dev1}/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-2.1.6.dev2 → cuenca_validations-2.1.7.dev1}/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-2.1.7.dev1/cuenca_validations/version.py

@@ -0,0 +1 @@
+__version__ = '2.1.7.dev1'

{cuenca_validations-2.1.6.dev2 → cuenca_validations-2.1.7.dev1}/cuenca_validations.egg-info/PKG-INFO

@@ -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 → cuenca_validations-2.1.7.dev1}/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')

cuenca_validations-2.1.6.dev2/cuenca_validations/version.py

@@ -1 +0,0 @@
-__version__ = '2.1.6.dev2'