fix(sync): Fix issue with links in sync not being resolved

Author: trodrigues

lib/sync.js

@@ -67,7 +67,7 @@ export default function pagedSync (http: Object, query: Object, resolveLinks: bo
   .then(response => {
     // clones response.items used in includes because we don't want these to be mutated
     if (resolveLinks) {
-      mixinLinkGetters(response.items, cloneDeep(mapResponseItems(response.items)))
+      mixinLinkGetters(response.items, mapIncludeItems(cloneDeep(response.items)))
     }
     // maps response items again after getters are attached
     const mappedResponseItems = mapResponseItems(response.items)
@@ -87,6 +87,18 @@ function mapResponseItems (items: ResponseItems): Object {
   }
 }
 
+/**
+ * @private
+ * Creates an object similar to the one retrieved on `includes` from the `entries`
+ * endpoint, for usage with the link getters mixin
+ */
+function mapIncludeItems (items: ResponseItems): Object {
+  return {
+    Entry: filter(items, ['sys.type', 'Entry']),
+    Asset: filter(items, ['sys.type', 'Asset'])
+  }
+}
+
 /**
  * @private
  * If the response contains a nextPageUrl, extracts the sync token to get the

test/integration/tests.js

@@ -282,13 +282,14 @@ test('Gets assets', t => {
 })
 
 test('Sync space', t => {
-  t.plan(5)
+  t.plan(6)
   return client.sync({initial: true})
   .then(response => {
     t.ok(response.entries, 'entries')
     t.ok(response.assets, 'assets')
     t.ok(response.deletedEntries, 'deleted entries')
     t.ok(response.deletedAssets, 'deleted assets')
     t.ok(response.nextSyncToken, 'next sync token')
+    t.equal(response.entries[4].fields.image['en-US'].sys.type, 'Asset', 'links are resolved')
   })
 })

test/unit/sync-test.js

@@ -44,12 +44,20 @@ test('Throws with incompatible content_type and type parameter', t => {
 })
 
 test('Initial sync with one page', t => {
-  t.plan(6)
+  t.plan(7)
   const http = {get: sinon.stub()}
+  const entryWithLink = createEntry('1')
+  entryWithLink.fields.linked = {
+    sys: {
+      id: '2',
+      type: 'Link',
+      linkType: 'Entry'
+    }
+  }
   http.get.withArgs('sync', {params: {initial: true}}).returns(Promise.resolve({
     data: {
       items: [
-        createEntry('1'),
+        entryWithLink,
         createEntry('2'),
         createEntry('3'),
         createEntry('3', true),
@@ -71,6 +79,7 @@ test('Initial sync with one page', t => {
     t.equal(response.assets.length, 3, 'entries length')
     t.equal(response.deletedAssets.length, 1, 'deleted assets length')
     t.equal(response.nextSyncToken, 'nextsynctoken', 'next sync token')
+    t.equal(response.entries[0].fields.linked.sys.type, 'Entry', 'linked entry is resolved')
   })
 })