hola-server 0.3.10 → 0.3.13

package/db/entity.js

@@ -635,10 +635,11 @@ class Entity {
         //check all the ref by array first
         const has_refer_by_array = await this.check_refer_entity(id_array);
         if (has_refer_by_array.length > 0) {
+            const array = [...new Set(has_refer_by_array)];
             if (is_log_error()) {
-                log_error(LOG_ENTITY, "has_refer_by_array:" + JSON.stringify(has_refer_by_array));
+                log_error(LOG_ENTITY, "has_refer_by_array:" + JSON.stringify(array));
             }
-            return { code: HAS_REF, err: has_refer_by_array };
+            return { code: HAS_REF, err: array };
         }
 
         if (this.meta.delete) {
@@ -667,9 +668,7 @@ class Entity {
                 const ref_field = ref_fields[j];
                 if (ref_field.delete == DELETE_MODE.cascade) {
                     const refer_by_entity = new Entity(ref_by_meta);
-                    for (let j = 0; j < id_array.length; j++) {
-                        await refer_by_entity.delete_refer_entity(this.meta.collection, id_array[j])
-                    }
+                    await refer_by_entity.delete_refer_entity(ref_field.name, id_array)
                 }
             }
         }
@@ -818,16 +817,23 @@ class Entity {
             for (let j = 0; j < ref_fields.length; j++) {
                 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], {});
-                        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 attr = {};
+                    if (ref_by_meta.ref_label) {
+                        attr[ref_by_meta.ref_label] = 1;
+                    }
+
+                    const entities = await refer_by_entity.get_refer_entities(ref_field.name, id_array, attr);
+                    if (entities && entities.length > 0) {
+                        if (ref_field.delete == DELETE_MODE.cascade) {
+                            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 {
+                            if (ref_by_meta.ref_label) {
+                                has_refer_by_array.push(...entities.map(o => this.meta.collection + "<-" + ref_by_meta.collection + ":" + o[ref_by_meta.ref_label]));
                             } else {
-                                has_refer_by_array.push(id_array[j]);
+                                has_refer_by_array.push(...entities.map(o => this.meta.collection + "<-" + ref_by_meta.collection + ":" + o["_id"] + ""));
                             }
                         }
                     }
@@ -839,34 +845,23 @@ class Entity {
 
     /**
      * check whether this entity has refered the entity_id value
-     * @param {entity collection} entity_name 
-     * @param {entity object id} entity_id 
+     * @param {entity in this field name} field_name 
+     * @param {entity object id array} id_array 
      * @returns true if has refered
      */
-    async get_refer_entities(entity_name, entity_id, attr) {
-        const array = [];
-        if (this.meta.ref_fields) {
-            const fields = this.meta.ref_fields.filter(f => f.ref === entity_name);
-            if (fields.length > 0) {
-                for (let i = 0; i < fields.length; i++) {
-                    const field = fields[i];
-                    const query = { [field.name]: entity_id + "" };
-                    const founed = await this.find(query, attr);
-                    array.push(...founed);
-                }
-            }
-        }
-        return array;
+    async get_refer_entities(field_name, id_array, attr) {
+        console.log(id_array);
+        const query = { [field_name]: { "$in": id_array } };
+        return await this.find(query, attr);
     }
 
     /**
-     * delete the ref entity
-     * @param {entity collection} entity_name 
-     * @param {entity object id} entity_id 
-     * @returns 
+     * delete refer entities
+     * @param {entity in this field name} field_name 
+     * @param {entity object id array} id_array 
      */
-    async delete_refer_entity(entity_name, entity_id) {
-        const entities = await this.get_refer_entities(entity_name, entity_id, {});
+    async delete_refer_entity(field_name, id_array) {
+        const entities = await this.get_refer_entities(field_name, id_array, {});
         await this.delete_entity(entities.map(o => o._id + ""));
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hola-server",
-  "version": "0.3.10",
+  "version": "0.3.13",
   "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, ["role_delete_seven<-user_entity_delete_seven:user1", "role_delete_seven<-user_entity_delete_seven:user2"]);
 
                 const result4 = await role_entity.delete_entity([db_role2["_id"] + ""]);
                 strictEqual(result4.code, SUCCESS);