From 38d8ece73b26ec48ef377cac5e2e1bba6e44634c Mon Sep 17 00:00:00 2001 From: Thais-ra Date: Fri, 23 Apr 2021 20:20:33 -0300 Subject: [PATCH] refactor: fga-eps-mds/2020.2-Lend.it#138 Refactored get requests filtered by category route Co-authored-by: Thiago Mesquita Co-authored-by: Mateus Maia --- project/api/views.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/project/api/views.py b/project/api/views.py index 117e159..136c398 100755 --- a/project/api/views.py +++ b/project/api/views.py @@ -124,13 +124,24 @@ def get_all_available_requests(): return jsonify(response), 200 -@request_blueprint.route("/requests/", methods=["GET"]) -def get_filtered_request(productcategoryid): +@request_blueprint.route("/requests/available/", methods=["GET"]) +def get_requests_filtered_by_category(productcategoryid): + usermail = request.args.get("usermail") + + today_date = datetime.now() + today_date = today_date.replace(hour=0, minute=0, second=0, microsecond=0) + today_date.isoformat() + + error_response = {"status": "fail", "message": "Request not found"} + requests = get_category_name( [ request.to_json() - for request in Request.query.filter_by( - productcategoryid=productcategoryid + for request in Request.query.filter( + Request.lender == None, + Request.requester != usermail, + Request.enddate >= today_date, + Request.productcategoryid == productcategoryid, ).all() ] )