From 2624b3bb9c467d99de876a9b8ee36eb29f63d289 Mon Sep 17 00:00:00 2001
From: Vesa Luusua <vesa.luusua@gmail.com>
Date: Fri, 3 Mar 2017 18:55:50 +0200
Subject: [PATCH] Fix relationships format

---
 src/util/data.js      | 8 ++++----
 src/util/data.test.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/util/data.js b/src/util/data.js
index e6f7b596..c8177263 100644
--- a/src/util/data.js
+++ b/src/util/data.js
@@ -84,10 +84,10 @@ export const denormalisedEntities = (entities, type, ids) => {
           // A relationship reference can be either a single object or
           // an array of objects. We want to keep that form in the final
           // result.
-          const hasMultipleRefs = Array.isArray(relRef);
-          const refs = hasMultipleRefs ? relRef : [relRef];
-          const relIds = refs.map(ref => ref.data.id);
-          const relType = refs[0].data.type;
+          const hasMultipleRefs = Array.isArray(relRef.data);
+          const refs = hasMultipleRefs ? relRef.data : [relRef.data];
+          const relIds = refs.map(ref => ref.id);
+          const relType = refs[0].type;
           const rels = denormalisedEntities(entities, relType, relIds);
 
           // eslint-disable-next-line no-param-reassign
diff --git a/src/util/data.test.js b/src/util/data.test.js
index 3031445e..34ab4dbb 100644
--- a/src/util/data.test.js
+++ b/src/util/data.test.js
@@ -255,7 +255,7 @@ describe('data utils', () => {
       const listing1 = createListing('listing1');
       const listing1Relationships = {
         author: { data: user1 },
-        images: [{ data: image1 }, { data: image2 }],
+        images: { data: [image1, image2] },
       };
       const listing1WithRelationships = { ...listing1, relationships: listing1Relationships };
       const listing2 = createListing('listing2');