From f960c88209c78bc4075de70a10231552748dbff9 Mon Sep 17 00:00:00 2001 From: Timur Sufiev Date: Tue, 8 Apr 2014 20:05:46 +0400 Subject: [PATCH] Remove hardcoded foreign keys from db.catalog.api Change-Id: Icc5af337c7aa9621bd8b557be8b87413c053be88 --- muranoapi/db/catalog/api.py | 39 ++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/muranoapi/db/catalog/api.py b/muranoapi/db/catalog/api.py index 040b59ec..b82d31c6 100644 --- a/muranoapi/db/catalog/api.py +++ b/muranoapi/db/catalog/api.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from sqlalchemy import inspection from sqlalchemy import or_ from sqlalchemy.orm import attributes from sqlalchemy import sql @@ -279,27 +280,29 @@ def package_search(filters, context): query = query.filter(pkg.fully_qualified_name == filters['fqn']) if 'search' in filters.keys(): - fk_fields = {'categories': 'Category', - 'tags': 'Tag', - 'class_definitions': 'Class'} conditions = [] + search_str = filters['search'] + for delimiter in ',;': + search_str = search_str.replace(delimiter, ' ') + key_words = ['%{0}%'.format(word) for word in search_str.split()] + relationships = inspection.inspect(pkg).relationships - for attr in dir(pkg): - if attr.startswith('_'): - continue - if isinstance(getattr(pkg, attr), - attributes.InstrumentedAttribute): - search_str = filters['search'] - for delim in ',;': - search_str = search_str.replace(delim, ' ') - for key_word in search_str.split(): - _word = '%{value}%'.format(value=key_word) - if attr in fk_fields.keys(): - condition = getattr(pkg, attr).any( - getattr(models, fk_fields[attr]).name.like(_word)) + searchable_attrs = set([ + 'fully_qualified_name', 'author', 'name', 'description', 'tags', + 'categories', 'class_definitions']) + searchable_pkg_attrs = set(dir(pkg)) & searchable_attrs + + for attr_name in searchable_pkg_attrs: + attr = getattr(pkg, attr_name) + if isinstance(attr, attributes.InstrumentedAttribute): + if attr_name in relationships: + model = relationships[attr_name].mapper.class_ + for key_word in key_words: + condition = attr.any(model.name.like(key_word)) conditions.append(condition) - else: - conditions.append(getattr(pkg, attr).like(_word)) + else: + for key_word in key_words: + conditions.append(attr.like(key_word)) query = query.filter(or_(*conditions)) sort_keys = filters.get('order_by', []) or ['created']