hola-server 0.3.9 → 0.3.11

package/db/db.js

@@ -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 }).then(() => { });
 };
 
 const is_log_debug = () => {
@@ -124,6 +124,7 @@ const bulk_update = async (col, items, attrs) => {
     attrs.forEach(function (attr) {
       query[attr] = item[attr];
     });
+    delete item["_id"];
     bulk.find(query).upsert().update({ $set: item }, true);
   }
   return await bulk.execute();
@@ -152,6 +153,7 @@ class DB {
    */
   create(code, obj) {
     const col = this.db[code];
+    delete obj["_id"];
     return col.insert(obj, { checkKeys: false });
   }
 
@@ -168,6 +170,7 @@ class DB {
     }
 
     const col = this.db[code];
+    delete obj["_id"];
     return col.update(query, { $set: obj }, { upsert: true, multi: true });
   }
 

package/db/entity.js

@@ -819,15 +819,23 @@ class Entity {
                 const ref_field = ref_fields[j];
                 if (ref_field.delete != DELETE_MODE.keep) {
                     for (let j = 0; j < id_array.length; j++) {
-                        const entities = await refer_by_entity.get_refer_entities(this.meta.collection, id_array[j], {});
+                        const attrs = {};
+                        if (ref_by_meta.ref_label) {
+                            attrs[ref_by_meta.ref_label] = 1;
+                        }
+                        const entities = await refer_by_entity.get_refer_entities(this.meta.collection, id_array[j], attrs);
                         if (entities && entities.length > 0) {
                             if (ref_field.delete == DELETE_MODE.cascade) {
-                                const ref_id_array = await refer_by_entity.check_refer_entity(entities.map(o => o._id + ""));
-                                if (ref_id_array && ref_id_array.length > 0) {
-                                    has_refer_by_array.push(id_array[j]);
+                                const ref_array = await refer_by_entity.check_refer_entity(entities.map(o => o._id + ""));
+                                if (ref_array && ref_array.length > 0) {
+                                    has_refer_by_array.push(...ref_array);
                                 }
                             } else {
-                                has_refer_by_array.push(id_array[j]);
+                                if (ref_by_meta.ref_label) {
+                                    has_refer_by_array.push(...entities.map(o => o[ref_by_meta.ref_label]));
+                                } else {
+                                    has_refer_by_array.push(...entities.map(o => o["_id"] + ""));
+                                }
                             }
                         }
                     }

package/package.json

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

package/test/entity/delete.js

@@ -206,6 +206,7 @@ describe('Entity Delete', function () {
                 deleteable: true,
                 collection: "user_entity_delete_seven",
                 primary_keys: ["name"],
+                ref_label: "name",
                 fields: [
                     { name: "name", required: true },
                     { name: "age", type: "uint" },
@@ -259,7 +260,7 @@ describe('Entity Delete', function () {
                 const delete_ids = [db_role["_id"] + ""];
                 const result3 = await role_entity.delete_entity(delete_ids);
                 strictEqual(result3.code, HAS_REF);
-                deepStrictEqual(result3.err, delete_ids);
+                deepStrictEqual(result3.err, ["user1", "user2"]);
 
                 const result4 = await role_entity.delete_entity([db_role2["_id"] + ""]);
                 strictEqual(result4.code, SUCCESS);