fix "NameError: name 'model_name' is not defined"; add 3 test cases

zhangchunlin · zhangchunlin · commit 0fb0711f8dd6 · 2019-10-10T14:21:13.000+08:00
diff --git a/tests/test.py b/tests/test.py
@@ -371,6 +371,49 @@ def test_apijson_get():
     >>> print(d)
     {'code': 400, 'msg': "page should >0, but get '-2'"}
 
+    >>> #query array with @count/@page/@query, @query bad param
+    >>> data ='''{
+    ... "[]":{
+    ...         "@count":2,
+    ...         "@page":1,
+    ...         "@query":3,
+    ...         "user": {
+    ...         }
+    ...     }
+    ... }'''
+    >>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("usera"), middlewares=[])
+    >>> d = json_loads(r.data)
+    >>> print(d)
+    {'code': 400, 'msg': "bad param 'query': 3"}
+
+    >>> #query array with @count/@page/@query, @query = 0
+    >>> data ='''{
+    ... "[]":{
+    ...         "@count":2,
+    ...         "@page":1,
+    ...         "@query":0,
+    ...         "user": {
+    ...         }
+    ...     }
+    ... }'''
+    >>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("usera"), middlewares=[])
+    >>> d = json_loads(r.data)
+    >>> print(d)
+    {'code': 200, 'msg': 'success', '[]': [{'user': {'username': 'userb', 'nickname': 'User B', 'email': 'userb@localhost', 'is_superuser': False, 'last_login': None, 'date_join': '2018-03-03 00:00:00', 'image': '', 'active': False, 'locked': False, 'deleted': False, 'auth_type': 'default', 'timezone': '', 'id': 3}}, {'user': {'username': 'userc', 'nickname': 'User C', 'email': 'userc@localhost', 'is_superuser': False, 'last_login': None, 'date_join': '2018-04-04 00:00:00', 'image': '', 'active': False, 'locked': False, 'deleted': False, 'auth_type': 'default', 'timezone': '', 'id': 4}}]}
+
+    >>> #query array with OWNER but cannot filter with OWNER
+    >>> data ='''{
+    ...    "[]":{
+    ...         "publicnotice": {
+    ...             "@role":"OWNER"
+    ...         }
+    ...    }
+    ... }'''
+    >>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("admin"), middlewares=[])
+    >>> d = json_loads(r.data)
+    >>> print(d)
+    {'code': 400, 'msg': "'publicnotice' cannot filter with owner"}
+
     >>> #Association query: Two tables, one to one,ref path is absolute path
     >>> data ='''{
     ...     "moment":{},
diff --git a/uliweb_apijson/apijson/__init__.py b/uliweb_apijson/apijson/__init__.py
@@ -153,7 +153,7 @@ def _filter_owner(self,q):
                 q = q.filter(getattr(model.c,user_id_field)==request.user.id)
                 owner_filtered = True
         if not owner_filtered:
-            raise UliwebError("'%s' cannot filter with owner"%(model_name))
+            raise UliwebError("'%s' cannot filter with owner"%(self.name))
         return q
 
     def _get_array_q(self,params):
