Merge pull request #61 from rmmmp/fix-regressions

Fix regressions
mikkopaderes · May 16, 2018 · 0f06752 · 0f06752
2 parents 43fe38a + fac366e
commit 0f06752
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/addon/serializers/cloud-firestore.js b/addon/serializers/cloud-firestore.js
@@ -1,5 +1,6 @@
 import { inject } from '@ember/service';
 import { pluralize } from 'ember-inflector';
+import { typeOf } from '@ember/utils';
 import JSONSerializer from 'ember-data/serializers/json';
 
 import {
@@ -25,11 +26,7 @@ export default JSONSerializer.extend({
    * @override
    */
   extractRelationship(relationshipModelName, relationshipHash) {
-    if (
-      relationshipHash !== null
-      && typeof relationshipHash === 'object'
-      && relationshipHash.firestore
-    ) {
+    if (typeOf(relationshipHash) === 'object' && relationshipHash.firestore) {
       const path = buildPathFromRef(relationshipHash);
       const pathNodes = path.split('/');
       const belongsToId = pathNodes[pathNodes.length - 1];
@@ -53,8 +50,7 @@ export default JSONSerializer.extend({
       if (descriptor.kind === 'belongsTo') {
         if (
           Object.prototype.hasOwnProperty.call(resourceHash, name)
-          && resourceHash[name] !== null
-          && typeof resourceHash[name] === 'object'
+          && typeOf(resourceHash[name]) === 'object'
           && resourceHash[name].firestore
         ) {
           const path = buildPathFromRef(resourceHash[name]);
@@ -153,7 +149,7 @@ export default JSONSerializer.extend({
   getAdapterOptionAttribute(snapshot, key) {
     if (
       snapshot.adapterOptions
-      && Object.prototype.hasOwnProperty.call(snapshot, key)
+      && Object.prototype.hasOwnProperty.call(snapshot.adapterOptions, key)
     ) {
       return snapshot.adapterOptions[key];
     }

diff --git a/addon/transforms/timestamp.js b/addon/transforms/timestamp.js
@@ -13,7 +13,11 @@ export default Transform.extend({
    * @override
    */
   deserialize(serialized) {
-    return serialized.toDate();
+    if (typeOf(serialized) === 'object' && serialized.toDate) {
+      return serialized.toDate();
+    }
+
+    return serialized;
   },
 
   /**