Fix 'fromResource' when using find()

Resolve robsontenorio#66

Author: robsontenorio

package.json

@@ -46,6 +46,6 @@
     "babel-eslint": "^10.1.0",
     "codecov": "^3.6.5",
     "eslint": "^6.8.0",
-    "jest": "^25.5.0"
+    "jest": "^24.1.0"
   }
-}
+}

src/Model.js

@@ -47,7 +47,7 @@ export default class Model extends StaticModel {
 
   custom(...args) {
 
-    if(args.length === 0) {
+    if (args.length === 0) {
       throw new Error('The custom() method takes a minimum of one argument.')
     }
 
@@ -59,22 +59,22 @@ export default class Model extends StaticModel {
     let resource = '';
 
     args.forEach(value => {
-      switch(true) {
+      switch (true) {
         case (typeof value === 'string'):
           resource += slash + value.replace(/^\/+/, '');
           break;
         case (value instanceof Model):
           resource += slash + value.resource();
 
-          if(value.isValidId(value.getPrimaryKey())) {
+          if (value.isValidId(value.getPrimaryKey())) {
             resource += '/' + value.getPrimaryKey();
           }
           break;
         default:
           throw new Error('Arguments to custom() must be strings or instances of Model.')
       }
 
-      if( !slash.length ) {
+      if (!slash.length) {
         slash = '/';
       }
     });
@@ -152,7 +152,7 @@ export default class Model extends StaticModel {
     }
   }
 
-  parameterNames () {
+  parameterNames() {
     return {
       include: 'include',
       filter: 'filter',
@@ -256,7 +256,15 @@ export default class Model extends StaticModel {
     return this.request({
       url,
       method: 'GET'
-    }).then(response => new this.constructor(response.data))
+    }).then(response => {
+      const item = new this.constructor(response.data)
+
+      if (this._fromResource) {
+        item._from(this._fromResource)
+      }
+
+      return item
+    })
   }
 
   $find(identifier) {
@@ -283,7 +291,10 @@ export default class Model extends StaticModel {
 
       collection = collection.map(c => {
         let item = new this.constructor(c)
-        Object.defineProperty(item, '_fromResource', { get: () => this._fromResource })
+
+        if (this._fromResource) {
+          item._from(this._fromResource)
+        }
 
         return item
       })

tests/model.test.js

@@ -81,6 +81,7 @@ describe('Model methods', () => {
     const post = await Post.$find(1)
 
     expect(post).toEqual(postEmbedResponse.data)
+    expect(post).toBeInstanceOf(Post)
   })
 
   test('$find() handles request without "data" wrapper', async () => {
@@ -89,6 +90,8 @@ describe('Model methods', () => {
     const post = await Post.$find(1)
 
     expect(post).toEqual(postResponse)
+    expect(post).toBeInstanceOf(Post)
+
   })
 
   test('get() method returns a array of objects as instance of suchModel', async () => {
@@ -547,4 +550,22 @@ describe('Model methods', () => {
 
     expect(errorModel).toThrow('Arguments to custom() must be strings or instances of Model.')
   })
+
+  test('save() method makes a PUT request to the correct URL on nested object thas was fetched with find() method', async () => {
+    axiosMock.onGet('http://localhost/posts/1/comments/1').reply(200, commentsResponse[0])
+    axiosMock.onPut('http://localhost/posts/1/comments/1').reply(200, commentsResponse[0])
+
+    const post = new Post({ id: 1 })
+    const comment = await post.comments().find(1)
+
+    axiosMock.onAny().reply((config) => {
+      expect(config.method).toEqual('put')
+      expect(config.url).toEqual('http://localhost/posts/1/comments/1')
+
+      return [200, {}]
+    })
+
+    comment.text = 'Hola!'
+    await comment.save()
+  })
 })