fix(entity): use getId for collections

SpoonX · Jul 7, 2016 · 224cade · 224cade
1 parent 6d2f9b1
commit 224cade
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/entity.js b/src/entity.js
@@ -513,10 +513,12 @@ function asObject(entity, shallow) {
         return;
       }
 
-      if (value.id) {
-        pojo[propertyName] = value.id; // weird. entities always have an id!?
-      } else if (value instanceof Entity) {
-        pojo[propertyName] = value.asObject();
+      if (value instanceof Entity) {
+        if (value.getId()) {
+          pojo[propertyName] = value.getId();
+        } else {
+          pojo[propertyName] = value.asObject();
+        }
       } else if (['string', 'number', 'boolean'].indexOf(typeof value) > -1 || value.constructor === Object) {
         pojo[propertyName] = value;
       }
@@ -612,10 +614,12 @@ function getCollectionsCompact(forEntity, includeNew) {
         return;
       }
 
-      if (entity.id) {
-        collections[index].push(entity.id);  // again weird. see above
-      } else if (includeNew && entity instanceof Entity) {
-        collections[index].push(entity);
+      if (entity instanceof Entity) {
+        if (entity.getId()) {
+          collections[index].push(entity.getId());
+        } else if (includeNew) {
+          collections[index].push(entity);
+        }
       }
     });
   });

diff --git a/test/entity.spec.js b/test/entity.spec.js
@@ -474,7 +474,7 @@ describe('Entity', function() {
   describe('.setId()', function() {
     it(`Should set the entity's id`, function() {
       let instance = new WithResource();
-      instance.setId(1)
+      instance.setId(1);
 
       expect(instance.idTag).toBe(1);
     });