Fix INF-378 inventory subscription filter not take effect as expected

[pti/o2.git] / o2common / views / route.py

diff --git a/o2common/views/route.py b/o2common/views/route.py
index 2c93d77..9776458 100644 (file)
--- a/o2common/views/route.py
+++ b/o2common/views/route.py
@@ -30,6 +30,8 @@ from flask_restx.model import Model
 from flask_restx.fields import List, Nested, String
 from flask_restx.utils import unpack
 
+from o2common.views.route_exception import BadRequestException
+
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
 
@@ -96,8 +98,8 @@ class o2_marshal_with(marshal_with):
 
             req_args = request.args
             mask = self._gen_mask_from_selector(**req_args)
-
-            # mask = self.mask
+            if mask == '':
+                mask = self.mask
 
             # if has_request_context():
             # mask_header = current_app.config["RESTX_MASK_HEADER"]
@@ -127,44 +129,31 @@ class o2_marshal_with(marshal_with):
     def _gen_mask_from_selector(self, **kwargs) -> str:
         mask_val = ''
         if 'all_fields' in kwargs:
-            all_fields_without_space = kwargs['all_fields'].replace(" ", "")
-            all_fields = all_fields_without_space.lower()
-            if 'true' == all_fields:
-                mask_val = ''
+            all_fields_without_space = kwargs['all_fields'].strip()
+            logger.debug('all_fields selector value is {}'.format(
+                all_fields_without_space))
+            selector = self.__gen_selector_from_model_with_value(
+                self.fields)
+            mask_val = self.__gen_mask_from_selector(selector)
 
         elif 'fields' in kwargs and kwargs['fields'] != '':
-            fields_without_space = kwargs['fields'].replace(" ", "")
-
-            # filters = fields_without_space.split(',')
-
-            # mask_val_list = []
-            # for f in filters:
-            #     if '/' in f:
-            #         a = self.__gen_mask_tree(f)
-            #         mask_val_list.append(a)
-            #         continue
-            #     mask_val_list.append(f)
-            # mask_val = '{%s}' % ','.join(mask_val_list)
+            fields_without_space = kwargs['fields'].strip()
             selector = {}
-
             self.__update_selector_value(selector, fields_without_space, True)
-
+            self.__set_default_mask(selector)
             mask_val = self.__gen_mask_from_selector(selector)
 
         elif 'exclude_fields' in kwargs and kwargs['exclude_fields'] != '':
-            exclude_fields_without_space = kwargs['exclude_fields'].replace(
-                " ", "")
-
+            exclude_fields_without_space = kwargs['exclude_fields'].strip()
             selector = self.__gen_selector_from_model_with_value(
                 self.fields)
-
             self.__update_selector_value(
                 selector, exclude_fields_without_space, False)
-
+            self.__set_default_mask(selector)
             mask_val = self.__gen_mask_from_selector(selector)
+
         elif 'exclude_default' in kwargs and kwargs['exclude_default'] != '':
-            exclude_default_without_space = kwargs['exclude_default'].replace(
-                " ", "")
+            exclude_default_without_space = kwargs['exclude_default'].strip()
             exclude_default = exclude_default_without_space.lower()
             if 'true' == exclude_default:
                 mask_val = '{}'
@@ -200,14 +189,18 @@ class o2_marshal_with(marshal_with):
             selector[i] = default_val
         return selector
 
-    def __update_selector_value(self, default_selector: dict, filter: str,
+    def __update_selector_value(self, selector: dict, filter: str,
                                 val: bool):
         fields = filter.split(',')
         for f in fields:
+            f = f.strip()
             if '/' in f:
-                self.__update_selector_tree_value(default_selector, f, val)
+                self.__update_selector_tree_value(selector, f, val)
                 continue
-            default_selector[f] = val
+            if f not in self.fields:
+                raise BadRequestException(
+                    'Selector attribute {} not found'.format(f))
+            selector[f] = val
 
     def __update_selector_tree_value(self, m: dict, filter: str, val: bool):
         filter_list = filter.split('/', 1)
@@ -230,3 +223,14 @@ class o2_marshal_with(marshal_with):
                 mask_li.append(k)
 
         return '{%s}' % ','.join(mask_li)
+
+    def __set_default_mask(self, selector: dict, val: bool = True):
+        mask = getattr(self.fields, "__mask__")
+        if not mask:
+            selector_all = self.__gen_selector_from_model_with_value(
+                self.fields)
+            for s in selector_all:
+                selector[s] = val
+            return
+        default_selector = str(mask).strip(' {}')
+        self.__update_selector_value(selector, default_selector, val)