feat(serializer) added relationships object to included data

Author: rocknrolla777

lib/serialize.js

@@ -102,7 +102,7 @@ module.exports = function (app, defaults) {
 
     // If we're sideloading, we need to add the includes
     if (ctx.req.isSideloadingRelationships) {
-      requestedIncludes = ctx.req.remotingContext.args.filter.include
+      requestedIncludes = utils.setRequestedIncludes(ctx.req.remotingContext.args.filter.include)
     }
 
     if (model.definition.settings.scope) {
@@ -119,7 +119,7 @@ module.exports = function (app, defaults) {
       if (typeof include === 'string') {
         requestedIncludes.push(include)
       } else if (_.isArray(include)) {
-        requestedIncludes = requestedIncludes.concat(include)
+        requestedIncludes = requestedIncludes.concat(utils.setRequestedIncludes(include))
       }
     }
 

lib/utils.js

@@ -19,6 +19,7 @@ module.exports = {
   shouldNotApplyJsonApi: shouldNotApplyJsonApi,
   shouldApplyJsonApi: shouldApplyJsonApi,
   relationFkOnModelFrom: relationFkOnModelFrom,
+  setRequestedIncludes: setRequestedIncludes,
   setIncludedRelations: setIncludedRelations
 }
 
@@ -238,3 +239,21 @@ function setIncludedRelations (relations, app) {
   }
   return relations
 }
+
+function setRequestedIncludes (include) {
+  if (!include) return undefined
+
+  if (typeof include === 'string') {
+    return include
+  }
+
+  return include.map(function (inc) {
+    if (typeof inc === 'string') {
+      return inc
+    }
+
+    if (inc instanceof Object) {
+      return inc.relation
+    }
+  })
+}