hola-server 0.5.1 → 0.5.2

package/db/entity.js

@@ -128,7 +128,7 @@ class Entity {
                         const refer_entity = new Entity(get_entity_meta(search_field.ref));
                         const oids = await refer_entity.find_by_ref_value(value, { _id: 1 }, this.meta.collection);
                         if (oids.length > 0) {
-                            and_array.push({ [search_field.name]: { "$all": oids.map(o => o._id + "") } });
+                            and_array.push({ [search_field.name]: { "$in": oids.map(o => o._id + "") } });
                         }
                     } else {
                         and_array.push(parse_search_value(search_field.name, search_field.type, value));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hola-server",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "a meta programming framework used to build nodejs restful api",
   "main": "index.js",
   "scripts": {

package/router/read.js

@@ -44,13 +44,22 @@ const init_read_router = function (router, meta) {
         }
 
         const param_obj = req.body;
+
         if (meta.user_field) {
             const [user_field] = meta.fields.filter(f => f.name == meta.user_field);
-            const user_ids = user_field && user_field.group == true ? get_session_user_groups(req) : [get_session_userid(req)];
-            if (user_ids == null) {
-                throw new Error("no user or user group is found in session");
+            if (user_field && user_field.group == true) {
+                const user_ids = get_session_user_groups(req);
+                if (user_ids == null) {
+                    throw new Error("no user group is found in session");
+                }
+                param_obj[meta.user_field] = user_ids;
+            } else {
+                const user_id = get_session_userid(req);
+                if (user_id == null) {
+                    throw new Error("no user id is found in session");
+                }
+                param_obj[meta.user_field] = user_id;
             }
-            param_obj[meta.user_field] = { "$in": user_ids };
         }
 
         const { code, err, total, data } = await entity.list_entity(query_params["_query"], null, param_obj);