add association query one to many support

zhangchunlin · zhangchunlin · commit 9b5d0e120781 · 2019-09-06T22:30:54.000+08:00
diff --git a/demo/apps/apijson_demo/views.py b/demo/apps/apijson_demo/views.py
@@ -122,6 +122,17 @@ def index():
         "email$":"%local%"
     }
   }
+}''',
+        },
+        {
+            "label":"Array query: association query one to many",
+            "value":'''{
+    "moment": {},
+    "[]": {
+        "comment": {
+            "moment_id@": "moment/id"
+        }
+    }
 }''',
         },
         {
diff --git a/uliweb_apijson/apijson/views.py b/uliweb_apijson/apijson/views.py
@@ -55,6 +55,8 @@ def get(self):
                     rsp = self._get_one(key)
                 if rsp: return rsp
             self._apply_vars()
+        except UliwebError as e:
+            return json({"code":400,"msg":str(e)})
         except Exception as e:
             err = "exception when handling 'apijson get': %s"%(e)
             log.error(err)
@@ -230,6 +232,20 @@ def _get_array(self,key):
 
         model_expr = model_param.get("@expr")
 
+        #update reference
+        ref_fields = []
+        refs = {}
+        for n in model_param:
+            if n[-1]=="@":
+                ref_fields.append(n)
+                col_name = n[:-1]
+                path = model_param[n]
+                refs[col_name] = self._ref_get(path)
+        if ref_fields:
+            for i in ref_fields:
+                del model_param[i]
+            model_param.update(refs)
+
         if model_expr:
             c = self._expr(model,model_param,model_expr)
             q = q.filter(c)

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,17 @@ def index():`
`122`	`122`	`"email$":"%local%"`
`123`	`123`	`}`
`124`	`124`	`}`
	`125`	`+}''',`
	`126`	`+ },`
	`127`	`+ {`
	`128`	`+ "label":"Array query: association query one to many",`
	`129`	`+ "value":'''{`
	`130`	`+ "moment": {},`
	`131`	`+ "[]": {`
	`132`	`+ "comment": {`
	`133`	`+ "moment_id@": "moment/id"`
	`134`	`+ }`
	`135`	`+ }`
`125`	`136`	`}''',`
`126`	`137`	`},`
`127`	`138`	`{`