[release] 3.44.0 (#413)

* added country property to recipients (#412)

Co-authored-by: Iulian Masar <iulian.masar@codegile.com>

* identity verification updates (#410)

- removed get checks endpoint
- handle get all endpoint
- updated event type and tests
- skip logo upload test

Co-authored-by: Iulian Masar <iulian.masar@codegile.com>

* handle get all deposits by card or user (#411)

Co-authored-by: Iulian Masar <iulian.masar@codegile.com>

* reverted TestKycPageFile.png file

---------

Co-authored-by: Iulian Masar <iulian.masar@codegile.com>

Author: iulian03

mangopay/constants.py

@@ -35,7 +35,12 @@
     ('WAITING', 'waiting', 'Waiting'),
     ('CANCELED', 'canceled', 'Canceled'),
     ('EXPIRED', 'expired', 'Expired'),
-    ('VALIDATED', 'validated', 'Validated')
+    ('VALIDATED', 'validated', 'Validated'),
+    ('CANCEL_REQUESTED', 'cancel_requested', 'Cancel Requested'),
+    ('TO_BE_COMPLETED', 'to_be_completed', 'To Be Completed'),
+    ('NO_SHOW_REQUESTED', 'no_show_requested', 'No Show Requested'),
+    ('NO_SHOW', 'no_show', 'No Show'),
+    ('FAILED', 'failed', 'Failed')
 )
 
 VALIDITY_CHOICES = Choices(
@@ -200,6 +205,7 @@
     ('IDENTITY_VERIFICATION_INCONCLUSIVE', 'identity_verification_inconclusive', 'Identity Verification Inconclusive'),
     ('IDENTITY_VERIFICATION_OUTDATED', 'identity_verification_outdated', 'Identity Verification Outdated'),
     ('IDENTITY_VERIFICATION_TIMEOUT', 'identity_verification_timeout', 'Identity Verification Timeout'),
+    ('IDENTITY_VERIFICATION_PENDING', 'identity_verification_pending', 'Identity Verification Pending'),
 
     ('RECIPIENT_ACTIVE', 'recipient_active', 'Recipient Active'),
     ('RECIPIENT_CANCELED', 'recipient_canceled', 'Recipient Canceled'),

mangopay/resources.py

@@ -2584,9 +2584,25 @@ class Meta:
         url = {
             InsertQuery.identifier: '/deposit-preauthorizations/card/direct',
             SelectQuery.identifier: '/deposit-preauthorizations/',
-            UpdateQuery.identifier: '/deposit-preauthorizations/'
+            UpdateQuery.identifier: '/deposit-preauthorizations/',
+            'GET_ALL_FOR_USER': '/users/%(user_id)s/deposit-preauthorizations/',
+            'GET_ALL_FOR_CARD': '/cards/%(card_id)s/deposit-preauthorizations/'
         }
 
+    @classmethod
+    def get_all_for_user(cls, user_id, *args, **kwargs):
+        kwargs['user_id'] = user_id
+        select = SelectQuery(Deposit, *args, **kwargs)
+        select.identifier = 'GET_ALL_FOR_USER'
+        return select.all(*args, **kwargs)
+
+    @classmethod
+    def get_all_for_card(cls, card_id, *args, **kwargs):
+        kwargs['card_id'] = card_id
+        select = SelectQuery(Deposit, *args, **kwargs)
+        select.identifier = 'GET_ALL_FOR_CARD'
+        return select.all(*args, **kwargs)
+
 
 class VirtualAccount(BaseModel):
     wallet_id = CharField(api_name='WalletId', required=True)
@@ -2625,14 +2641,18 @@ class IdentityVerification(BaseModel):
     hosted_url = CharField(api_name='HostedUrl')
     return_url = CharField(api_name='ReturnUrl', required=True)
     status = CharField(api_name='Status')
+    last_update = DateTimeField(api_name='UpdateDate')
+    user_id = CharField(api_name='UserId')
+    checks = ListField(api_name='Checks')
 
     class Meta:
         verbose_name = 'identity_verification'
         verbose_name_plural = 'identity_verifications'
 
         url = {
             InsertQuery.identifier: '/users/%(user_id)s/identity-verifications',
-            SelectQuery.identifier: '/identity-verifications'
+            SelectQuery.identifier: '/identity-verifications',
+            'GET_ALL': '/users/%(user_id)s/identity-verifications'
         }
 
     def create(self, user_id, idempotency_key=None, **kwargs):
@@ -2641,34 +2661,12 @@ def create(self, user_id, idempotency_key=None, **kwargs):
         insert.insert_query = self.get_field_dict()
         return insert.execute()
 
-    def get_checks(self, *args, **kwargs):
-        kwargs['id'] = self.id
-        select = SelectQuery(IdentityVerificationCheck, *args, **kwargs)
-        select.identifier = 'GET_CHECKS'
-        return select.get("", *args, **kwargs)
-
-
-class IdentityVerificationCheck(BaseModel):
-    session_id = CharField(api_name='SessionId')
-    status = CharField(api_name='Status')
-    creation_date = DateTimeField(api_name='CreationDate')
-    last_update = DateTimeField(api_name='LastUpdate')
-    checks = ListField(api_name='Checks')
-
-    class Meta:
-        verbose_name = 'identity_verification_check'
-        verbose_name_plural = 'identity_verifications_checks'
-
-        url = {
-            'GET_CHECKS': '/identity-verifications/%(id)s/checks'
-        }
-
     @classmethod
-    def get(cls, identity_verification_id, *args, **kwargs):
-        kwargs['id'] = identity_verification_id
-        select = SelectQuery(IdentityVerificationCheck, *args, **kwargs)
-        select.identifier = 'GET_CHECKS'
-        return select.get("", *args, **kwargs)
+    def get_all(cls, user_id, *args, **kwargs):
+        kwargs['user_id'] = user_id
+        select = SelectQuery(IdentityVerification, *args, **kwargs)
+        select.identifier = 'GET_ALL'
+        return select.all(*args, **kwargs)
 
 
 class Recipient(BaseModel):
@@ -2677,6 +2675,7 @@ class Recipient(BaseModel):
     payout_method_type = CharField(api_name='PayoutMethodType', required=True)
     recipient_type = CharField(api_name='RecipientType', required=True)
     currency = CharField(api_name='Currency', required=True)
+    country = CharField(api_name='Country')
     recipient_scope = CharField(api_name='RecipientScope')
     user_id = CharField(api_name='UserId')
     individual_recipient = IndividualRecipientField(api_name='IndividualRecipient')
@@ -2728,6 +2727,7 @@ class RecipientSchema(BaseModel):
     payout_method_type = RecipientPropertySchemaField(api_name='PayoutMethodType')
     recipient_type = RecipientPropertySchemaField(api_name='RecipientType')
     currency = RecipientPropertySchemaField(api_name='Currency')
+    country = RecipientPropertySchemaField(api_name='Country')
     recipient_scope = RecipientPropertySchemaField(api_name='RecipientScope')
     tag = RecipientPropertySchemaField(api_name='Tag')
     individual_recipient = IndividualRecipientPropertySchemaField(api_name='IndividualRecipient')
@@ -2741,14 +2741,15 @@ class Meta:
 
         url = {
             SelectQuery.identifier: '/recipients/schema?payoutMethodType=%(payout_method_type)s&recipientType=%('
-                                    'recipient_type)s&currency=%(currency)s'
+                                    'recipient_type)s&currency=%(currency)s&country=%(country)s'
         }
 
     @classmethod
-    def get(cls, payout_method_type, recipient_type, currency, *args, **kwargs):
+    def get(cls, payout_method_type, recipient_type, currency, country, *args, **kwargs):
         kwargs['payout_method_type'] = payout_method_type
         kwargs['recipient_type'] = recipient_type
         kwargs['currency'] = currency
+        kwargs['country'] = country
         select = SelectQuery(RecipientSchema, *args, **kwargs)
         return select.get("", *args, **kwargs)
 

tests/resources/TestKycPageFile.png

@@ -1,8 +1,8 @@
 import base64
 import os
-import random
+import unittest
 
-from mangopay.resources import Client, ClientLogo, Address, BankWirePayOut, ClientWallet
+from mangopay.resources import Client, ClientLogo, BankWirePayOut, ClientWallet
 from mangopay.utils import Money
 from tests.test_base import BaseTestLive
 
@@ -29,6 +29,7 @@ def test_ClientGet(self):
     #     self.assertEqual(client.headquarters_phone_number, phone_number, "Headquarter's phone number was not updated "
     #                                                                      "correctly")
 
+    @unittest.skip("skipped")
     def test_LogoUpload(self):
         file_path = os.path.join(os.path.dirname(__file__), 'resources', 'TestKycPageFile.png')
         with open(file_path, 'rb') as f:

tests/test_clients.py

@@ -17,6 +17,22 @@ def test_get(self):
         self.assertIsNotNone(fetched_deposit)
         self.assertEqual(deposit.id, fetched_deposit.id)
 
+    def test_get_all_for_user(self):
+        deposit = self.create_new_deposit()
+        result = Deposit.get_all_for_user(deposit.author_id)
+
+        self.assertIsNotNone(result)
+        self.assertIsInstance(result.data, list)
+        self.assertTrue(len(result.data) > 0)
+
+    def test_get_all_for_card(self):
+        deposit = self.create_new_deposit()
+        result = Deposit.get_all_for_card(deposit.card_id)
+
+        self.assertIsNotNone(result)
+        self.assertIsInstance(result.data, list)
+        self.assertTrue(len(result.data) > 0)
+
     @unittest.skip("can't be tested yet")
     def test_cancel(self):
         deposit = self.create_new_deposit()

tests/test_deposits.py

@@ -1,7 +1,4 @@
-import unittest
-
-from mangopay.resources import IdentityVerification, IdentityVerificationCheck
-from mangopay.utils import timestamp_from_datetime
+from mangopay.resources import IdentityVerification
 from tests.test_base import BaseTestLive
 
 
@@ -24,20 +21,14 @@ def test_get_identity_verification(self):
         self.assertEqual(IdentityVerificationTest._identity_verification.return_url, fetched.return_url)
         self.assertEqual(IdentityVerificationTest._identity_verification.status, fetched.status)
 
-    @unittest.skip("api returning 404")
-    def test_get_checks(self):
+    def test_get_all_identity_verifications_for_user(self):
         self.create_new_identity_verification()
-        # can be fetched in 2 ways:
-
-        # checks: IdentityVerificationCheck = IdentityVerificationCheck.get(
-        #     IdentityVerificationTest._identity_verification.id)
-        checks: IdentityVerificationCheck = IdentityVerificationTest._identity_verification.get_checks()
+        john = BaseTestLive.get_john()
+        fetched = IdentityVerification.get_all(john.id)
 
-        self.assertIsNotNone(checks)
-        self.assertEqual(checks.status, 'PENDING')
-        self.assertTrue(timestamp_from_datetime(checks.creation_date) > 0)
-        self.assertTrue(timestamp_from_datetime(checks.last_update) > 0)
-        self.assertIsNotNone(checks.checks)
+        self.assertIsNotNone(fetched)
+        self.assertIsInstance(fetched.data, list)
+        self.assertTrue(len(fetched.data) > 0)
 
     @staticmethod
     def create_new_identity_verification():

tests/test_identity_verification.py

@@ -22,6 +22,7 @@ def test_create_recipient(self):
         self.assertIsNotNone(RecipientsTest._recipient.local_bank_transfer)
         self.assertIsNone(RecipientsTest._recipient.international_bank_transfer)
         self.assertIsNone(RecipientsTest._recipient.business_recipient)
+        self.assertIsNotNone(RecipientsTest._recipient.country)
 
     def test_get_recipient(self):
         self.create_new_recipient()
@@ -41,7 +42,7 @@ def test_get_user_recipients(self):
         self.assertTrue(len(fetched.data) > 0)
 
     def test_get_recipient_schema_local_bank_transfer_individual(self):
-        schema = RecipientSchema.get('LocalBankTransfer', 'Individual', 'GBP')
+        schema = RecipientSchema.get('LocalBankTransfer', 'Individual', 'GBP', 'GB')
 
         self.assertIsNotNone(schema)
         self.assertIsNotNone(schema.display_name)
@@ -54,9 +55,10 @@ def test_get_recipient_schema_local_bank_transfer_individual(self):
         self.assertIsNotNone(schema.individual_recipient)
         self.assertIsNone(schema.business_recipient)
         self.assertIsNone(schema.international_bank_transfer)
+        self.assertIsNotNone(schema.country)
 
     def test_get_recipient_schema_international_bank_transfer_business(self):
-        schema = RecipientSchema.get('InternationalBankTransfer', 'Business', 'GBP')
+        schema = RecipientSchema.get('InternationalBankTransfer', 'Business', 'GBP', 'GB')
 
         self.assertIsNotNone(schema)
         self.assertIsNotNone(schema.display_name)
@@ -69,6 +71,7 @@ def test_get_recipient_schema_international_bank_transfer_business(self):
         self.assertIsNotNone(schema.international_bank_transfer)
         self.assertIsNone(schema.local_bank_transfer)
         self.assertIsNone(schema.individual_recipient)
+        self.assertIsNotNone(schema.country)
 
     def test_get_payout_methods(self):
         payout_methods = PayoutMethod.get("DE", "EUR")
@@ -115,6 +118,7 @@ def get_new_recipient_obj():
         recipient.payout_method_type = 'LocalBankTransfer'
         recipient.recipient_type = 'Individual'
         recipient.currency = 'GBP'
+        recipient.country = 'GB'
 
         individual_recipient = IndividualRecipient()
         individual_recipient.first_name = 'Alex'