Related resource and funding intrument (#123)

Author: Keryc Diaz

cuenca/resources/balance_entries.py

@@ -1,12 +1,17 @@
-from typing import ClassVar, cast
+from typing import ClassVar, TypeVar, cast
 
-from cuenca_validations.types import EntryType, RelatedTransaction
+from cuenca_validations.types import EntryType
 from pydantic.dataclasses import dataclass
 
-from cuenca import resources
-
-from .base import Queryable, Retrievable
+from .accounts import Account
+from .base import Queryable, Retrievable, Transaction
+from .cards import Card
 from .resources import retrieve_uri
+from .service_providers import ServiceProvider
+
+FundingInstrument = TypeVar(
+    'FundingInstrument', Account, ServiceProvider, Card
+)
 
 
 @dataclass
@@ -18,10 +23,16 @@ class BalanceEntry(Retrievable, Queryable):
     name: str
     rolling_balance: int
     type: EntryType
-    related_transaction_uri: RelatedTransaction
+    related_transaction_uri: str
+    funding_instrument_uri: str
+
+    @property  # type: ignore
+    def related_transaction(self) -> Transaction:
+        return cast(Transaction, retrieve_uri(self.related_transaction_uri))
 
     @property  # type: ignore
-    def related_transaction(self):
-        rt = self.related_transaction_uri
-        resource = getattr(resources, rt.get_model())
-        return cast(resource, retrieve_uri(rt)) if resource else None
+    def funding_instrument(self) -> FundingInstrument:
+        return cast(
+            FundingInstrument,
+            retrieve_uri(self.funding_instrument_uri),
+        )

cuenca/resources/commissions.py

@@ -1,14 +1,8 @@
-from typing import ClassVar, Optional, cast
+from typing import ClassVar, cast
 
-from cuenca_validations.types import (
-    CommissionType,
-    EntryType,
-    RelatedTransaction,
-)
+from cuenca_validations.types import CommissionType, EntryType
 from pydantic.dataclasses import dataclass
 
-from cuenca import resources
-
 from .base import Transaction
 from .resources import retrieve_uri
 
@@ -20,12 +14,8 @@ class Commission(Transaction):
     _resource: ClassVar = 'commissions'
 
     type: CommissionType
-    related_transaction_uri: Optional[RelatedTransaction]
+    related_transaction_uri: str
 
     @property  # type: ignore
-    def related_transaction(self):
-        rt = self.related_transaction_uri
-        if not rt:
-            return None
-        resource = getattr(resources, rt.get_model())
-        return cast(resource, retrieve_uri(rt)) if resource else None
+    def related_transaction(self) -> Transaction:
+        return cast(Transaction, retrieve_uri(self.related_transaction_uri))

cuenca/resources/deposits.py

@@ -14,13 +14,9 @@ class Deposit(Transaction):
     _query_params: ClassVar = DepositQuery
 
     network: DepositNetwork
-    source_uri: Optional[str]
+    source_uri: str
     tracking_key: Optional[str]  # clave rastreo if network is SPEI
 
     @property  # type: ignore
-    def source(self) -> Optional[Account]:
-        if self.source_uri is None:  # cash deposit
-            acct = None
-        else:
-            acct = cast(Account, retrieve_uri(self.source_uri))
-        return acct
+    def source(self) -> Account:
+        return cast(Account, retrieve_uri(self.source_uri))

cuenca/resources/transfers.py

@@ -26,16 +26,12 @@ class Transfer(Transaction, Creatable):
     account_number: str
     idempotency_key: str
     network: TransferNetwork
+    destination_uri: str
     tracking_key: Optional[str]  # clave rastreo if network is SPEI
-    destination_uri: Optional[str]  # defined after confirmation of receipt
 
     @property  # type: ignore
     def destination(self) -> Optional[Account]:
-        if self.destination_uri is None:
-            acct = None
-        else:
-            acct = cast(Account, retrieve_uri(self.destination_uri))
-        return acct
+        return cast(Account, retrieve_uri(self.destination_uri))
 
     @classmethod
     def create(

cuenca/version.py

@@ -1,3 +1,3 @@
-__version__ = '0.6.4'
+__version__ = '0.6.5'
 CLIENT_VERSION = __version__
 API_VERSION = '2020-03-19'

tests/resources/cassettes/test_balance_entry_related_transaction_not_exist.yaml

@@ -23,7 +23,7 @@ interactions:
   response:
     body:
       string: '{"id":"TV01","created_at":"2020-10-15T22:27:53.712000","user_id":"US4PCNV8rLB2wqBfORzIAXUl","name":"Dep\u00f3sito
-        de efectivo","amount":25000,"descriptor":"Deposito v\u00eda paynet auth 304054","rolling_balance":144519,"type":"credit","related_transaction_uri":"/deposits/CDI7SJOifauN5WnqfMhXK4R"}'
+        de efectivo","amount":25000,"descriptor":"Deposito v\u00eda paynet auth 304054","rolling_balance":144519,"type":"credit","related_transaction_uri":"/deposits/CDI7SJOifauN5WnqfMhXK4R","funding_instrument_uri":"/accounts/BA01"}'
     headers:
       Connection:
       - keep-alive
@@ -74,7 +74,7 @@ interactions:
   response:
     body:
       string: '{"id":"CDI7SJOifauN5WnqfMhXK4R","created_at":"2020-10-15T22:27:53.827000","user_id":"US4PCNV8rLB2wqBfORzIAXUl","amount":25000,"status":"succeeded","descriptor":"Deposito
-        v\u00eda paynet auth 304054","source_uri":null,"network":"cash","tracking_key":null}'
+        v\u00eda paynet auth 304054","source_uri":"/accounts/BA01","network":"cash","tracking_key":null}'
     headers:
       Connection:
       - keep-alive
@@ -101,4 +101,51 @@ interactions:
     status:
       code: 200
       message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate
+      Authorization:
+      - DUMMY
+      Connection:
+      - keep-alive
+      User-Agent:
+      - cuenca-python/0.2.0.dev1
+      X-Cuenca-Api-Version:
+      - '2020-03-19'
+    method: GET
+    uri: https://sandbox.cuenca.com/accounts/BA01
+  response:
+    body:
+      string: '{"id":"BA01","created_at":"2020-06-03T02:43:52.922000","name":"Frida
+        Kahlo","account_number":"072691004495711499","institution_name":"Banorte/Ixe"}'
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '147'
+      Content-Type:
+      - application/json
+      Date:
+      - Tue, 16 Jun 2020 04:32:14 GMT
+      Via:
+      - 1.1 738c4d7519e726c557e6997ecf719e4b.cloudfront.net (CloudFront)
+      X-Amz-Cf-Id:
+      - 3um0wIx959TPYgV9OOAd-EcmImhJCL0EENfjLsbJo6N5l_zPG_lByQ==
+      X-Amz-Cf-Pop:
+      - IAH50-C3
+      X-Amzn-Trace-Id:
+      - Root=1-5ee84b4e-89001b2256aa31154faffe45;Sampled=0
+      X-Cache:
+      - Miss from cloudfront
+      x-amz-apigw-id:
+      - ONC0RHYuoAMF3pw=
+      x-amzn-RequestId:
+      - c4451173-95e6-4636-b7b8-6f268b4c9918
+    status:
+      code: 200
+      message: OK
 version: 1

tests/resources/cassettes/test_balance_entry_retrieve.yaml

@@ -23,7 +23,7 @@ interactions:
   response:
     body:
       string: '{"id":"COXXX","created_at":"2020-09-24T00:29:34.830000","user_id":"US2qz3mrAomlP8LWG106tILW","amount":25000,"status":"created","descriptor":"Comisi\u00f3n
-        (card_request)", "type": "cash_deposit","related_transaction_uri":null}'
+        (card_request)", "type": "cash_deposit","related_transaction_uri":"/deposits/CDXXX"}'
     headers:
       Connection:
       - keep-alive

tests/resources/cassettes/test_commission_retrieve.yaml

@@ -74,7 +74,7 @@ interactions:
   response:
     body:
       string: '{"id":"CDXXX","created_at":"2020-09-30T19:38:29.234000","user_id":"USXXX","amount":2002,"status":"succeeded","descriptor":"Deposito
-        v\u00eda paynet auth 648695","source_uri":null,"network":"cash","tracking_key":null}'
+        v\u00eda paynet auth 648695","source_uri":"/accounts/BA01","network":"cash","tracking_key":null}'
     headers:
       Connection:
       - keep-alive

…mmission_retrieve_witw_cash_deposit.yaml …mmission_retrieve_with_cash_deposit.yamltests/resources/cassettes/test_commission_retrieve_witw_cash_deposit.yaml renamed to tests/resources/cassettes/test_commission_retrieve_with_cash_deposit.yaml tests/resources/cassettes/test_commission_retrieve_witw_cash_deposit.yaml renamed to tests/resources/cassettes/test_commission_retrieve_with_cash_deposit.yaml

@@ -74,7 +74,7 @@ interactions:
   response:
     body:
       string: '{"id":"SP5XXX","created_at":"2020-05-08T23:12:25.042000","updated_at":"2020-05-08T23:12:28.854000","account_number":"646180157013244941","recipient_name":"test
-        85d91ea6-76b6-49ab-913b-0481e8df7379","amount":8888,"descriptor":"lambda","idempotency_key":"b2bf01cb-da5f-4a42-9462-23078b81b6ea","status":"failed","network":"spei","destination_uri":null,"tracking_key":null,"user_id":"USXXX"}'
+        85d91ea6-76b6-49ab-913b-0481e8df7379","amount":8888,"descriptor":"lambda","idempotency_key":"b2bf01cb-da5f-4a42-9462-23078b81b6ea","status":"failed","network":"spei","destination_uri":"/accounts/BA01","tracking_key":null,"user_id":"USXXX"}'
     headers:
       Connection:
       - keep-alive