summaryrefslogtreecommitdiffstats
path: root/cvp/opnfv_testapi/resources/handlers.py
diff options
context:
space:
mode:
authorgrakiss <grakiss.wanglei@huawei.com>2017-10-18 22:15:32 -0400
committerLeo wang <grakiss.wanglei@huawei.com>2017-10-20 03:29:26 +0000
commit54bc0f28fd9b5ec6675401d6c3322b30e72e7d9c (patch)
treec203b151a705b53eb85e15af6ac62169857a2603 /cvp/opnfv_testapi/resources/handlers.py
parent4f2c6191c68567e3fd7ee7e8bcb737c3194fbb2e (diff)
[web-cvp]share result by email
JIRA: DOVETAIL-529 It may be easier to get other people's email than his user id Change-Id: Ia5f9aa72d3c79bd3f5e69dad98b3f188cdaafc3d Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
Diffstat (limited to 'cvp/opnfv_testapi/resources/handlers.py')
-rw-r--r--cvp/opnfv_testapi/resources/handlers.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/cvp/opnfv_testapi/resources/handlers.py b/cvp/opnfv_testapi/resources/handlers.py
index 17a7e359..51092b94 100644
--- a/cvp/opnfv_testapi/resources/handlers.py
+++ b/cvp/opnfv_testapi/resources/handlers.py
@@ -59,6 +59,7 @@ class GenericApiHandler(web.RequestHandler):
raises.BadRequest(message.must_int(key))
return value
+ @gen.coroutine
def set_query(self):
query = dict()
date_range = dict()
@@ -76,13 +77,17 @@ class GenericApiHandler(web.RequestHandler):
date_range.update({'$lt': str(v)})
elif k == 'signed':
openid = self.get_secure_cookie(auth_const.OPENID)
+ user = yield dbapi.db_find_one("users", {'openid': openid})
role = self.get_secure_cookie(auth_const.ROLE)
logging.info('role:%s', role)
if role:
if role.find("reviewer") != -1:
query['$or'] = [{"shared":
- {"$elemMatch": {"$eq": openid}}
- }, {"owner": openid},
+ {"$elemMatch": {"$eq": openid}}},
+ {"owner": openid},
+ {"shared": {"$elemMatch":
+ {"$eq":
+ user.get("email")}}},
{"status": {"$ne": "private"}}]
else:
query['$or'] = [{"shared":
@@ -99,7 +104,7 @@ class GenericApiHandler(web.RequestHandler):
query['start_date'].update({'$lt': str(datetime.now())})
logging.debug("query:%s", query)
- return query
+ raise gen.Return((query))
def prepare(self):
if self.request.method != "GET" and self.request.method != "DELETE":
@@ -178,9 +183,10 @@ class GenericApiHandler(web.RequestHandler):
raise gen.Return((True, 'Data alreay exists. %s' % (query)))
raise gen.Return((False, 'Data does not exist. %s' % (query)))
- @web.asynchronous
+ # @web.asynchronous
@gen.coroutine
def _list(self, query=None, res_op=None, *args, **kwargs):
+ logging.debug("_list query:%s", query)
sort = kwargs.get('sort')
page = kwargs.get('page', 0)
last = kwargs.get('last', 0)