Update services

Adyen/__init__.py

@@ -27,7 +27,6 @@
     AdyenTransfersApi,
     AdyenStoredValueApi,
     AdyenBalancePlatformApi,
-    AdyenCapitalApi
 )
 
 from .httpclient import HTTPClient
@@ -48,7 +47,6 @@ def __init__(self, **kwargs):
         self.transfers = AdyenTransfersApi(client=self.client)
         self.storedValue = AdyenStoredValueApi(client=self.client)
         self.balancePlatform = AdyenBalancePlatformApi(client=self.client)
-        self.capital = AdyenCapitalApi(client=self.client)
 
 
 _base_adyen_obj = Adyen()
@@ -64,4 +62,3 @@ def __init__(self, **kwargs):
 transfers = _base_adyen_obj.transfers
 storedValue = _base_adyen_obj.storedValue
 balancePlatform = _base_adyen_obj.balancePlatform
-capital = _base_adyen_obj.capital

Adyen/services/__init__.py

@@ -1,5 +1,5 @@
 from .base import AdyenBase
-from .binLookup import AdyenBinlookupApi
+from .binlookup import AdyenBinlookupApi
 from .checkout import AdyenCheckoutApi
 from .payments import AdyenPaymentsApi
 from .payouts import AdyenPayoutsApi
@@ -11,4 +11,3 @@
 from .transfers import AdyenTransfersApi
 from .storedValue import AdyenStoredValueApi
 from .balancePlatform import AdyenBalancePlatformApi
-from .capital import AdyenCapitalApi

Adyen/services/balancePlatform/__init__.py

@@ -2,6 +2,8 @@
 from .account_holders_api import AccountHoldersApi
 from .balance_accounts_api import BalanceAccountsApi
 from .bank_account_validation_api import BankAccountValidationApi
+from .grant_accounts_api import GrantAccountsApi
+from .grant_offers_api import GrantOffersApi
 from .payment_instrument_groups_api import PaymentInstrumentGroupsApi
 from .payment_instruments_api import PaymentInstrumentsApi
 from .platform_api import PlatformApi
@@ -20,6 +22,8 @@ def __init__(self, client=None):
         self.account_holders_api = AccountHoldersApi(client=client)
         self.balance_accounts_api = BalanceAccountsApi(client=client)
         self.bank_account_validation_api = BankAccountValidationApi(client=client)
+        self.grant_accounts_api = GrantAccountsApi(client=client)
+        self.grant_offers_api = GrantOffersApi(client=client)
         self.payment_instrument_groups_api = PaymentInstrumentGroupsApi(client=client)
         self.payment_instruments_api = PaymentInstrumentsApi(client=client)
         self.platform_api = PlatformApi(client=client)

Adyen/services/balancePlatform/grant_accounts_api.py

@@ -0,0 +1,22 @@
+from ..base import AdyenServiceBase
+
+
+class GrantAccountsApi(AdyenServiceBase):
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, client=None):
+        super(GrantAccountsApi, self).__init__(client=client)
+        self.service = "balancePlatform"
+
+    def get_grant_account(self, id, idempotency_key=None, **kwargs):
+        """
+        Get a grant account
+        """
+        endpoint = f"/grantAccounts/{id}"
+        method = "GET"
+        return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
+

Adyen/services/balancePlatform/grant_offers_api.py

@@ -0,0 +1,30 @@
+from ..base import AdyenServiceBase
+
+
+class GrantOffersApi(AdyenServiceBase):
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, client=None):
+        super(GrantOffersApi, self).__init__(client=client)
+        self.service = "balancePlatform"
+
+    def get_all_available_grant_offers(self, idempotency_key=None, **kwargs):
+        """
+        Get all available grant offers
+        """
+        endpoint = f"/grantOffers"
+        method = "GET"
+        return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
+
+    def get_grant_offer(self, grantOfferId, idempotency_key=None, **kwargs):
+        """
+        Get a grant offer
+        """
+        endpoint = f"/grantOffers/{grantOfferId}"
+        method = "GET"
+        return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
+

Adyen/services/balancePlatform/payment_instruments_api.py

@@ -20,9 +20,9 @@ def get_payment_instrument(self, id, idempotency_key=None, **kwargs):
         method = "GET"
         return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
 
-    def get_reveal_information_of_payment_instrument(self, id, idempotency_key=None, **kwargs):
+    def get_pan_of_payment_instrument(self, id, idempotency_key=None, **kwargs):
         """
-        Get the reveal information of a payment instrument
+        Get the PAN of a payment instrument
         """
         endpoint = f"/paymentInstruments/{id}/reveal"
         method = "GET"

Adyen/services/management/__init__.py

@@ -13,6 +13,7 @@
 from .my_api_credential_api import MyAPICredentialApi
 from .payment_methods_merchant_level_api import PaymentMethodsMerchantLevelApi
 from .payout_settings_merchant_level_api import PayoutSettingsMerchantLevelApi
+from .split_configuration_merchant_level_api import SplitConfigurationMerchantLevelApi
 from .terminal_actions_company_level_api import TerminalActionsCompanyLevelApi
 from .terminal_actions_terminal_level_api import TerminalActionsTerminalLevelApi
 from .terminal_orders_company_level_api import TerminalOrdersCompanyLevelApi
@@ -51,6 +52,7 @@ def __init__(self, client=None):
         self.my_api_credential_api = MyAPICredentialApi(client=client)
         self.payment_methods_merchant_level_api = PaymentMethodsMerchantLevelApi(client=client)
         self.payout_settings_merchant_level_api = PayoutSettingsMerchantLevelApi(client=client)
+        self.split_configuration_merchant_level_api = SplitConfigurationMerchantLevelApi(client=client)
         self.terminal_actions_company_level_api = TerminalActionsCompanyLevelApi(client=client)
         self.terminal_actions_terminal_level_api = TerminalActionsTerminalLevelApi(client=client)
         self.terminal_orders_company_level_api = TerminalOrdersCompanyLevelApi(client=client)

Adyen/services/management/split_configuration_merchant_level_api.py

@@ -0,0 +1,86 @@
+from ..base import AdyenServiceBase
+
+
+class SplitConfigurationMerchantLevelApi(AdyenServiceBase):
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, client=None):
+        super(SplitConfigurationMerchantLevelApi, self).__init__(client=client)
+        self.service = "management"
+
+    def delete_split_configuration(self, merchantId, splitConfigurationId, idempotency_key=None, **kwargs):
+        """
+        Delete a split configuration
+        """
+        endpoint = f"/merchants/{merchantId}/splitConfigurations/{splitConfigurationId}"
+        method = "DELETE"
+        return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
+
+    def delete_split_configuration_rule(self, merchantId, splitConfigurationId, splitConfigurationRuleId, idempotency_key=None, **kwargs):
+        """
+        Delete a split configuration rule
+        """
+        endpoint = f"/merchants/{merchantId}/splitConfigurations/{splitConfigurationId}/rules/{splitConfigurationRuleId}"
+        method = "DELETE"
+        return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
+
+    def list_split_configurations(self, merchantId, idempotency_key=None, **kwargs):
+        """
+        Get a list of split configurations
+        """
+        endpoint = f"/merchants/{merchantId}/splitConfigurations"
+        method = "GET"
+        return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
+
+    def get_split_configuration(self, merchantId, splitConfigurationId, idempotency_key=None, **kwargs):
+        """
+        Get a split configuration
+        """
+        endpoint = f"/merchants/{merchantId}/splitConfigurations/{splitConfigurationId}"
+        method = "GET"
+        return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
+
+    def update_split_configuration_description(self, request, merchantId, splitConfigurationId, idempotency_key=None, **kwargs):
+        """
+        Update split configuration description
+        """
+        endpoint = f"/merchants/{merchantId}/splitConfigurations/{splitConfigurationId}"
+        method = "PATCH"
+        return self.client.call_adyen_api(request, self.service, method, endpoint, idempotency_key, **kwargs)
+
+    def update_split_conditions(self, request, merchantId, splitConfigurationId, ruleId, idempotency_key=None, **kwargs):
+        """
+        Update split conditions
+        """
+        endpoint = f"/merchants/{merchantId}/splitConfigurations/{splitConfigurationId}/rules/{ruleId}"
+        method = "PATCH"
+        return self.client.call_adyen_api(request, self.service, method, endpoint, idempotency_key, **kwargs)
+
+    def update_split_logic(self, request, merchantId, splitConfigurationId, ruleId, splitLogicId, idempotency_key=None, **kwargs):
+        """
+        Update the split logic
+        """
+        endpoint = f"/merchants/{merchantId}/splitConfigurations/{splitConfigurationId}/rules/{ruleId}/splitLogic/{splitLogicId}"
+        method = "PATCH"
+        return self.client.call_adyen_api(request, self.service, method, endpoint, idempotency_key, **kwargs)
+
+    def create_split_configuration(self, request, merchantId, idempotency_key=None, **kwargs):
+        """
+        Create a split configuration
+        """
+        endpoint = f"/merchants/{merchantId}/splitConfigurations"
+        method = "POST"
+        return self.client.call_adyen_api(request, self.service, method, endpoint, idempotency_key, **kwargs)
+
+    def create_rule(self, request, merchantId, splitConfigurationId, idempotency_key=None, **kwargs):
+        """
+        Create a rule
+        """
+        endpoint = f"/merchants/{merchantId}/splitConfigurations/{splitConfigurationId}"
+        method = "POST"
+        return self.client.call_adyen_api(request, self.service, method, endpoint, idempotency_key, **kwargs)
+

Adyen/services/payouts/initialization_api.py

@@ -12,23 +12,23 @@ def __init__(self, client=None):
         super(InitializationApi, self).__init__(client=client)
         self.service = "payouts"
 
-    def store_payout_details(self, request, idempotency_key=None, **kwargs):
+    def store_detail(self, request, idempotency_key=None, **kwargs):
         """
         Store payout details
         """
         endpoint = f"/storeDetail"
         method = "POST"
         return self.client.call_adyen_api(request, self.service, method, endpoint, idempotency_key, **kwargs)
 
-    def store_details_and_submit_payout(self, request, idempotency_key=None, **kwargs):
+    def store_detail_and_submit_third_party(self, request, idempotency_key=None, **kwargs):
         """
         Store details and submit a payout
         """
         endpoint = f"/storeDetailAndSubmitThirdParty"
         method = "POST"
         return self.client.call_adyen_api(request, self.service, method, endpoint, idempotency_key, **kwargs)
 
-    def submit_payout(self, request, idempotency_key=None, **kwargs):
+    def submit_third_party(self, request, idempotency_key=None, **kwargs):
         """
         Submit a payout
         """

Adyen/services/payouts/instant_payouts_api.py

@@ -12,7 +12,7 @@ def __init__(self, client=None):
         super(InstantPayoutsApi, self).__init__(client=client)
         self.service = "payouts"
 
-    def make_instant_card_payout(self, request, idempotency_key=None, **kwargs):
+    def payout(self, request, idempotency_key=None, **kwargs):
         """
         Make an instant card payout
         """

Adyen/services/payouts/reviewing_api.py

@@ -12,15 +12,15 @@ def __init__(self, client=None):
         super(ReviewingApi, self).__init__(client=client)
         self.service = "payouts"
 
-    def confirm_payout(self, request, idempotency_key=None, **kwargs):
+    def confirm_third_party(self, request, idempotency_key=None, **kwargs):
         """
         Confirm a payout
         """
         endpoint = f"/confirmThirdParty"
         method = "POST"
         return self.client.call_adyen_api(request, self.service, method, endpoint, idempotency_key, **kwargs)
 
-    def cancel_payout(self, request, idempotency_key=None, **kwargs):
+    def decline_third_party(self, request, idempotency_key=None, **kwargs):
         """
         Cancel a payout
         """

Adyen/services/transfers/__init__.py

@@ -1,4 +1,5 @@
 from ..base import AdyenServiceBase
+from .capital_api import CapitalApi
 from .transactions_api import TransactionsApi
 from .transfers_api import TransfersApi
 
@@ -12,5 +13,6 @@ class AdyenTransfersApi(AdyenServiceBase):
 
     def __init__(self, client=None):
         super(AdyenTransfersApi, self).__init__(client=client)
+        self.capital_api = CapitalApi(client=client)
         self.transactions_api = TransactionsApi(client=client)
         self.transfers_api = TransfersApi(client=client)

Adyen/services/capital.py → Adyen/services/transfers/capital_api.py

@@ -1,16 +1,16 @@
-from .base import AdyenServiceBase
+from ..base import AdyenServiceBase
 
 
-class AdyenCapitalApi(AdyenServiceBase):
+class CapitalApi(AdyenServiceBase):
     """NOTE: This class is auto generated by OpenAPI Generator
     Ref: https://openapi-generator.tech
 
     Do not edit the class manually.
     """
 
     def __init__(self, client=None):
-        super(AdyenCapitalApi, self).__init__(client=client)
-        self.service = "capital"
+        super(CapitalApi, self).__init__(client=client)
+        self.service = "transfers"
 
     def get_capital_account(self, idempotency_key=None, **kwargs):
         """

Makefile

@@ -14,8 +14,8 @@ openapi-generator-url:=https://repo1.maven.org/maven2/org/openapitools/openapi-g
 openapi-generator-jar:=build/openapi-generator-cli.jar
 openapi-generator-cli:=java -jar $(openapi-generator-jar)
 output:=build/out
-services:=balancePlatform checkout legalEntityManagement management payments payouts platformsAccount platformsFund platformsHostedOnboardingPage platformsNotificationConfiguration transfers
-smallServices:=balanceControlService binlookup dataProtection recurring storedValue terminal capital
+services:=balancePlatform checkout legalEntityManagement management payments payouts transfers
+smallServices:=binlookup dataProtection recurring storedValue terminal
 
 all: $(services) $(smallServices)
 
@@ -36,7 +36,6 @@ platformsNotificationConfiguration: spec=NotificationConfigurationService-v6
 platformsHostedOnboardingPage: spec=HopService-v6
 transfers: spec=TransferService-v3
 balanceControlService: spec=BalanceControlService-v1
-capital: spec=GrantService-v3
 
 $(services): build/spec $(openapi-generator-jar)
 	rm -rf Adyen/services/$@ $(output)

test/ClientTest.py

@@ -20,7 +20,7 @@ class TestClient(unittest.TestCase):
     def test_url_creation_for_capitalAPI(self):
         self.adyen.client = self.test.create_client_from_file(200, {}, "test/mocks/"
                                                               "generic_response.json")
-        self.adyen.capital.get_capital_account()
+        self.adyen.transfers.capital_api.get_capital_account()
         self.adyen.client.http_client.request.assert_called_once_with(
             'GET',
             'https://balanceplatform-api-test.adyen.com/btl/{}/grants'.format(settings.API_CAPITAL_VERSION),