artin/API-Manager
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Manager.git synced 2026-02-06 14:56:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114 from constantine2nd/master

Browse Source 
Improve error handling
This commit is contained in:
Simon Redfern 2020-07-17 12:58:07 +02:00 committed by GitHub
commit 3aaa676c0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apimanager/consumers/views.py
View File

@ -74,7 +74,7 @@ class IndexView(LoginRequiredMixin, TemplateView):
try:
urlpath = '/management/consumers'
consumers = api.get(urlpath)
if 'code' in consumers and consumers['code']==403:
if 'code' in consumers and consumers['code'] >= 400:
messages.error(self.request, consumers['message'])
else:
consumers = FilterEnabled(context, self.request.GET)\
@ -154,7 +154,7 @@ class DetailView(LoginRequiredMixin, FormView):
call_limits_urlpath = '/management/consumers/{}/consumer/call-limits'.format(self.kwargs['consumer_id'])
consumer_call_limtis = api.get(call_limits_urlpath)
if 'code' in consumer_call_limtis and consumer_call_limtis['code'] > 400:
if 'code' in consumer_call_limtis and consumer_call_limtis['code'] >= 400:
messages.error(self.request, "{}".format(consumer_call_limtis['message']))
else:
consumer['per_minute_call_limit'] = consumer_call_limtis['per_minute_call_limit']
@ -184,8 +184,11 @@ class EnableDisableView(LoginRequiredMixin, RedirectView):
try:
urlpath = '/management/consumers/{}'.format(kwargs['consumer_id'])
payload = {'enabled': self.enabled}
api.put(urlpath, payload)
messages.success(self.request, self.success)
response = api.put(urlpath, payload)
if 'code' in response and response['code'] >= 400:
messages.error(self.request, response['message'])
else:
messages.success(self.request, self.success)
except APIError as err:
messages.error(self.request, err)
except:

13
apimanager/entitlementrequests/views.py
View File

@ -35,7 +35,7 @@ class IndexView(LoginRequiredMixin, TemplateView):
entitlement_requests = api.get(urlpath)
if 'code' in entitlement_requests and entitlement_requests['code']>=400:
messages.error(self.request, entitlement_requests['message'])
entitlement_requests=[]
entitlement_requests = []
else:
entitlement_requests = entitlement_requests['entitlement_requests']
entitlement_requests = FilterTime(context, self.request.GET, 'created') \
@ -103,10 +103,13 @@ class AcceptEntitlementRequest(LoginRequiredMixin, View):
try:
urlpath = '/entitlement-requests/{}'.format(request.POST.get('entitlement_request_id', '<undefined>'))
api.delete(urlpath)
msg = 'Entitlement Request with role {} has been deleted.'.format(
request.POST.get('role_name', '<undefined>'))
messages.success(request, msg)
response = api.delete(urlpath)
if 'code' in response and response['code'] >= 400:
messages.error(self.request, response['message'])
else:
msg = 'Entitlement Request with role {} has been deleted.'.format(
request.POST.get('role_name', '<undefined>'))
messages.success(request, msg)
except APIError as err:
messages.error(request, err)
except: