add tests and fixes to ensure that memberships are removed on entity deletion.

Author: nopbyte

lib/level-storage.js

@@ -266,8 +266,55 @@ LevelStorage.prototype.updateEntityPromise = function (entity_id, entity_type, d
 //deletes the entity with the given id and all its attributes
 LevelStorage.prototype.deleteEntityPromise = function (entity_id, entity_type) {
   console.log("arguments for deleteEntity leveldb " + JSON.stringify(arguments));
-  var pk = buildEntityPk(entity_id, entity_type);
-  return deleteSomething("entities", pk, transaction(this.entities), true);
+
+  function rollback(t1, t2, callback) {
+    t1.rollback(t2.rollback(callback));
+  }
+  var that = this;
+  var group, entity;
+  return new Promise(function (resolve, reject) {
+    var pk = buildEntityPk(entity_id, entity_type);
+    var t_groups = transaction(that.groups);
+    var t_entities = transaction(that.entities);
+    readSomething("entity", pk, t_entities, false)
+      .then(function (entity) {
+        var groups = entity.groups;
+        var readGroups = [];
+        if (groups && groups.length > 0) {
+          groups.forEach(function (group_pk) {
+            readGroups.push(readSomething("groups", group_pk, t_groups, false));
+          });
+          return Promise.all(readGroups);
+        } else {
+          return Promise.resolve([]); //return an empty set of entities so that the promise chain keeps going :)
+        }
+      }).then(function (groups) {
+        var ps = [];
+        groups.forEach(function (g) {
+          ps.push(new Promise(function (re, rej) {
+            g.entities = g.entities.filter(function (v) {
+              return (v.type !== entity_type || v.id !== entity_id);
+            });
+            updateSomething("groups", buildGroupPk(g.group_name, g.owner), g, t_groups, false).then(re, rej);
+          }));
+        });
+        return Promise.all(ps);
+      }).then(function (res) {
+        console.log("finished updating groups by removing entity from their attributes");
+        console.log("attempting to delete entity " + JSON.stringify(pk));
+        return deleteSomething("entities", pk, t_entities, false);
+      }).then(function () {
+        t_entities.commit(function () {
+          t_groups.commit(function () {
+            resolve();
+          });
+        });
+      }).catch(function rej(reason) {
+        console.log('level storage rejecting ' + reason);
+        return rollback(t_entities, t_groups, reject.bind(this, reason));
+      });
+  });
+
 };
 
 LevelStorage.prototype.createGroupPromise = function (group_name, owner) {

tests/level-storage-test.js

@@ -768,7 +768,7 @@ describe('LevelStorage', function () {
         });
     });
 
-    it('should remove group references in entities after deleting it', function (done) {
+    it('should remove group references in entities after deleting it from the group', function (done) {
       var storage = createLevelStorage();
       var owner = "1";
       var entity_id = "2";
@@ -807,6 +807,39 @@ describe('LevelStorage', function () {
         });
     });
 
+    it('should remove group references in entities after deleting the entity altogether', function (done) {
+      var storage = createLevelStorage();
+      var owner = "1";
+      var entity_id = "2";
+      var entity_type = "user";
+      var data = {
+        "name": "string",
+        "token": "123"
+      };
+      var group;
+      var group_name = "mygroup";
+      storage.createGroupPromise(group_name, owner)
+        .then(function (g) {
+          group = g;
+          return storage.createEntityPromise(entity_id, entity_type, owner, data)
+        })
+        .then(function (entity) {
+          return storage.addEntityToGroupPromise(group.group_name, group.owner, entity_id, entity_type);
+        }).then(function (result) {
+          return storage.deleteEntityPromise(entity_id, entity_type);
+        }).then(function (result) {
+          return storage.readGroupPromise(group.group_name, group.owner);
+        }).then(function (g) {
+          if (g.entities) {
+            if (g.entities.length === 0)
+              storage.cleanDb(done);
+
+          }
+        }).catch(function reject(error) {
+          throw error;
+        });
+    });
+
     it('should remove entity from group as well as the group reference in the entity after an entity has been removed from a group', function (done) {
       var storage = createLevelStorage();
       var owner = "1";