From 7b55e1bc54c3b5239802c610863804953f9b69c8 Mon Sep 17 00:00:00 2001 From: gecong1973 Date: Wed, 28 Nov 2018 19:36:22 -0800 Subject: [PATCH] Add client search for sql The patch add client search Change-Id: I7c785a5e0d097b7084a6534ea6052298d751f0ad --- freezer_api/db/sqlalchemy/api.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/freezer_api/db/sqlalchemy/api.py b/freezer_api/db/sqlalchemy/api.py index ee0196dd..0e53bca7 100644 --- a/freezer_api/db/sqlalchemy/api.py +++ b/freezer_api/db/sqlalchemy/api.py @@ -372,7 +372,6 @@ def filter_tuple_by_search_opt(tuples, search=None): def get_client(user_id, project_id=None, client_id=None, offset=0, limit=100, search=None): - search = search or {} clients = [] session = get_db_session() with session.begin(): @@ -401,6 +400,13 @@ def get_client(user_id, project_id=None, client_id=None, offset=0, u'description': client.description} clients.append(clientmap) + # If search opt is wrong, filter will not work, + # return all tuples. + try: + clients = filter_tuple_by_search_opt(clients, search) + except Exception as e: + LOG.error(e) + return clients