fix(entity): add "id" property to entity after it has been saved (#180)

sebelga · web-flow · commit 15a713ac600b · 2019-09-10T08:52:57.000+02:00
fix #172
diff --git a/lib/entity.js b/lib/entity.js
@@ -34,9 +34,23 @@ class Entity {
             this.entityKey = createKey(this, id, ancestors, namespace);
         }
 
+        this.setId();
+
         // create entityData from data passed
         this.entityData = buildEntityData(this, data || {});
 
+        /**
+         * Create virtual properties (getters and setters for entityData object)
+         */
+        Object.keys(this.schema.paths)
+            .filter(pathKey => ({}.hasOwnProperty.call(this.schema.paths, pathKey)))
+            .forEach(pathKey => Object.defineProperty(this, pathKey, {
+                get: function getProp() { return this.entityData[pathKey]; },
+                set: function setProp(newValue) {
+                    this.entityData[pathKey] = newValue;
+                },
+            }));
+
         // wrap entity with hook methods
         hooks.wrap(this);
 
@@ -104,6 +118,8 @@ class Entity {
                     });
             }
 
+            _this.setId();
+
             return _this;
         }
 
@@ -245,6 +261,10 @@ class Entity {
         return this;
     }
 
+    setId() {
+        this.id = this.entityKey.id || this.entityKey.name;
+    }
+
     /**
      * Return a Model from Gstore
      * @param name : model name
diff --git a/lib/model.js b/lib/model.js
@@ -42,18 +42,6 @@ class Model extends Entity {
         ModelInstance.prototype.gstore = gstore;
         ModelInstance.gstore = gstore;
 
-        /**
-         * Create virtual properties (getters and setters for entityData object)
-         */
-        Object.keys(schema.paths)
-            .filter(key => ({}.hasOwnProperty.call(schema.paths, key)))
-            .forEach(key => Object.defineProperty(ModelInstance.prototype, key, {
-                get: function getProp() { return this.entityData[key]; },
-                set: function setProp(newValue) {
-                    this.entityData[key] = newValue;
-                },
-            }));
-
         /**
          * Create virtual properties (getters and setters for "virtuals" defined on the Schema)
          */
diff --git a/test/integration/entity.js b/test/integration/entity.js
@@ -53,8 +53,8 @@ const getAddress = (addressBookEntity = null) => {
     return address;
 };
 
-const getUser = addressEntity => {
-    const key = UserModel.key(getId());
+const getUser = (addressEntity, id = getId()) => {
+    const key = UserModel.key(id);
     allKeys.push(key);
     const data = { address: addressEntity.entityKey };
     const user = new UserModel(data, null, null, null, key);
@@ -81,7 +81,6 @@ describe('Entity (Integration Tests)', () => {
             this.skip();
         }
         generatedIds = [];
-        // return gstore.save([...users, ...addresses]);
         return gstore.save([addressBook, address]);
     });
 
@@ -109,6 +108,16 @@ describe('Entity (Integration Tests)', () => {
                     expect(entityFetched.entityData.address).deep.equal(address.entityKey);
                 })
         ));
+
+        it('should add the id or name to the entity', async () => {
+            const entity1 = await user.save();
+            expect(entity1.id).equal(entity1.entityKey.name);
+
+            const user2 = getUser(address, 1234);
+            const entity2 = await user2.save();
+
+            expect(entity2.id).equal(entity2.entityKey.id);
+        });
     });
 
     describe('populate()', () => {
