From ff0a50b615a2c625c8e6e0fa7a14c324065d1eca Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 16 Jul 2018 16:55:08 -0400 Subject: [PATCH] Factor out fetch_requests --- atst/handlers/request.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/atst/handlers/request.py b/atst/handlers/request.py index 4d2e88e6..d9bec160 100644 --- a/atst/handlers/request.py +++ b/atst/handlers/request.py @@ -27,15 +27,17 @@ class Request(BaseHandler): @tornado.gen.coroutine def get(self): user = self.get_current_user() + requests = yield self.fetch_requests(user) + mapped_requests = [map_request(user, request) for request in requests] + self.render("requests.html.to", page=self.page, requests=mapped_requests) + @tornado.gen.coroutine + def fetch_requests(self, user): if "review_and_approve_jedi_workspace_request" in user["atat_permissions"]: response = yield self.requests_client.get("/requests") - requests = response.json else: response = yield self.requests_client.get( "/requests?creator_id={}".format(user["id"]) ) - requests = response.json["requests"] - mapped_requests = [map_request(user, request) for request in requests] - self.render("requests.html.to", page=self.page, requests=mapped_requests) + return response.json["requests"]