From f6a2ddbd77c16a88e97c03ffbbb97e819ed5373e Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Tue, 19 Jun 2018 12:45:49 -0400
Subject: [PATCH] Fetch requests from requests-queue

---
 atst/app.py                  |  6 +++++-
 atst/handler.py              |  2 +-
 atst/handlers/request.py     | 21 +++++++++++++++++++--
 atst/handlers/request_new.py |  2 +-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/atst/app.py b/atst/app.py
index aa5d6f9c..22ec12bb 100644
--- a/atst/app.py
+++ b/atst/app.py
@@ -34,7 +34,11 @@ def make_app(config, deps, **kwargs):
             {"page": "workspaces", "authz_client": deps["authz_client"]},
             name="workspaces",
         ),
-        url(r"/requests", Request, {"page": "requests"}, name="requests"),
+        url(
+            r"/requests",
+            Request,
+            {"page": "requests", 'requests_client': deps['requests_client']},
+            name="requests"),
         url(
             r"/requests/new",
             RequestNew,
diff --git a/atst/handler.py b/atst/handler.py
index afe80fa8..011ae3e6 100644
--- a/atst/handler.py
+++ b/atst/handler.py
@@ -26,7 +26,7 @@ class BaseHandler(tornado.web.RequestHandler):
 
     def get_current_user(self):
         if self.get_secure_cookie('atst'):
-            return True
+            return '9cb348f0-8102-4962-88c4-dac8180c904c'
         else:
             return False
 
diff --git a/atst/handlers/request.py b/atst/handlers/request.py
index 9ce3da34..50d89e57 100644
--- a/atst/handlers/request.py
+++ b/atst/handlers/request.py
@@ -28,10 +28,27 @@ mock_requests = [
         },
         ]
 
+def map_request(request):
+    return {
+        'order_id': request['id'],
+        'is_new': False,
+        'status': 'Pending',
+        'app_count': 1,
+        'is_new': False,
+        'date': '',
+        'full_name': 'Richard Howard'
+    }
+
 class Request(BaseHandler):
-    def initialize(self, page):
+    def initialize(self, page, requests_client):
         self.page = page
+        self.requests_client = requests_client
 
     @tornado.web.authenticated
+    @tornado.gen.coroutine
     def get(self):
-        self.render('requests.html.to', page = self.page, requests = mock_requests )
+        response = yield self.requests_client.get(
+            '/requests?creator_id={}'.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 97457ac5..2da23641 100644
--- a/atst/handlers/request_new.py
+++ b/atst/handlers/request_new.py
@@ -94,7 +94,7 @@ class RequestNew(BaseHandler):
     @tornado.gen.coroutine
     def create_or_update_request(self, form_data, request_id=None):
         request_data = {
-            'creator_id': '9cb348f0-8102-4962-88c4-dac8180c904c',
+            'creator_id': self.get_current_user(),
             'request': form_data
         }
         if request_id: