Fix download files (#308)

* Fix download files

* lint

* unify requests User

* constraint versions

* add cardholder

* version

* Update requirements.txt

Author: rogelioLpz

cuenca/resources/base.py

@@ -97,25 +97,25 @@ class Downloadable(Resource):
     @classmethod
     def download(
         cls,
-        instance,
-        file_format: FileFormat,
+        id: str,
+        file_format: FileFormat = FileFormat.any,
         *,
         session: Session = global_session,
     ) -> BytesIO:
         resp = session.request(
             'get',
-            f'/{cls._resource}/{instance.id}',
+            f'/{cls._resource}/{id}',
             headers=dict(Accept=file_format.value),
         )
         return BytesIO(resp)
 
     @property
     def pdf(self) -> bytes:
-        return self.download(self, file_format=FileFormat.pdf).read()
+        return self.download(self.id, file_format=FileFormat.pdf).read()
 
     @property
     def xml(self) -> bytes:
-        return self.download(self, file_format=FileFormat.xml).read()
+        return self.download(self.id, file_format=FileFormat.xml).read()
 
 
 class Uploadable(Resource):

cuenca/resources/cards.py

@@ -31,6 +31,7 @@ class Card(Retrievable, Queryable, Creatable, Updateable):
     issuer: CardIssuer
     funding_type: CardFundingType
     pin_attempts_failed: Optional[int] = None
+    card_holder_user_id: Optional[int] = None
 
     @property
     def last_4_digits(self):
@@ -54,21 +55,24 @@ def create(
         issuer: CardIssuer,
         funding_type: CardFundingType,
         user_id: str = 'me',
+        card_holder_user_id: Optional[str] = None,
         *,
         session: Session = global_session,
     ) -> 'Card':
         """
         Assigns user_id and ledger_account_id to a existing virtual card
 
-        :param user_id: associated user id
+        :param user_id: associated user id (Owner of card)
         :param funding_type: debit or credit
         :param issuer:
+        :param card_holder_user_id: Holder user of card, not is the owner
         :return: New assigned card
         """
         req = CardRequest(
             user_id=user_id,
             issuer=issuer,
             funding_type=funding_type,
+            card_holder_user_id=card_holder_user_id,
         )
         return cast('Card', cls._create(session=session, **req.dict()))
 

cuenca/resources/files.py

@@ -1,12 +1,7 @@
 from io import BytesIO
 from typing import ClassVar, Optional, cast
 
-from cuenca_validations.types import (
-    FileFormat,
-    FileQuery,
-    FileUploadRequest,
-    KYCFileType,
-)
+from cuenca_validations.types import FileQuery, FileUploadRequest, KYCFileType
 from pydantic import HttpUrl
 
 from ..http import Session, session as global_session
@@ -63,7 +58,7 @@ def file(self) -> bytes:
         Bytes of the decrypted file.
         Format of the file is found on `file_type` property.
         """
-        return self.download(self, file_format=FileFormat.any).read()
+        return self.download(self.id).read()
 
     @property
     def pdf(self) -> bytes:

cuenca/resources/users.py

@@ -4,10 +4,8 @@
 from clabe import Clabe
 from cuenca_validations.types import (
     Address,
-    AddressUpdateRequest,
     Beneficiary,
     KYCFile,
-    KYCFileUpdateRequest,
     PhoneNumber,
     TOSAgreement,
     TOSRequest,
@@ -132,11 +130,11 @@ def update(
         phone_number: Optional[PhoneNumber] = None,
         email_address: Optional[str] = None,
         profession: Optional[str] = None,
-        address: Optional[AddressUpdateRequest] = None,
+        address: Optional[Address] = None,
         beneficiaries: Optional[List[Beneficiary]] = None,
-        govt_id: Optional[KYCFileUpdateRequest] = None,
-        proof_of_address: Optional[KYCFileUpdateRequest] = None,
-        proof_of_life: Optional[KYCFileUpdateRequest] = None,
+        govt_id: Optional[KYCFile] = None,
+        proof_of_address: Optional[KYCFile] = None,
+        proof_of_life: Optional[KYCFile] = None,
         terms_of_service: Optional[TOSRequest] = None,
         verification_id: Optional[str] = None,
         status: Optional[UserStatus] = None,

cuenca/version.py

@@ -1,3 +1,3 @@
-__version__ = '0.14.1'
+__version__ = '0.14.2'
 CLIENT_VERSION = __version__
 API_VERSION = '2020-03-19'

requirements.txt

@@ -1,3 +1,3 @@
 requests==2.27.1
-cuenca-validations==0.10.28
+cuenca-validations==0.11.1
 dataclasses>=0.7;python_version<"3.7"

setup.py

@@ -25,7 +25,7 @@
     install_requires=[
         'requests>=2.24,<28',
         'dataclasses>=0.7;python_version<"3.7"',
-        'cuenca-validations>=0.10.18,<0.11.0',
+        'cuenca-validations>= 0.11.0,<0.12.0',
     ],
     classifiers=[
         'Programming Language :: Python :: 3',

tests/resources/cassettes/test_file_download_only_bytes.yaml

@@ -21,6 +21,13 @@ def test_file_download():
     assert isinstance(file.file, bytes)
 
 
+@pytest.mark.vcr
+def test_file_download_only_bytes():
+    # Only download Bytes
+    downloaded_file = File.download('EFXXX')
+    assert isinstance(downloaded_file.read(), bytes)
+
+
 @pytest.mark.vcr
 def test_file_error_on_xml_pdf():
     file: File = File.first(type=KYCFileType.ine)