fix owner_condition() invoke; add 2 test cases for owner_condition()

zhangchunlin · zhangchunlin · commit 85534ca6d066 · 2019-10-10T16:08:42.000+08:00
diff --git a/tests/demo/apps/apijson_demo/dbinit.py b/tests/demo/apps/apijson_demo/dbinit.py
@@ -83,6 +83,13 @@
 ]
 
 comment_list = [
+    {
+        "username" : "admin",
+        "to_username" : "userb",
+        "moment_id" : 1,
+        "date" : "2018-11-1",
+        "content" : "comment from admin",
+    },
     {
         "username" : "usera",
         "to_username" : "userb",
diff --git a/tests/demo/apps/apijson_demo/models.py b/tests/demo/apps/apijson_demo/models.py
@@ -16,6 +16,11 @@ class Moment(Model):
     content = Field(TEXT)
     picture_list = Field(JSON, default=[])
 
+    @classmethod
+    def owner_condition(cls,user_id):
+        print("Moment: owner_condition")
+        return cls.c.user_id==user_id
+
 class Comment(Model):
     user_id = Reference("user")
     to_id = Reference("user")
diff --git a/tests/test.py b/tests/test.py
@@ -157,6 +157,18 @@ def test_apijson_get():
     >>> print(d)
     {'code': 400, 'msg': "'publicnotice' cannot filter with owner"}
 
+    >>> #query one with OWNER which will use owner_condition() to filter
+    >>> data ='''{
+    ... "moment":{
+    ...         "@role":"OWNER"
+    ...     }
+    ... }'''
+    >>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("usera"), middlewares=[])
+    Moment: owner_condition
+    >>> d = json_loads(r.data)
+    >>> print(d)
+    {'code': 200, 'msg': 'success', 'moment': {'user_id': 2, 'date': '2018-11-01 00:00:00', 'content': 'test moment', 'picture_list': '[]', 'id': 1}}
+
     >>> #query one with UNKNOWN
     >>> data ='''{
     ... "publicnotice":{
@@ -427,6 +439,20 @@ def test_apijson_get():
     >>> print(d)
     {'code': 200, 'msg': 'success', '[]': [{'comment': {'user_id': 1, 'to_id': 3, 'moment_id': 1, 'date': '2018-11-01 00:00:00', 'content': 'comment from admin', 'id': 1}}]}
 
+    >>> #query array with OWNER, the model using owner_condition
+    >>> data ='''{
+    ...    "[]":{
+    ...         "moment": {
+    ...             "@role":"OWNER"
+    ...         }
+    ...    }
+    ... }'''
+    >>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("usera"), middlewares=[])
+    Moment: owner_condition
+    >>> d = json_loads(r.data)
+    >>> print(d)
+    {'code': 200, 'msg': 'success', '[]': [{'moment': {'user_id': 2, 'date': '2018-11-01 00:00:00', 'content': 'test moment', 'picture_list': '[]', 'id': 1}}]}
+
     >>> #Association query: Two tables, one to one,ref path is absolute path
     >>> data ='''{
     ...     "moment":{},
diff --git a/uliweb_apijson/apijson/views.py b/uliweb_apijson/apijson/views.py
@@ -189,7 +189,7 @@ def _get_array(self,key):
     def _filter_owner(self,model,model_setting,q):
         owner_filtered = False
         if hasattr(model,"owner_condition"):
-            q = q.filter(model.owner_condition())
+            q = q.filter(model.owner_condition(request.user.id))
             owner_filtered = True
         if not owner_filtered:
             user_id_field = model_setting.get("user_id_field")

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,13 @@`
`83`	`83`	`]`
`84`	`84`
`85`	`85`	`comment_list = [`
	`86`	`+ {`
	`87`	`+ "username" : "admin",`
	`88`	`+ "to_username" : "userb",`
	`89`	`+ "moment_id" : 1,`
	`90`	`+ "date" : "2018-11-1",`
	`91`	`+ "content" : "comment from admin",`
	`92`	`+ },`
`86`	`93`	`{`
`87`	`94`	`"username" : "usera",`
`88`	`95`	`"to_username" : "userb",`