From b751528d3f45fa14be3c50d78f955c58ad09c44f Mon Sep 17 00:00:00 2001 From: sixertoy Date: Mon, 11 Mar 2019 17:27:53 +0100 Subject: [PATCH] WIP -> PC-1622 --- sandboxes/scripts/getters/webapp_04_verso.py | 27 ++++++++++---------- sandboxes/scripts/utils/users.py | 19 ++++++++++++++ 2 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 sandboxes/scripts/utils/users.py diff --git a/sandboxes/scripts/getters/webapp_04_verso.py b/sandboxes/scripts/getters/webapp_04_verso.py index fc397ec56d..d13eaa2c84 100644 --- a/sandboxes/scripts/getters/webapp_04_verso.py +++ b/sandboxes/scripts/getters/webapp_04_verso.py @@ -1,19 +1,20 @@ -from models.user import User -from repository.user_queries import filter_webapp_users -from sandboxes.scripts.utils.helpers import get_user_helper +from repository.offer_queries import filter_offers_with_keywords_string, build_offer_search_base_query +from sandboxes.scripts.utils.helpers import get_offer_helper +from sandboxes.scripts.utils.users import get_existing_webapp_hnmm_user, get_existing_webapp_hbs_user -def get_existing_webapp_hnmm_user(): - query = filter_webapp_users(User.query) - query = query.filter(User.email.contains('has-no-more-money')) - user = query.first() +def get_offer_with_defined_name(): + result = {} + query = build_offer_search_base_query() + query = filter_offers_with_keywords_string(query, 'Dansons') + offer = query.first() return { - "user": get_user_helper(user) + "offer": get_offer_helper(offer) } -def get_existing_webapp_hbs_user(): - query = filter_webapp_users(User.query) - query = query.filter(User.email.contains('has-booked-some')) - user = query.first() +def get_hbs_user_and_offer_with_defined_name(): + userObj = get_existing_webapp_hbs_user() + offerObj = get_offer_with_defined_name() return { - "user": get_user_helper(user) + **offerObj, + **userObj } diff --git a/sandboxes/scripts/utils/users.py b/sandboxes/scripts/utils/users.py new file mode 100644 index 0000000000..4cc3381e9a --- /dev/null +++ b/sandboxes/scripts/utils/users.py @@ -0,0 +1,19 @@ +from models.user import User +from repository.user_queries import filter_webapp_users +from sandboxes.scripts.utils.helpers import get_user_helper, get_offer_helper + +def get_existing_webapp_hnmm_user(): + query = filter_webapp_users(User.query) + query = query.filter(User.email.contains('has-no-more-money')) + user = query.first() + return { + "user": get_user_helper(user) + } + +def get_existing_webapp_hbs_user(): + query = filter_webapp_users(User.query) + query = query.filter(User.email.contains('has-booked-some')) + user = query.first() + return { + "user": get_user_helper(user) + }