pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new requests API /users/requests endpoints

Browse Source
This commit is contained in:
richard-dds 2018-06-19 14:42:06 -04:00
parent 5d171cd2c6
commit ef4117ae11
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
atst/api_client.py
View File

@ -40,7 +40,8 @@ class ApiClient(object):
headers['Content-Type'] = 'application/json' headers['Content-Type'] = 'application/json'
kwargs['headers'] = headers kwargs['headers'] = headers
response = yield self.client.fetch(url, method=method, **kwargs) response = yield self.client.fetch(
url, method=method, **kwargs)
return self.adapt_response(response) return self.adapt_response(response)
def adapt_response(self, response): def adapt_response(self, response):

2
atst/handlers/request.py
View File

@ -48,7 +48,7 @@ class Request(BaseHandler):
@tornado.gen.coroutine @tornado.gen.coroutine
def get(self): def get(self):
response = yield self.requests_client.get( response = yield self.requests_client.get(
'/requests?creator_id={}'.format(self.get_current_user())) '/users/{}/requests'.format(self.get_current_user()))
requests = response.json['requests'] requests = response.json['requests']
mapped_requests = [map_request(request) for request in requests] mapped_requests = [map_request(request) for request in requests]
self.render('requests.html.to', page=self.page, requests=mapped_requests) self.render('requests.html.to', page=self.page, requests=mapped_requests)

13
atst/handlers/request_new.py
View File

@ -68,8 +68,10 @@ class RequestNew(BaseHandler):
form = None form = None
if request_id: if request_id:
request = yield self.get_request(request_id) request = yield self.get_request(request_id)
form_data = request['body'] if request else {} if request.ok:
form_data = request.json['body'] if request else {}
form = self.screens[ int(screen) - 1 ]['form'](data=form_data) form = self.screens[ int(screen) - 1 ]['form'](data=form_data)
self.show_form(screen=screen, form=form, request_id=request_id) self.show_form(screen=screen, form=form, request_id=request_id)
def show_form(self, screen=1, form=None, request_id=None): def show_form(self, screen=1, form=None, request_id=None):
@ -85,11 +87,10 @@ class RequestNew(BaseHandler):
@tornado.gen.coroutine @tornado.gen.coroutine
def get_request(self, request_id): def get_request(self, request_id):
try: request = yield self.requests_client.get(
request = yield self.requests_client.get('/requests/{}'.format(request_id)) '/users/{}/requests/{}'.format(self.get_current_user(), request_id),
except HTTPError: raise_error=False)
request = None return request
return request.json
@tornado.gen.coroutine @tornado.gen.coroutine
def create_or_update_request(self, form_data, request_id=None): def create_or_update_request(self, form_data, request_id=None):