From c94e9958275699291599a618e20b628cef33d0ee Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Thu, 6 Apr 2023 14:59:30 +0200 Subject: [PATCH] Update bank done --- apimanager/accountlist/views.py | 4 ++-- apimanager/apimanager/settings.py | 7 +++---- apimanager/banklist/views.py | 2 +- apimanager/banks/views.py | 6 +++--- apimanager/base/views.py | 2 +- apimanager/obp/views.py | 2 +- apimanager/systemviews/views.py | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/apimanager/accountlist/views.py b/apimanager/accountlist/views.py index fc5e5a7..08fa42a 100644 --- a/apimanager/accountlist/views.py +++ b/apimanager/accountlist/views.py @@ -27,7 +27,7 @@ class AccountListView(IndexAccountsView, LoginRequiredMixin, FormView ): #self.bankids = self.get_banks() accounts_list = [] #for bank_id in self.bankids: - urlpath = 'v5.1.0/my/accounts' + urlpath = '/my/accounts' result = api.get(urlpath) if 'accounts' in result: accounts_list.extend(result['accounts']) @@ -55,7 +55,7 @@ class ExportCsvView(LoginRequiredMixin, View): self.bankids = get_banks(self.request) accounts_list = [] for bank_id in self.bankids: - urlpath = 'v5.1.0/banks/{}/accounts'.format(bank_id) + urlpath = '/banks/{}/accounts'.format(bank_id) result = api.get(urlpath) if 'accounts' in result: accounts_list.extend(result['accounts']) diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py index fff6f3d..030a73f 100644 --- a/apimanager/apimanager/settings.py +++ b/apimanager/apimanager/settings.py @@ -260,7 +260,7 @@ API_EXPLORER_HOST = 'http://127.0.0.1:8082' # Only override this if you have a separate portal instance API_PORTAL = API_HOST API_BASE_PATH = '/obp/' -#API_VERSION = '5.1.0' +API_VERSION = '5.1.0' # URL to API Tester API_TESTER_URL = 'https://www.example.com' @@ -320,10 +320,9 @@ except ImportError: # Settings here might use parts overwritten in local settings #API_ROOT = API_HOST + API_BASE_PATH + API_VERSION -API_ROOT = API_HOST + API_BASE_PATH +API_ROOT = API_HOST + API_BASE_PATH + API_VERSION # For some reason, swagger is not available at the latest API version -#API_URL_SWAGGER = API_HOST + '/obp/v1.4.0/resource-docs/v' + API_VERSION + '/swagger' # noqa -API_URL_SWAGGER = API_HOST + '/obp/v1.4.0/resource-docs/v5.1.0/swagger' # noqa +API_URL_SWAGGER = API_HOST + '/obp/v1.4.0/resource-docs/v' + API_VERSION + '/swagger' # noqa if not OAUTH_CONSUMER_KEY: raise ImproperlyConfigured('Missing settings for OAUTH_CONSUMER_KEY') if not OAUTH_CONSUMER_SECRET: diff --git a/apimanager/banklist/views.py b/apimanager/banklist/views.py index 53a7fa4..1e5bbb1 100644 --- a/apimanager/banklist/views.py +++ b/apimanager/banklist/views.py @@ -23,7 +23,7 @@ class BankListView(IndexBanksView, LoginRequiredMixin, FormView ): def get_banks(self,context): api = API(self.request.session.get('obp')) try: - urlpath = 'v5.1.0/banks' + urlpath = '/banks' result = api.get(urlpath) banks_list = [] if 'banks' in result: diff --git a/apimanager/banks/views.py b/apimanager/banks/views.py index dbb7a58..46e3a25 100644 --- a/apimanager/banks/views.py +++ b/apimanager/banks/views.py @@ -44,7 +44,7 @@ class IndexBanksView(LoginRequiredMixin, FormView): def form_valid(self, form): try: data = form.cleaned_data - urlpath = 'v5.1.0/banks' + urlpath = '/banks' payload ={ "id": data["bank_id"], "bank_code": data["bank_code"], @@ -96,7 +96,7 @@ class UpdateBanksView(LoginRequiredMixin, FormView): messages.error(self.request, err) try: - urlpath = 'v5.1.0/banks/{}'.format(self.kwargs["bank_id"]) + urlpath = '/banks/{}'.format(self.kwargs["bank_id"]) result = self.api.get(urlpath) fields['bank_id'].initial = self.kwargs['bank_id'] fields['bank_code'].initial = result['bank_code'] @@ -116,7 +116,7 @@ class UpdateBanksView(LoginRequiredMixin, FormView): def form_valid(self, form): data = form.cleaned_data print("data is:", data) - urlpath = 'v5.1.0/banks' + urlpath = '/banks' payload ={ "id": data["bank_id"], "bank_code": data["bank_code"], diff --git a/apimanager/base/views.py b/apimanager/base/views.py index f326f39..3c16892 100644 --- a/apimanager/base/views.py +++ b/apimanager/base/views.py @@ -12,7 +12,7 @@ from obp.api import API, APIError def get_banks(request): api = API(request.session.get('obp')) try: - urlpath = 'v5.1.0/banks' + urlpath = '/banks' result = api.get(urlpath) if 'banks' in result: return [bank['id'] for bank in sorted(result['banks'], key=lambda d: d['id'])] diff --git a/apimanager/obp/views.py b/apimanager/obp/views.py index 80ae0dd..8130bce 100644 --- a/apimanager/obp/views.py +++ b/apimanager/obp/views.py @@ -29,7 +29,7 @@ class LoginToDjangoMixin(object): # Here, we already get the Token for the api call. api = API(self.request.session.get('obp')) try: - data = api.get('v5.1.0/users/current') + data = api.get('/users/current') except APIError as err: messages.error(self.request, err) except Exception as err: diff --git a/apimanager/systemviews/views.py b/apimanager/systemviews/views.py index 8e86bf0..d247479 100644 --- a/apimanager/systemviews/views.py +++ b/apimanager/systemviews/views.py @@ -23,7 +23,7 @@ class SystemView(LoginRequiredMixin, FormView): api = API(self.request.session.get('obp')) try: system_view = [] - urlpath = 'v5.1.0/system-views/owner' + urlpath = '/system-views/owner' result = api.get(urlpath) system_view = result except APIError as err: