add association query support for single record query, only absolute ref path now

zhangchunlin · zhangchunlin · commit d746fb22d27d · 2019-09-06T21:16:51.000+08:00
diff --git a/demo/apps/apijson_demo/settings.ini b/demo/apps/apijson_demo/settings.ini
@@ -4,6 +4,15 @@ comment = 'apijson_demo.models.Comment'
 moment = 'apijson_demo.models.Moment'
 
 [APIJSON_MODELS]
+user = {
+    "user_id_field" : "id",
+    "secret_fields" : ["password"],
+    "GET" : { "roles" : ["LOGIN","ADMIN","OWNER"] },
+    "HEAD" : { "roles" : ["LOGIN","ADMIN","OWNER"] },
+    "POST" : { "roles" : ["ADMIN"] },
+    "PUT" : { "roles" : ["ADMIN","OWNER"] },
+    "DELETE" : { "roles" : ["ADMIN"] },
+}
 moment = {
     "user_id_field" : "user_id",
     "GET" : { "roles" : ["OWNER","LOGIN","ADMIN"] },
diff --git a/demo/apps/apijson_demo/views.py b/demo/apps/apijson_demo/views.py
@@ -30,24 +30,34 @@ def index():
         {
             "label":"Single record query: @column",
             "value":'''{
-   "user":{
+    "user":{
        "@column": "id,username,email",
        "@role":"OWNER"
-   }
+    }
 }''',
         },
         {
-            "label":"Array query: user",
+            "label":"Single record query: association query",
             "value":'''{
-  "[]":{
-    "@count":2,
-    "@page":0,
+    "moment":{},
     "user":{
-        "@column":"id,username,nickname,email",
-        "@order":"id-",
-        "@role":"ADMIN"
+       "@column": "id,username,email",
+       "id@": "moment/user_id"
+    }
+}''',
+        },
+        {
+            "label":"Array query: user",
+            "value":'''{
+     "[]":{
+        "@count":2,
+        "@page":0,
+        "user":{
+            "@column":"id,username,nickname,email",
+            "@order":"id-",
+            "@role":"ADMIN"
+        }
     }
-  }
 }''',
         },
         {
@@ -112,6 +122,21 @@ def index():
         "email$":"%local%"
     }
   }
+}''',
+        },
+        {
+            "label":"Array query: association query",
+            "value":'''{
+  "[]": {
+    "moment": {
+      "@column": "id,date,user_id",
+      "id": 3
+    },
+    "user": {
+      "id@": "/moment/user_id",
+      "@column": "id,username"
+    }
+  }
 }''',
         },
     ]
diff --git a/uliweb_apijson/apijson/views.py b/uliweb_apijson/apijson/views.py
@@ -3,6 +3,7 @@
 from uliweb.orm import ModelNotFound
 from sqlalchemy.sql import and_, or_, not_
 from json import loads
+from collections import OrderedDict
 import logging
 import traceback
 
@@ -18,7 +19,9 @@ def __begin__(self):
         self.vars = {}
 
         try:
-            self.request_data = loads(request.data)
+            #https://blog.csdn.net/yockie/article/details/44065885
+            #keep order when parse json, because the order matters for association query
+            self.request_data = loads(request.data, object_pairs_hook=OrderedDict)
         except Exception as e:
             log.error("try to load json but get exception: '%s', request data: %s"%(e,request.data))
             return json({"code":400,"msg":"not json data in the request"})
@@ -31,6 +34,15 @@ def _apply_vars(self):
                 if v:
                     self.rdict[key[:-1]] = v
 
+    def _ref_get(self,path):
+        if path[0]=="/":
+            #TODO: relative path
+            pass
+        else:
+            #absolute path
+            m,c = path.split("/")
+            return self.rdict.get(m,{}).get(c)
+
     def get(self):
         try:
             for key in self.request_data:
@@ -93,6 +105,19 @@ def _get_one(self,key):
 
         params = self.request_data[key]
         if isinstance(params,dict):
+            #update reference,example: {"id@": "moment/user_id"} -> {"id": 2}
+            ref_fields = []
+            refs = {}
+            for n in params:
+                if n[-1]=="@":
+                    ref_fields.append(n)
+                    col_name = n[:-1]
+                    path = params[n]
+                    refs[col_name] = self._ref_get(path)
+            for i in ref_fields:
+                del params[i]
+            params.update(refs)
+            
             for n in params:
                 if n[0]=="@":
                     if n=="@column":
