From ef4117ae11c247062c2ca9aca7db3c1673969287 Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Tue, 19 Jun 2018 14:42:06 -0400
Subject: [PATCH] Use new requests API /users/requests endpoints

---
 atst/api_client.py           |  3 ++-
 atst/handlers/request.py     |  2 +-
 atst/handlers/request_new.py | 15 ++++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/atst/api_client.py b/atst/api_client.py
index 54b0df53..a481b363 100644
--- a/atst/api_client.py
+++ b/atst/api_client.py
@@ -40,7 +40,8 @@ class ApiClient(object):
             headers['Content-Type'] = 'application/json'
             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)
 
     def adapt_response(self, response):
diff --git a/atst/handlers/request.py b/atst/handlers/request.py
index 50d89e57..3636ae64 100644
--- a/atst/handlers/request.py
+++ b/atst/handlers/request.py
@@ -48,7 +48,7 @@ class Request(BaseHandler):
     @tornado.gen.coroutine
     def get(self):
         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']
         mapped_requests = [map_request(request) for request in requests]
         self.render('requests.html.to', page=self.page, requests=mapped_requests)
diff --git a/atst/handlers/request_new.py b/atst/handlers/request_new.py
index 92f875be..93ee57c8 100644
--- a/atst/handlers/request_new.py
+++ b/atst/handlers/request_new.py
@@ -68,8 +68,10 @@ class RequestNew(BaseHandler):
         form = None
         if request_id:
             request = yield self.get_request(request_id)
-            form_data = request['body'] if request else {}
-            form = self.screens[ int(screen) - 1 ]['form'](data=form_data)
+            if request.ok:
+                form_data = request.json['body'] if request else {}
+                form = self.screens[ int(screen) - 1 ]['form'](data=form_data)
+
         self.show_form(screen=screen, form=form, request_id=request_id)
 
     def show_form(self, screen=1, form=None, request_id=None):
@@ -85,11 +87,10 @@ class RequestNew(BaseHandler):
 
     @tornado.gen.coroutine
     def get_request(self, request_id):
-        try:
-            request = yield self.requests_client.get('/requests/{}'.format(request_id))
-        except HTTPError:
-            request = None
-        return request.json
+        request = yield self.requests_client.get(
+            '/users/{}/requests/{}'.format(self.get_current_user(), request_id),
+            raise_error=False)
+        return request
 
     @tornado.gen.coroutine
     def create_or_update_request(self, form_data, request_id=None):