fix(model): relations are not being applied if any is null (#134)

Fixes #133
robsontenorio · Oct 26, 2020 · 92932cc · 92932cc
1 parent 460bfb5
commit 92932cc
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/src/Model.js b/src/Model.js
@@ -259,7 +259,7 @@ export default class Model extends StaticModel {
       const _relation = getProp(model, relation)
 
       if (!_relation) {
-        return;
+        continue;
       }
 
       if (Array.isArray(_relation.data) || Array.isArray(_relation)) {

diff --git a/tests/model.test.js b/tests/model.test.js
@@ -115,6 +115,38 @@ describe('Model methods', () => {
     })
   })
 
+  test("find() method returns a object as instance of such Model with empty relationships", async () => {
+    const _postResponse = postResponse;
+    _postResponse.user = null;
+    _postResponse.relationships.tags = [];
+
+    axiosMock.onGet("http://localhost/posts/1").reply(200, _postResponse);
+
+    const post = await Post.find(1);
+
+    expect(post).toEqual(postResponse);
+    expect(post).toBeInstanceOf(Post);
+    expect(post.user).toStrictEqual(null);
+    expect(post.relationships.tags).toStrictEqual([]);
+  });
+
+  test("find() method returns a object as instance of such Model with some empty relationships", async () => {
+    const _postResponse = postResponse;
+    _postResponse.user = null;
+
+    axiosMock.onGet("http://localhost/posts/1").reply(200, _postResponse);
+
+    const post = await Post.find(1);
+
+    expect(post).toEqual(postResponse);
+    expect(post).toBeInstanceOf(Post);
+    expect(post.user).toStrictEqual(null);
+
+    post.relationships.tags.forEach((tag) => {
+      expect(tag).toBeInstanceOf(Tag);
+    });
+  });
+
   test('get() method returns a array of objects as instance of suchModel', async () => {
     axiosMock.onGet('http://localhost/posts').reply(200, postsResponse)