Merge pull request #2 from romatallinn/v0.0.3

v0.0.3

Author: MrLightful

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.0.3
+
+The release contains multiple critical bug fixes and improvements.
+
+- Bump project development status classifier to 4 - Beta
+- Add description to project config
+- Add `Address.district`
+- Fix base request's response handler
+- Fix API endpoints in Payments module
+- Fix API formatting of lists in `ObjectJSON`
+- Fix typo in `SplitPayment.subordinate_merchant_id`
+- Add `SplitMerchant.birthday_date` and  `SplitMerchant.business_activity_id` as required for merchants registered by CPF document
+- Accept data via kwargs in payment's capture request (e.g., for split payment details)
+
 ## 0.0.2
 
 The release mostly meant to improve project & code quality.

braspag_sdk/apps/payments/data/address.py

@@ -6,6 +6,7 @@ def __init__(self):
         self.street = None
         self.number = None
         self.complement = None
+        self.district = None
         self.zip_code = None
         self.city = None
         self.state = None

braspag_sdk/apps/payments/requests/create_sale.py

@@ -11,7 +11,7 @@ def __init__(self, merchant_credentials: MerchantCredentials, environment: Payme
         self.environment = environment
 
     def execute(self, sale):
-        uri = '%s/sales' % self.environment.api
+        uri = '%s/v2/sales' % self.environment.api
         response = self.send_request("POST", uri, sale)
         sale.update_return(response)
         return response

braspag_sdk/apps/payments/requests/query_sale.py

@@ -11,5 +11,5 @@ def __init__(self, merchant_credentials: MerchantCredentials, environment: Payme
         self.environment = environment
 
     def execute(self, payment_id):
-        uri = '%s/sales/%s' % (self.environment.query_api, payment_id)
+        uri = '%s/v2/sales/%s' % (self.environment.query_api, payment_id)
         return self.send_request("GET", uri)

braspag_sdk/apps/payments/requests/update_sale.py

@@ -1,3 +1,5 @@
+import json
+
 from braspag_sdk.utils import ApiBase
 
 from braspag_sdk.apps.payments.environment import PaymentsEnvironment
@@ -14,11 +16,13 @@ def __init__(self, type: str, merchant_credentials: MerchantCredentials, environ
         self.type = type
         self.service_tax_amount = None
         self.amount = None
+        self.data = None
 
     def execute(self, payment_id):
 
-        uri = '%s/sales/%s/%s' % (self.environment.api, payment_id, self.type)
+        uri = '%s/v2/sales/%s/%s' % (self.environment.api, payment_id, self.type)
 
+        data = {}
         params = {}
 
         if self.amount:
@@ -27,4 +31,7 @@ def execute(self, payment_id):
         if self.service_tax_amount:
             params['serviceTaxAmount'] = self.service_tax_amount
 
-        return self.send_request('PUT', uri, params=params)
+        if self.data:
+            data = self.data
+
+        return self.send_request('PUT', uri, params=params, data=data)

braspag_sdk/apps/payments/services.py

@@ -16,10 +16,16 @@ def create_sale(self, sale: Sale):
         request = CreateSale(self.merchant_credentials, self._environment)
         return request.execute(sale)
 
-    def capture_sale(self, payment_id: str, amount=None, service_tax_amount=None):
+    def capture_sale(self, payment_id: str, amount=None, service_tax_amount=None, **kwargs):
         request = UpdateSale('capture', self.merchant_credentials, self._environment)
         request.amount = amount
         request.service_tax_amount = service_tax_amount
+
+        data = None
+        if kwargs:
+            data = json.dumps(kwargs)
+        request.data = data
+
         return request.execute(payment_id)
 
     def cancel_sale(self, payment_id: str, amount=None):

braspag_sdk/apps/split/data/split_merchant.py

@@ -45,6 +45,8 @@ def __init__(self, *, master_merchant_id):
         self.corporate_name = None
         self.document_number = None
         self.document_type = None
+        self.birthday_date = None
+        self.business_activity_id = None
         self.address = None
         self.bank_account = None
         self.agreements = None

braspag_sdk/apps/split/data/split_payment.py

@@ -10,7 +10,7 @@ def __init__(self, mdr=None, fee=None):
 
 class SplitPayment(ObjectJSON):
 
-    def __init__(self, subordinadate_merchant_id, amount, mdr=None, fee=None):
-        self.subordinadate_merchant_id = subordinadate_merchant_id
+    def __init__(self, subordinate_merchant_id, amount, mdr=None, fee=None):
+        self.subordinate_merchant_id = subordinate_merchant_id
         self.amount = amount
         self.fares = SplitPaymentFares(mdr, fee)

braspag_sdk/utils/base_request.py

@@ -27,7 +27,7 @@ def send_request(self, method, uri, data=None, params=None):
 
         if not body:
             headers['Content-Length'] = '0'
-        elif not isinstance(data, dict):
+        elif not isinstance(data, str):
             body = body.toJSON()
 
         if 'Content-Type' not in headers:
@@ -39,7 +39,7 @@ def send_request(self, method, uri, data=None, params=None):
 
         response = s.send(prep)
 
-        if 'json' in response.headers['Content-Type'].lower():
+        if 'json' in response.headers.get('Content-Type', '').lower():
             answers = response.json()
         else:
             answers = [{

braspag_sdk/utils/object_json.py

@@ -24,14 +24,22 @@ def __getattribute__(self, attribute):
 
 
 def process_name_key(dictionary):
+
+    # If it's a list, process each item.
+    if isinstance(dictionary, list):
+        new_list = []
+        for item in dictionary:
+            new_list.append(process_name_key(item))
+        return new_list
+
+    # If it's not a dictionary (and not list), just return it as is.
     if not isinstance(dictionary, dict):
         return dictionary
 
+    # If it's a dictionary, process each key/value.
     new_dictionary = {}
-
     for key in dictionary:
         new_dictionary[capitalize_key(key)] = process_name_key(dictionary[key])
-
     return new_dictionary