Merge pull request #202 from alphasights/rdu/undefined-to-null

Converting regular attributes from 'undefined' to 'null'
alphasights · Nov 21, 2019 · e871266 · e871266
2 parents 651c6b8 + b08ac43
commit e871266
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/addon/serializer.js b/addon/serializer.js
@@ -44,7 +44,7 @@ export default DS.JSONSerializer.extend(DS.EmbeddedRecordsMixin, {
         payloadKey = this.keyForAttribute(key);
       }
 
-      json[payloadKey] = value;
+      json[payloadKey] = typeof value !== 'undefined' ? value : null;
     }
   },
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-graphql-adapter",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "An Ember CLI adapter for GraphQL",
   "keywords": [
     "ember-addon"

diff --git a/tests/integration/serializer-test.js b/tests/integration/serializer-test.js
@@ -4,7 +4,7 @@ import DS from 'ember-data';
 import { module, test } from 'qunit';
 
 let env, store;
-let Address, Blog, Profile, Post, User;
+let Address, Blog, Profile, Post, User, NullUndefined;
 
 module("integration/serializer - GraphQL serializer", {
   beforeEach() {
@@ -31,10 +31,16 @@ module("integration/serializer - GraphQL serializer", {
       profile: DS.belongsTo('profile', { async: false })
     });
 
+    NullUndefined = DS.Model.extend({
+      undefinedStringField: DS.attr('string'),
+      nullStringField: DS.attr('string'),
+    });
+
     env = setupStore({
       adapter: '-graphql',
       address: Address,
       blog: Blog,
+      nullUndefined: NullUndefined,
       post: Post,
       profile: Profile,
       user: User
@@ -367,6 +373,30 @@ test('serialize - simple', function(assert) {
   });
 });
 
+test('serialize - extra simple null undefined cases', function(assert) {
+  assert.expect(1);
+
+  run(function() {
+    store.push({
+      data: {
+        type: 'null-undefined',
+        id: '1',
+        attributes: { nullStringField: null, undefinedStringField: undefined },
+      }
+    });
+  });
+
+  let expected = {
+    'nullStringField': null,
+    'undefinedStringField': null
+  };
+
+  run(function() {
+    let entity = store.peekRecord('null-undefined', 1);
+    assert.deepEqual(entity.serialize(), expected);
+  });
+});
+
 test('serialize - complex', function(assert) {
   assert.expect(1);