Fix relations

Author: listepo

lib/deserializer.js

@@ -16,34 +16,38 @@ module.exports = function Deserializer (data, serverRelations) {
         var fk = null;
         if (_.isArray(clientRelation.data)) {
           if (_.isEmpty(clientRelation.data)) {
-            return;
+            relationValue = [];
+          } else {
+            relationType = _.result(_.find(clientRelation.data, 'type'), 'type');
+            relationValue = _.map(clientRelation.data, function (val) {
+              return val.id;
+            });
           }
-          relationType = _.result(_.find(clientRelation.data, 'type'), 'type');
-          relationValue = _.map(clientRelation.data, function (val) {
-            return val.id;
-          });
           fkSuffix = 'Ids';
         } else {
           if (clientRelation.data === null) {
-            return;
+            relationValue = null;
+          } else {
+            relationType = clientRelation.data.type;
+            relationValue = clientRelation.data.id;
           }
-          relationType = clientRelation.data.type;
-          relationValue = clientRelation.data.id;
           fkSuffix = 'Id';
         }
-
-        relationType = inflection.singularize(relationType);
-
-        if (relationType === serverRelation.model) {
-          if (serverRelation.foreignKey) {
-            fk = serverRelation.foreignKey;
-          } else {
-
-            relationType = inflection.camelize(relationType, true);
-            fk = relationType + fkSuffix;
+        if (relationType === null) {
+          relationType = serverRelation.model;
+        } else {
+          relationType = inflection.singularize(relationType);
+          if (relationType !== serverRelation.model) {
+            return;
           }
-          result[fk] = relationValue;
         }
+        if (serverRelation.foreignKey) {
+          fk = serverRelation.foreignKey;
+        } else {
+          relationType = inflection.camelize(relationType, true);
+          fk = relationType + fkSuffix;
+        }
+        result[fk] = relationValue;
       }
     });
   }