hola-server 0.4.1 → 0.4.3

package/db/db.js

@@ -18,7 +18,7 @@ const get_session_userid = () => {
   return req && req.session && req.session.user ? req.session.user.id : "";
 };
 
-const log_msg = (category, level, msg) => {
+const log_msg = (category, level, msg, extra) => {
   const time = format_date_time(new Date());
   const db = get_db();
   const { col_log } = get_settings().log;
@@ -27,7 +27,7 @@ const log_msg = (category, level, msg) => {
   const path = req ? req.originalUrl : "";
   const user = req && req.session && req.session.user ? req.session.user.id : "";
 
-  db.create(col_log, { time: time, category: category, level: level, msg: msg, user: user, path: path }).then(() => { });
+  db.create(col_log, { time: time, category: category, level: level, msg: msg, user: user, path: path, ...extra }).then(() => { });
 };
 
 const is_log_debug = () => {
@@ -50,27 +50,27 @@ const is_log_error = () => {
   return save_db && log_level <= LOG_LEVEL_ERROR;
 };
 
-const log_debug = (category, msg) => {
+const log_debug = (category, msg, extra) => {
   if (is_log_debug()) {
-    log_msg(category, LOG_LEVEL_DEBUG, msg);
+    log_msg(category, LOG_LEVEL_DEBUG, msg, extra);
   }
 };
 
-const log_info = (category, msg) => {
+const log_info = (category, msg, extra) => {
   if (is_log_info()) {
-    log_msg(category, LOG_LEVEL_INFO, msg);
+    log_msg(category, LOG_LEVEL_INFO, msg, extra);
   }
 };
 
-const log_warn = (category, msg) => {
+const log_warn = (category, msg, extra) => {
   if (is_log_warn()) {
-    log_msg(category, LOG_LEVEL_WARN, msg);
+    log_msg(category, LOG_LEVEL_WARN, msg, extra);
   }
 };
 
-const log_error = (category, msg) => {
+const log_error = (category, msg, extra) => {
   if (is_log_error()) {
-    log_msg(category, LOG_LEVEL_ERROR, msg);
+    log_msg(category, LOG_LEVEL_ERROR, msg, extra);
   }
 };
 

package/db/entity.js

@@ -84,7 +84,7 @@ class Entity {
                     const array = [];
                     for (let j = 0; j < value.length; j++) {
                         const v = value[j];
-                        const ref_entities = await ref_entity.find_by_ref_value(v, { "_id": 1 });
+                        const ref_entities = await ref_entity.find_by_ref_value(v, { "_id": 1 }, this.meta.collection);
 
                         if (ref_entities.length == 0) {
                             return { code: REF_NOT_FOUND, err: [field.name] };
@@ -97,7 +97,7 @@ class Entity {
                     param_obj[field.name] = array;
 
                 } else if (has_value(value)) {
-                    const ref_entities = await ref_entity.find_by_ref_value(value, { "_id": 1 });
+                    const ref_entities = await ref_entity.find_by_ref_value(value, { "_id": 1 }, this.meta.collection);
 
                     if (ref_entities.length == 0) {
                         return { code: REF_NOT_FOUND, err: [field.name] };
@@ -129,7 +129,7 @@ class Entity {
                     if (refer_field_names.includes(search_field.name)) {
                         //refer field
                         const refer_entity = new Entity(get_entity_meta(search_field.ref));
-                        const oids = await refer_entity.find_by_ref_value(value, { _id: 1 });
+                        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 + "") } });
                         }
@@ -787,7 +787,7 @@ class Entity {
      * @param {the attributes to load from db} attr 
      * @returns array of the objects that are found
      */
-    find_by_ref_value(value, attr) {
+    find_by_ref_value(value, attr, ref_by_entity) {
         let query = Array.isArray(value) ? oid_queries(value) : oid_query(value);
         if (query == null) {
             if (Array.isArray(value)) {
@@ -802,9 +802,14 @@ class Entity {
             }
         }
 
-        if (this.meta.ref_filter) {
-            query = { ...query, ...this.meta.ref_filter };
+        if (this.meta.ref_filter && ref_by_entity) {
+            if (this.meta.ref_filter[ref_by_entity]) {
+                query = { ...query, ...this.meta.ref_filter[ref_by_entity] };
+            } else if (this.meta.ref_filter["*"]) {
+                query = { ...query, ...this.meta.ref_filter["*"] };
+            }
         }
+
         return this.find(query, attr);
     }
 

package/package.json

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