Merge 3ac45df into 46818d3

icapps · Jun 6, 2019 · 5dd7985 · 5dd7985
2 parents 46818d3 + 3ac45df
commit 5dd7985
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/utils/data-construction.util.js b/lib/utils/data-construction.util.js
@@ -25,6 +25,8 @@ function isFlatValue(val) {
 }
 
 function getValue(data, key, config, options) {
+  if (data[key] === null) return null;
+
   if (config[key]) {
     if (config[key] instanceof require('./../serializer')) { // eslint-disable-line global-require
       return constructData(data[key], config[key].config, options);

diff --git a/tests/nested-serializer.test.js b/tests/nested-serializer.test.js
@@ -58,16 +58,22 @@ describe('Nested serializer', () => {
           country: 'Belgium',
         },
       ],
+      contactInfo: null,
     };
 
     // serializer definition
     const addressSerializer = new Serializer('address', {
       attributes: ['street', 'number'],
     });
 
+    const contactInfoSerializer = new Serializer('contactInfo', {
+      attributes: ['phoneNumber', 'email', 'skype']
+    })
+
     const userSerializer = new Serializer('user', {
-      attributes: ['firstName', 'lastName', 'address'],
+      attributes: ['firstName', 'lastName', 'address', 'contactInfo'],
       address: addressSerializer,
+      contactInfo: contactInfoSerializer,
     });
 
     const result = userSerializer.serialize(rawData);
@@ -86,6 +92,7 @@ describe('Nested serializer', () => {
           number: '69',
         },
       ],
+      contactInfo: null,
     });
   });
 });