From 8f4ffa31e7ffea0b43d23ff6c662a223da0ff7b8 Mon Sep 17 00:00:00 2001 From: Chi Lo Date: Tue, 21 Jan 2020 11:48:43 -0800 Subject: [PATCH] Fixed multiple criteria search using metadata and user as filter This patch fixes the search issue when listing customer with multiple search criteria using metadata and user parameter as filter. Change-Id: Ida44ea79df1d1a7186f939b1470f7da52d3cee23 --- .../cms_rest/data/sql_alchemy/customer_record.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/orm/services/customer_manager/cms_rest/data/sql_alchemy/customer_record.py b/orm/services/customer_manager/cms_rest/data/sql_alchemy/customer_record.py index 6cb6d555..34dcf6bd 100755 --- a/orm/services/customer_manager/cms_rest/data/sql_alchemy/customer_record.py +++ b/orm/services/customer_manager/cms_rest/data/sql_alchemy/customer_record.py @@ -1,7 +1,5 @@ from builtins import int -from sqlalchemy import func - from orm.services.customer_manager.cms_rest.data.sql_alchemy.models import (CmsUser, Customer, CustomerMetadata, CustomerRegion, Region, UserRole) @@ -135,8 +133,7 @@ class CustomerRecord: if metadata: query = query.join(CustomerMetadata).filter( *self._build_meta_query(metadata)).group_by( - CustomerMetadata.customer_id).having( - func.count() == len(metadata)) + CustomerMetadata.customer_id) if starts_with: query = query.filter(