From 0400e2c864fafa9a9607524f0ac60c87354e762e Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 23 Jul 2018 16:04:06 -0400 Subject: [PATCH] Update requests_submit --- atst/app.py | 2 +- atst/handlers/request_submit.py | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/atst/app.py b/atst/app.py index 64e87e56..922b2ca7 100644 --- a/atst/app.py +++ b/atst/app.py @@ -92,7 +92,7 @@ def make_app(config, deps, **kwargs): url( r"/requests/submit/(\S+)", RequestsSubmit, - {"requests_client": deps["requests_client"]}, + {"db_session": deps["db_session"]}, name="requests_submit", ), # Dummy request/approval screen diff --git a/atst/handlers/request_submit.py b/atst/handlers/request_submit.py index f4d19b3d..ff27803b 100644 --- a/atst/handlers/request_submit.py +++ b/atst/handlers/request_submit.py @@ -1,29 +1,19 @@ import tornado from atst.handler import BaseHandler +from atst.domain.requests import Requests class RequestsSubmit(BaseHandler): - def initialize(self, requests_client): - self.requests_client = requests_client + def initialize(self, db_session): + self.requests_repo = Requests(db_session) @tornado.web.authenticated @tornado.gen.coroutine def post(self, request_id): - yield self.requests_client.post( - "/requests/{}/submit".format(request_id), - allow_nonstandard_methods=True - ) - approved = yield self._check_approved(request_id) - if approved: + request = self.requests_repo.get(request_id) + request = yield self.requests_repo.submit(request) + if request.status == "approved": self.redirect("/requests?modal=True") else: self.redirect("/requests") - - @tornado.gen.coroutine - def _check_approved(self, request_id): - response = yield self.requests_client.get( - "/requests/{}".format(request_id) - ) - status = response.json.get("status") - return status == "approved"