exclude_none=True (#98)

cuenca_validations/types/requests.py

@@ -9,7 +9,17 @@
 from .general import StrictPositiveInt
 
 
-class TransferRequest(BaseModel):
+class BaseRequest(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    def dict(self, *args, **kwargs) -> DictStrAny:
+        kwargs.setdefault('exclude_none', True)
+        kwargs.setdefault('exclude_unset', True)
+        return super().dict(*args, **kwargs)
+
+
+class TransferRequest(BaseRequest):
     recipient_name: StrictStr
     account_number: Union[Clabe, PaymentCardNumber]
     amount: StrictPositiveInt  # in centavos
@@ -21,20 +31,17 @@ class StrictTransferRequest(TransferRequest):
     account_number: Union[Clabe, StrictPaymentCardNumber]
 
 
-class CardUpdateRequest(BaseModel):
+class CardUpdateRequest(BaseRequest):
     user_id: Optional[str]
     ledger_account_id: Optional[str]
     status: Optional[CardStatus]
 
-    class Config:
-        extra = Extra.forbid
-
 
-class CardRequest(BaseModel):
+class CardRequest(BaseRequest):
     user_id: str
     ledger_account_id: str
 
 
-class ApiKeyUpdateRequest(BaseModel):
+class ApiKeyUpdateRequest(BaseRequest):
     user_id: Optional[str]
     metadata: Optional[DictStrAny]

cuenca_validations/version.py

@@ -1 +1 @@
-__version__ = '0.7.4'
+__version__ = '0.7.5'

tests/test_types.py

@@ -14,6 +14,7 @@
     TransactionStatus,
     digits,
 )
+from cuenca_validations.types.requests import CardUpdateRequest
 
 today = dt.date.today()
 now = dt.datetime.now()
@@ -148,3 +149,8 @@ def test_card_query_exp_cvv_if_number_set():
 def test_card_query_exp_cvv_if_number_not_set(input_value):
     with pytest.raises(ValueError):
         CardQuery(**input_value)
+
+
+def test_exclude_none_in_dict():
+    request = CardUpdateRequest(user_id='US123')
+    assert request.dict() == dict(user_id='US123')