Merge pull request #63 from contentful/fix-items-links

fix(links): Fix link resolution for links in same response

Author: trodrigues

lib/entities/entry.js

@@ -1,4 +1,5 @@
 import {cloneDeep} from 'lodash/lang'
+import {uniq} from 'lodash/array'
 import mixinToPlainObject from '../mixins/to-plain-object'
 import mixinLinkGetters from '../mixins/link-getters'
 
@@ -39,8 +40,15 @@ export function wrapEntry (data) {
  */
 export function wrapEntryCollection (data, resolveLinks) {
   const wrappedData = mixinToPlainObject(cloneDeep(data))
-  if (wrappedData.includes && resolveLinks) {
-    mixinLinkGetters(wrappedData.items, wrappedData.includes)
+  if (resolveLinks) {
+    const includes = prepareIncludes(wrappedData.includes, wrappedData.items)
+    mixinLinkGetters(wrappedData.items, includes)
   }
   return Object.freeze(wrappedData)
 }
+
+function prepareIncludes (includes = {}, items) {
+  includes.Entry = includes.Entry || []
+  includes.Entry = uniq(includes.Entry.concat(cloneDeep(items)))
+  return includes
+}

test/integration/tests.js

@@ -60,12 +60,14 @@ test('Gets entries', t => {
 })
 
 test('Gets entries with linked includes', t => {
-  t.plan(3)
+  t.plan(5)
   return client.getEntries({include: 2})
   .then(response => {
     t.ok(response.includes, 'includes')
     t.ok(response.includes.Asset, 'includes for Assets')
     t.ok(Object.keys(response.includes.Asset).length > 0, 'list of includes has asset items')
+    t.equal(response.items[0].fields.bestFriend.sys.type, 'Entry', 'entry gets resolved from other entries in collection')
+    t.ok(response.items[0].fields.bestFriend.fields, 'resolved entry has fields')
   })
 })
 

test/unit/entities/entry-test.js

@@ -1,6 +1,6 @@
 import test from 'tape'
 
-import {entryMock} from '../mocks'
+import {entryMock, assetMock} from '../mocks'
 import {cloneDeep} from 'lodash/lang'
 import {wrapEntry, wrapEntryCollection} from '../../../lib/entities/entry'
 
@@ -30,12 +30,53 @@ test('Entry collection is wrapped', t => {
     limit: 100,
     items: [
       entryMock
+    ]
+  }
+  const wrappedEntry = wrapEntryCollection(entryCollection, true)
+  t.looseEqual(wrappedEntry.toPlainObject(), entryCollection)
+  t.end()
+})
+
+test('Entry collection links are resolved', t => {
+  const entryCollection = {
+    total: 1,
+    skip: 0,
+    limit: 100,
+    items: [
+      cloneDeep(entryMock),
+      cloneDeep(entryMock)
     ],
     includes: {
-      Entry: []
+      Asset: [ cloneDeep(assetMock) ]
     }
   }
-  const wrappedEntry = wrapEntryCollection(entryCollection, true)
-  t.looseEqual(wrappedEntry.toPlainObject(), entryCollection)
+  // setup first entry
+  entryCollection.items[0].sys.id = 'entry1'
+  entryCollection.items[0].fields.linked1 = {
+    sys: {
+      id: 'asset1',
+      type: 'Link',
+      linkType: 'Asset'
+    }
+  }
+  entryCollection.items[0].fields.linked2 = {
+    sys: {
+      id: 'entry3',
+      type: 'Link',
+      linkType: 'Entry'
+    }
+  }
+  // setup first linked entry
+  entryCollection.includes.Asset[0].sys.id = 'asset1'
+  // setup second linked entry
+  entryCollection.items[1].sys.id = 'entry3'
+
+  const wrappedEntry = wrapEntryCollection(entryCollection, true).toPlainObject()
+  // first linked entry resolved from includes
+  t.equals(wrappedEntry.items[0].fields.linked1.sys.type, 'Asset', 'first linked entity is resolved')
+  t.ok(wrappedEntry.items[0].fields.linked1.fields, 'first linked entity has fields')
+  // second linked entry resolved from items list
+  t.equals(wrappedEntry.items[0].fields.linked2.sys.type, 'Entry', 'second linked entity is resolved')
+  t.ok(wrappedEntry.items[0].fields.linked2.fields, 'second linked entity has fields')
   t.end()
 })