Merge relationships

lib/jsonapi.js

@@ -95,4 +95,49 @@ module.exports = class JSONAPI {
     );
   }
 
+  /**
+   * Send unlimited subrequests to Drupal
+   * @param  {array}  [requests=[]]
+   *   An array of subrequests to make.
+   * @return {promise}
+   *   A resolved promise with the processed multipart response.
+   */
+  subRequests(requests = []) {
+    const requestURL = `${this.request.options.base}/subrequests?_format=json&query=${JSON.stringify(
+      requests.map(request => Object.assign({
+        requestId: `waterwheel-${Math.random().toString(36).substr(2, 10)}`,
+        action: 'view',
+        headers: {
+          'Accept': 'application/json'
+        }}, typeof request === 'string' || request instanceof String ?
+          {uri: request} :
+          request.hasOwnProperty('options') && Object.keys(request.options).length && request.options.constructor === Object ?
+            Object.assign(request, {uri: `${request.uri}?${qs.stringify(request.options, {indices: false})}`}) :
+            request
+      ))
+    )}`;
+    return this.request.axios.get(requestURL)
+      .then(({data}) => Object.keys(data).map(key =>({[key]: JSON.parse(data[key].body)})));
+  }
+
+  merge({data, included}) {
+    return new Promise((resolve, reject) => {
+
+      return resolve(
+        data.map((item) => {
+          const relationships = Object.keys(item.relationships);
+          relationships.forEach((relationship) => {
+            let relationshipToAttach = included.filter(include => (
+              item.relationships[relationship].data &&
+              item.relationships[relationship].data.id === include.id &&
+              item.relationships[relationship].data.type === include.type
+            ));
+            item.relationships[relationship] = Object.assign(item.relationships[relationship], relationshipToAttach[0]);
+          });
+          return item;
+        })
+      );
+    });
+  }
+
 };

test/build.js

@@ -75,7 +75,6 @@ test.cb('Waterwheel Browser', t => {
         t.end();
       })
       .catch(err => {
-        console.log(err);
         t.end();
       });
   });

test/entity.js

@@ -68,7 +68,6 @@ test('GET', t => {
   }, new t.context.oauth(t.context.baseURL, t.context.oauthOptions));
 
   const Entity = rs.require('../lib/entity');
-  console.log(new Entity(t.context.options, request).options.methods.hasOwnProperty('get'));
   return new Entity(t.context.options, request).get(1)
     .then(res => {
       t.deepEqual({