Changes:

- implemented temporary API calls,
- corrected upload of KYC documents

Author: lukasz-drzewiecki

mangopay2-python-sdk.pyproj

@@ -28,6 +28,8 @@
     <Compile Include="mangopaysdk\entities\bankaccount.py">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="mangopaysdk\entities\temporaryimmediatepayin.py" />
+    <Compile Include="mangopaysdk\entities\temporarypaymentcard.py" />
     <Compile Include="mangopaysdk\entities\card.py" />
     <Compile Include="mangopaysdk\entities\cardpreauthorization.py" />
     <Compile Include="mangopaysdk\entities\cardregistration.py" />
@@ -239,6 +241,7 @@
     <Content Include="MANIFEST.in">
       <SubType>Content</SubType>
     </Content>
+    <Content Include="tests\TestKycPageFile.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
 </Project>

mangopaysdk/entities/temporaryimmediatepayin.py

@@ -0,0 +1,15 @@
+from mangopaysdk.entities.transaction import Transaction
+
+
+class TemporaryImmediatePayIn(Transaction):
+    """WARNING! 
+    This is temporary entity and will be removed in future.
+    Contact support before using these features or if have any queries.
+    
+    TemporaryImmediatePayIn entity
+    """
+    
+    def __init__(self, id = None):
+        self.PaymentCardId = None
+        self.CreditedWalletId = None
+        return super(TemporaryImmediatePayIn, self).__init__(id)

mangopaysdk/entities/temporarypaymentcard.py

@@ -0,0 +1,20 @@
+from mangopaysdk.entities.entitybase import EntityBase
+
+
+class TemporaryPaymentCard(EntityBase):
+    """WARNING! 
+    This is temporary entity and will be removed in future.
+    Contact support before using these features or if have any queries.
+    
+    TemporaryPaymentCard entity
+    """
+    
+    def __init__(self, id = None):
+        self.UserId = None
+        self.Culture = None
+        self.ReturnURL = None
+        self.TemplateURL = None
+        self.RedirectURL = None
+        self.Alias = None
+        return super(TemporaryPaymentCard, self).__init__(id)
+    

mangopaysdk/tools/apibase.py

@@ -37,6 +37,8 @@
 from mangopaysdk.types.bankaccountdetailsus import BankAccountDetailsUS
 from mangopaysdk.types.bankaccountdetailsca import BankAccountDetailsCA
 from mangopaysdk.types.bankaccountdetailsother import BankAccountDetailsOTHER
+from mangopaysdk.entities.temporarypaymentcard import TemporaryPaymentCard
+from mangopaysdk.entities.temporaryimmediatepayin import TemporaryImmediatePayIn
 
 
 class ApiBase(object):
@@ -124,7 +126,14 @@ class ApiBase(object):
         'wallets_get' : ('/wallets/%s', 'GET'),
         'wallets_save' : ('/wallets/%s', 'PUT'),
 
-        'kyc_documents_all' : ('/KYC/documents', 'GET')
+        'kyc_documents_all' : ('/KYC/documents', 'GET'),
+
+
+        # These are temporary functions and WILL be removed in the future. 
+        # Contact support before using these features or if have any queries.
+        'temp_paymentcards_create' : ('/temp/paymentcards', 'POST'),
+        'temp_paymentcards_get' : ('/temp/paymentcards/%s', 'GET'),
+        'temp_immediatepayins_create' : ('/temp/immediate-payins', 'POST')
     }
 
 

mangopaysdk/tools/apicardregistrations.py

@@ -1,5 +1,6 @@
 from mangopaysdk.tools.apibase import ApiBase
 from mangopaysdk.entities.cardregistration import CardRegistration
+from mangopaysdk.entities.temporarypaymentcard import TemporaryPaymentCard
 
 
 class ApiCardRegistrations (ApiBase):
@@ -24,4 +25,27 @@ def Update(self, cardRegistration):
         param CardRegistration object to save
         return CardRegistration Object returned from API
         """
-        return self._saveObject('cardregistration_save', cardRegistration, 'CardRegistration')
+        return self._saveObject('cardregistration_save', cardRegistration, 'CardRegistration')
+
+
+    def CreateTemporaryPaymentCard(self, paymentCard):
+        """WARNING! 
+        This is temporary function and will be removed in future.
+        Contact support before using these features or if have any queries.
+
+        Creates new temporary payment card.
+        param TemporaryPaymentCard Temporary payment card to be created
+        return TemporaryPaymentCard Object returned from API
+        """
+        return self._createObject('temp_paymentcards_create', paymentCard, 'TemporaryPaymentCard')
+
+    def GetTemporaryPaymentCard(self, paymentCardId):
+        """WARNING! 
+        This is temporary function and will be removed in future.
+        Contact support before using these features or if have any queries.
+
+        Gets temporary payment card.
+        param string Temporary payment card identifier
+        return TemporaryPaymentCard Object returned from API
+        """
+        return self._getObject('temp_paymentcards_get', paymentCardId, 'TemporaryPaymentCard')

mangopaysdk/tools/apipayins.py

@@ -1,5 +1,6 @@
 from mangopaysdk.tools.apibase import ApiBase
 from mangopaysdk.entities.payin import PayIn
+from mangopaysdk.entities.temporaryimmediatepayin import TemporaryImmediatePayIn
 
 
 class ApiPayIns (ApiBase):
@@ -36,6 +37,17 @@ def GetRefund(self, payInId):
         """
         return self._getObject('payins_getrefunds', payInId, 'Refund')
 
+    def CreateTemporaryImmediatePayIn(self, immediatePayIn):
+        """WARNING! 
+        This is temporary function and will be removed in future.
+        Contact support before using these features or if have any queries.
+
+        Creates new temporary immediate pay-in.
+        param TemporaryImmediatePayIn Immediate pay-in object to create
+        return TemporaryImmediatePayIn Object returned from API
+        """
+        return self._createObject('temp_immediatepayins_create', immediatePayIn, 'TemporaryImmediatePayIn')
+
     def _getPaymentKey(self, payIn):
 
         if payIn.PaymentDetails == None:

mangopaysdk/tools/apiusers.py

@@ -180,12 +180,9 @@ def CreateKycPageFromFile(self, userId, kycDocumentId, file):
             raise Exception('Path of file cannot be empty')
 
         if (not os.path.isfile(filePath)):
-            raise Exception('File not exist')
+            raise Exception('File not exist: ' + filePath)
 
-        kycPage = KycPage()
-        with open(filePath) as f:
-            encoded = base64.encodestring(f.read())
-        kycPage.File = encoded
+        kycPage = KycPage().LoadDocumentFromFile(filePath)
 
         if (kycPage.File == None):
             raise Exception('Content of the file cannot be empty')

tests/TestKycPageFile.png

@@ -310,37 +310,9 @@ def test_Users_UpdateKycDocument(self):
     def test_Users_CreateKycDocumentPage(self):
         john = self.getJohn()
         kycDoc = self.getUserKycDocument()
-        kycPage = KycPage().LoadDocumentFromFile(os.path.join(os.path.dirname(__file__),"spacer.gif"))
+        kycPage = KycPage().LoadDocumentFromFile(os.path.join(os.path.dirname(__file__), "TestKycPageFile.png"))
         kycDocRes = self.sdk.users.CreateUserKycPage(kycPage, john.Id, kycDoc.Id)
         self.assertEqual(kycDocRes, None)
-
-    def test_Users_CreateKycPage_EmptyFileString(self):
-        kycDocument = self.getUserKycDocument()
-        user = self.getJohn()
-        kycPage = KycPage()
-        kycPage.File = ''
-        kycPageResponse = self.sdk.users.CreateUserKycPage(kycPage, user.Id, kycDocument.Id)    
-        self.assertEqual(kycPageResponse, None)
-    
-    def test_Users_CreateKycPage_WrongFileString(self):
-        kycDocument = self.getUserKycDocument()
-        user = self.getJohn()
-        kycPage = KycPage()
-        kycPage.File = 'qqqq'
-        kycPageResponse = self.sdk.users.CreateUserKycPage(kycPage, user.Id, kycDocument.Id)
-        self.assertEqual(kycPageResponse, None)
-    
-    def test_Users_CreateKycPage_CorrectFileString(self):
-        user = self.getJohn()
-        kycDocumentInit = KycDocument()
-        kycDocumentInit.Status = KycDocumentStatus.CREATED
-        kycDocumentInit.Type = KycDocumentType.IDENTITY_PROOF
-        kycDocument = self.sdk.users.CreateUserKycDocument(kycDocumentInit, user.Id)
-        kycPage = KycPage()
-        kycPage.File = 'dGVzdCB0ZXN0IHRlc3QgdGVzdA=='
-        
-        kycPageResponse = self.sdk.users.CreateUserKycPage(kycPage, user.Id, kycDocument.Id)
-        self.assertEqual(kycPageResponse, None)
 
     def test_Users_CreateKycPage_EmptyFilePath(self):
         user = self.getJohn()
@@ -364,7 +336,7 @@ def test_Users_CreateKycPage_WrongFilePath(self) :
         try:
             self.sdk.users.CreateKycPageFromFile(user.Id, kycDocument.Id, 'notExistFileName.tmp')
         except Exception as exc:
-            self.assertEqual(exc.message, 'File not exist')
+            self.assertTrue(exc.message.find('File not exist') != -1)
 
     def test_Users_CreateKycPage_CorrectFilePath(self) :
         user = self.getJohn()
@@ -373,7 +345,7 @@ def test_Users_CreateKycPage_CorrectFilePath(self) :
         kycDocumentInit.Type = KycDocumentType.IDENTITY_PROOF
         kycDocument = self.sdk.users.CreateUserKycDocument(kycDocumentInit, user.Id)
 
-        self.sdk.users.CreateKycPageFromFile(user.Id, kycDocument.Id, __file__)
+        self.sdk.users.CreateKycPageFromFile(user.Id, kycDocument.Id, os.path.join(os.path.dirname(__file__), "TestKycPageFile.png"))
 
 if __name__ == '__main__':
      Test_ApiUsers().test_Users_GetKycDocument()

tests/testapiusers.py

@@ -1,5 +1,6 @@
 from mangopaysdk.mangopayapi import MangoPayApi
 from mangopaysdk.entities.cardregistration import CardRegistration
+from mangopaysdk.entities.temporarypaymentcard import TemporaryPaymentCard
 from mangopaysdk.tools.enums import *
 from tests.testbase import TestBase
 
@@ -44,4 +45,37 @@ def test_CardRegistrations_Update(self):
         # def test_Cards_CheckCardExisting(self):
         cardRegistration = self.sdk.cardRegistrations.Get(cardRegistration.Id)
         card = self.sdk.cards.Get(cardRegistration.CardId)
-        self.assertTrue(int(card.Id) > 0)
+        self.assertTrue(int(card.Id) > 0)
+
+
+    # The two tests below are added to cover temporary use cases, which will be removed in future.
+
+    def test_TemporaryPaymentCard_Create(self):
+        user = self.getJohn()
+        paymentCard = TemporaryPaymentCard()
+        paymentCard.UserId = user.Id
+        paymentCard.Tag = 'Test tag'
+        paymentCard.Culture = 'FR'
+        paymentCard.ReturnURL = 'http://test.com/test'
+        paymentCard.TemplateURL = 'https://test.com/test'
+                       
+        paymentCardCreated = self.sdk.cardRegistrations.CreateTemporaryPaymentCard(paymentCard)
+        
+        self.assertTrue(int(paymentCardCreated.Id) > 0)
+        self.assertEquals(paymentCardCreated.UserId, user.Id)
+
+    def test_TemporaryPaymentCard_Get(self):
+        user = self.getJohn()
+        paymentCard = TemporaryPaymentCard()
+        paymentCard.UserId = user.Id
+        paymentCard.Tag = 'Test tag'
+        paymentCard.Culture = 'FR'
+        paymentCard.ReturnURL = 'http://test.com/test'
+        paymentCard.TemplateURL = 'https://test.com/test'
+
+        paymentCardCreated = self.sdk.cardRegistrations.CreateTemporaryPaymentCard(paymentCard)
+
+        paymentCardGet = self.sdk.cardRegistrations.GetTemporaryPaymentCard(paymentCardCreated.Id)
+
+        self.assertTrue(int(paymentCardGet.Id) > 0)
+        self.assertEquals(paymentCardGet.Id, paymentCardCreated.Id)