Merge pull request #54 from postatum/96310712_count_error

Fix apply_privacy wrapper

nefertari/wrappers.py

@@ -157,7 +157,7 @@ def __call__(self, **kwargs):
             return result
         data = result.get('data', result)
 
-        if data:
+        if data and isinstance(data, (dict, list)):
             self.is_admin = kwargs.get('is_admin')
             if self.is_admin is None:
                 user = getattr(self.request, 'user', None)

tests/test_wrappers.py

@@ -216,6 +216,14 @@ def test_apply_privacy_not_dict(self, mock_eng):
             result='foo', is_admin=True)
         assert filtered == 'foo'
 
+    @patch('nefertari.wrappers.engine')
+    def test_apply_privacy_nested_data_not_dict(self, mock_eng):
+        request = Mock(user=Mock())
+        assert wrappers.apply_privacy(request)(
+            result={'data': 'foo'}, is_admin=True) == {'data': 'foo'}
+        assert wrappers.apply_privacy(request)(
+            result={'data': 1}, is_admin=True) == {'data': 1}
+
     @patch('nefertari.wrappers.engine')
     def test_apply_privacy_item_admin_calculated(self, mock_eng):
         document_cls = Mock(