Finished integration of Spot FX endpoints

mangopay/fields.py

@@ -10,7 +10,7 @@
     Reason, ReportTransactionsFilters, ReportWalletsFilters, \
     PlatformCategorization, Billing, SecurityInfo, Birthplace, ApplepayPaymentData, GooglepayPaymentData, \
     ScopeBlocked, BrowserInfo, Shipping, CurrentState, FallbackReason, InstantPayout, CountryAuthorizationData, \
-    PayinsLinked, DebitedFunds, CreditedFunds, ConversionRate
+    PayinsLinked, ConversionRate
 
 
 class FieldDescriptor(object):
@@ -873,41 +873,6 @@ def api_value(self, value):
 
         return value
 
-
-class DebitedFundsField(Field):
-    def python_value(self, value):
-        if value is not None:
-            return DebitedFunds(currency=value['Currency'], amount=value['Amount'])
-        return value
-
-    def api_value(self, value):
-        value = super(DebitedFundsField, self).api_value(value)
-
-        if isinstance(value, DebitedFunds):
-            value = {
-                'Currency': value.currency,
-                'Amount': value.amount
-            }
-
-        return value
-
-class CreditedFundsField(Field):
-    def python_value(self, value):
-        if value is not None:
-            return CreditedFunds(currency=value['Currency'], amount=value['Amount'])
-        return value
-
-    def api_value(self, value):
-        value = super(CreditedFundsField, self).api_value(value)
-
-        if isinstance(value, CreditedFunds):
-            value = {
-                'Currency': value.currency,
-                'Amount': value.amount
-            }
-
-        return value
-
 class ConversionRateField(Field):
     def python_value(self, value):
         if value is not None:

mangopay/resources.py

@@ -14,7 +14,7 @@
                      ReportWalletsFiltersField, BillingField, SecurityInfoField, PlatformCategorizationField,
                      BirthplaceField, ApplepayPaymentDataField, GooglepayPaymentDataField, ScopeBlockedField,
                      BrowserInfoField, ShippingField, CurrentStateField, FallbackReasonField, InstantPayoutField,
-                     CountryAuthorizationDataField, PayinsLinkedField, DebitedFundsField, CreditedFundsField, ConversionRateField)
+                     CountryAuthorizationDataField, PayinsLinkedField, ConversionRateField)
 from .query import InsertQuery, UpdateQuery, SelectQuery, ActionQuery
 
 
@@ -266,13 +266,12 @@ def get(cls, *args, **kwargs):
 
 @python_2_unicode_compatible
 class ConversionRate(BaseModel):
-    debited_currency = CharField(api_name='DebitedCurrency')
-    credited_currency = CharField(api_name='CreditedCurrency')
+    debited_currency = CharField(api_name='DebitedCurrency', required=True)
+    credited_currency = CharField(api_name='CreditedCurrency', required=True)
     client_rate = CharField(api_name='ClientRate')
     market_rate = CharField(api_name='MarketRate')
 
-    def get_conversion_rate(self, client_id, *args, **kwargs):
-        kwargs['id'] = client_id
+    def get_conversion_rate(self, *args, **kwargs):
         kwargs['debited_currency'] = self.debited_currency
         kwargs['credited_currency'] = self.credited_currency
         select = SelectQuery(ConversionRate, *args, **kwargs)
@@ -283,16 +282,16 @@ class Meta:
         verbose_name = 'conversion_rate'
         verbose_name_plural = 'conversion_rates'
         url = {
-            'GET_CONVERSION_RATE' : '/%(id)s/conversion/rate/%(debited_currency)s/%(credited_currency)s'
+            'GET_CONVERSION_RATE' : '/conversion/rate/%(debited_currency)s/%(credited_currency)s'
         }
 
 @python_2_unicode_compatible
 class InstantConversion(BaseModel):
     author = ForeignKeyField(User, api_name='AuthorId', required=True)
     debited_wallet = ForeignKeyField(Wallet, api_name='DebitedWalletId', required=True)
     credited_wallet = ForeignKeyField(Wallet, api_name='CreditedWalletId', required=True)
-    debited_funds = DebitedFundsField(api_name='DebitedFunds', required=True)
-    credited_funds = CreditedFundsField(api_name='CreditedFunds', required=True)
+    debited_funds = MoneyField(api_name='DebitedFunds', required=True)
+    credited_funds = MoneyField(api_name='CreditedFunds', required=True)
     conversion_rate = ConversionRateField(api_name='ConversionRate')
     type = CharField(api_name='Type', choices=constants.TRANSACTION_TYPE_CHOICES, default=None)
     nature = CharField(api_name='Nature', choices=constants.NATURE_CHOICES, default=None)
@@ -303,16 +302,15 @@ class InstantConversion(BaseModel):
     execution_date = DateTimeField(api_name='ExecutionDate')
     currency = CharField(api_name='Currency')
 
-    def create_instant_conversion(self, client_id, **kwargs):
+    def create_instant_conversion(self, **kwargs):
         insert = InsertQuery(self, **kwargs)
         insert.insert_query = self.get_field_dict()
-        insert.insert_query['client_id'] = client_id
         insert.identifier = 'CREATE_INSTANT_CONVERSION'
         return insert.execute()
 
-    def get_instant_conversion(self, client_id, *args, **kwargs):
-        kwargs['client_id'] = client_id
-        kwargs['id'] = self.id
+    @staticmethod
+    def get_instant_conversion(id, *args, **kwargs):
+        kwargs['id'] = id
         select = SelectQuery(InstantConversion, *args, **kwargs)
         select.identifier = 'GET_INSTANT_CONVERSION'
         return select.all(*args, **kwargs)
@@ -321,8 +319,8 @@ class Meta:
         verbose_name = 'instant_conversion'
         verbose_name_plural = 'instant_conversions'
         url = {
-            'CREATE_INSTANT_CONVERSION' : '/%(client_id)s/instant-conversion',
-            'GET_INSTANT_CONVERSION': '/%(client_id)s/instant-conversion/%(id)s'
+            'CREATE_INSTANT_CONVERSION' : '/instant-conversion',
+            'GET_INSTANT_CONVERSION': '/instant-conversion/%(id)s'
         }
 
 

mangopay/utils.py

@@ -946,26 +946,6 @@ def to_api_json(self):
             "Description": self.description
         }
 
-@add_camelcase_aliases
-class DebitedFunds(object):
-    def __init__(self, currency=None, amount=None):
-        self.currency = currency
-        self.amount = amount
-
-    def __str__(self):
-        return 'Debited funds: %s' % \
-               (self.currency, self.amount)
-
-@add_camelcase_aliases
-class CreditedFunds(object):
-    def __init__(self, currency=None, amount=None):
-        self.currency = currency
-        self.amount = amount
-
-    def __str__(self):
-        return 'Credited funds: %s' % \
-               (self.currency, self.amount)
-
 @add_camelcase_aliases
 class ConversionRate(object):
     def __init__(self, client_rate=None, market_rate=None):

tests/test_base.py

@@ -10,8 +10,7 @@
 from mangopay import APIRequest
 from mangopay import get_default_handler
 from mangopay.auth import AuthorizationTokenManager, StaticStorageStrategy
-from mangopay.constants import LEGAL_USER_TYPE_CHOICES
-from mangopay.resources import BankAccount, Document, ReportTransactions, UboDeclaration, Ubo, Deposit
+from mangopay.resources import BankAccount, Document, ReportTransactions, UboDeclaration, Ubo, Deposit, DirectPayIn
 from mangopay.utils import Address, ReportTransactionsFilters, Birthplace, BrowserInfo
 from tests import settings
 from tests.mocks import RegisteredMocks
@@ -415,6 +414,12 @@ def get_johns_wallet(recreate=False):
             BaseTestLive._johns_wallet = BaseTestLive.create_new_wallet()
         return BaseTestLive._johns_wallet
 
+    @staticmethod
+    def get_johns_wallet_with_money(recreate=False):
+        if BaseTestLive._johns_wallet is None or recreate:
+            BaseTestLive._johns_wallet = BaseTestLive.create_new_wallet_with_money()
+        return BaseTestLive._johns_wallet
+
     @staticmethod
     def create_new_wallet():
         wallet = Wallet()
@@ -423,6 +428,49 @@ def create_new_wallet():
         wallet.description = 'WALLET IN EUR'
         return Wallet(**wallet.save())
 
+    @staticmethod
+    def create_new_wallet_with_money():
+        user = BaseTestLive.get_john()
+
+        wallet = Wallet()
+        wallet.owners = (user,)
+        wallet.currency = 'EUR'
+        wallet.description = 'WALLET IN EUR'
+        wallet = Wallet(**wallet.save())
+
+        card_registration = CardRegistration()
+        card_registration.user = user
+        card_registration.currency = 'EUR'
+
+        saved_registration = card_registration.save()
+        data = {
+            'cardNumber': '4970107111111119',
+            'cardCvx': '123',
+            'cardExpirationDate': '1224',
+            'accessKeyRef': card_registration.access_key,
+            'data': card_registration.preregistration_data
+        }
+        headers = {
+            'content-type': 'application/x-www-form-urlencoded'
+        }
+        registration_data_response = requests.post(card_registration.card_registration_url, data=data, headers=headers)
+        saved_registration['registration_data'] = registration_data_response.text
+        updated_registration = CardRegistration(**saved_registration).save()
+        card_id = updated_registration['card_id']
+
+        direct_payin = DirectPayIn(author=user,
+                                   debited_funds=Money(amount=100, currency='EUR'),
+                                   fees=Money(amount=1, currency='EUR'),
+                                   credited_wallet_id=wallet,
+                                   card_id=card_id,
+                                   secure_mode="DEFAULT",
+                                   ip_address="2001:0620:0000:0000:0211:24FF:FE80:C12C",
+                                   browser_info=BaseTest.get_browser_info(),
+                                   secure_mode_return_url="https://www.ulule.com/")
+
+        direct_payin.save()
+        return direct_payin.credited_wallet
+
     @staticmethod
     def get_johns_transfer(recreate=False):
         if BaseTestLive._johns_transfer is None or recreate:

tests/test_instant_conversion.py

@@ -0,0 +1,81 @@
+from mangopay.utils import Money
+from tests.resources import ConversionRate, InstantConversion, Wallet
+from tests.test_base import BaseTestLive
+
+
+class InstantConversionTest(BaseTestLive):
+
+    def test_get_conversion_rate(self):
+        conversion_rate = ConversionRate()
+        conversion_rate.debited_currency = 'EUR'
+        conversion_rate.credited_currency = 'GBP'
+
+        complete_conversion_rate = conversion_rate.get_conversion_rate()
+
+        self.assertIsNotNone(complete_conversion_rate)
+        self.assertIsNotNone(complete_conversion_rate.data[0].client_rate)
+        self.assertIsNotNone(complete_conversion_rate.data[0].market_rate)
+
+    def test_create_instant_conversion(self):
+        user = BaseTestLive.get_john()
+
+        credited_wallet = Wallet()
+        credited_wallet.owners = (user,)
+        credited_wallet.currency = 'GBP'
+        credited_wallet.description = 'WALLET IN GBP'
+        credited_wallet = Wallet(**credited_wallet.save())
+
+        credited_funds = Money()
+        credited_funds.currency = 'GBP'
+
+        debited_funds = Money()
+        debited_funds.currency = 'EUR'
+        debited_funds.amount = 79
+
+        instant_conversion = InstantConversion()
+        instant_conversion.author = user
+        instant_conversion.credited_wallet = credited_wallet
+        instant_conversion.debited_wallet = BaseTestLive.create_new_wallet_with_money()
+        instant_conversion.credited_funds = credited_funds
+        instant_conversion.debited_funds = debited_funds
+        instant_conversion.tag = "instant conversion test"
+
+        instant_conversion_response = instant_conversion.create_instant_conversion()
+
+        self.assertIsNotNone(instant_conversion_response)
+        self.assertIsNotNone(instant_conversion_response['debited_funds'].amount)
+        self.assertIsNotNone(instant_conversion_response['credited_funds'].amount)
+        self.assertEqual(instant_conversion_response['status'], 'SUCCEEDED')
+
+    def test_get_instant_conversion(self):
+        user = BaseTestLive.get_john()
+
+        credited_wallet = Wallet()
+        credited_wallet.owners = (user,)
+        credited_wallet.currency = 'GBP'
+        credited_wallet.description = 'WALLET IN GBP'
+        credited_wallet = Wallet(**credited_wallet.save())
+
+        credited_funds = Money()
+        credited_funds.currency = 'GBP'
+
+        debited_funds = Money()
+        debited_funds.currency = 'EUR'
+        debited_funds.amount = 79
+
+        instant_conversion = InstantConversion()
+        instant_conversion.author = user
+        instant_conversion.credited_wallet = credited_wallet
+        instant_conversion.debited_wallet = BaseTestLive.create_new_wallet_with_money()
+        instant_conversion.credited_funds = credited_funds
+        instant_conversion.debited_funds = debited_funds
+        instant_conversion.tag = "instant conversion test"
+
+        instant_conversion_response = instant_conversion.create_instant_conversion()
+        returned_conversion_response = InstantConversion.get_instant_conversion(instant_conversion_response['id'])
+
+        self.assertIsNotNone(returned_conversion_response)
+        self.assertIsNotNone(returned_conversion_response.data[0])
+        self.assertIsNotNone(returned_conversion_response.data[0].debited_funds.amount)
+        self.assertIsNotNone(returned_conversion_response.data[0].credited_funds.amount)
+        self.assertEqual(returned_conversion_response.data[0].status, 'SUCCEEDED')