toJSON fix

src/Lucid/Model/index.js

@@ -408,6 +408,8 @@ class Model extends BaseModel {
   static async create (payload, trx) {
     const modelInstance = new this()
     modelInstance.fill(payload)
+    modelInstance.$visible = this.visible
+    modelInstance.$hidden = this.hidden
     await modelInstance.save(trx)
     return modelInstance
   }
@@ -1326,13 +1328,13 @@ class Model extends BaseModel {
     }
 
     if (!this.isNew) {
-      const attributes = await this.constructor.find(this.primaryKeyValue)
-      if (!attributes) {
+      const newInstance = await this.constructor.find(this.primaryKeyValue)
+      if (!newInstance) {
         throw GE
           .RuntimeException
           .invoke(`Cannot reload model since row with ${this.constructor.primaryKey} ${this.primaryKeyValue} has been removed`)
       }
-      this.newUp(attributes)
+      this.newUp(newInstance.$attributes)
     }
   }
 }

test/unit/lucid-serializer.spec.js

@@ -223,4 +223,32 @@ test.group('Relations | Serializer', (group) => {
     assert.equal(json.perPage, 20)
     assert.equal(json.lastPage, 1)
   })
+
+  test('test toJSON with visible()', async (assert) => {
+    class User extends Model {
+      static get visible () {
+        return ['id', 'username']
+      }
+    }
+    User._bootIfNotBooted()
+    await ioc.use('Database').table('users').insert([{ username: 'virk' }, { username: 'nikk' }])
+
+    // Test 1 - find in DB
+    const a = await User.find(1)
+    assert.deepEqual(a.toJSON(), {id: 1, username: 'virk'})
+
+    // // test 2 - find in db then reload
+    const b = await User.find(1)
+    await b.reload()
+    assert.deepEqual(b.toJSON(), {id: 1, username: 'virk'})
+
+    // // test 3 - create
+    const c = await User.create({username: 'ben'})
+    assert.deepEqual(c.toJSON(), {id: 3, username: 'ben'})
+
+    // // test 4 - create then reload from db
+    const d = await User.create({username: 'simon'})
+    await d.reload()
+    assert.deepEqual(d.toJSON(), {id: 4, username: 'simon'})
+  })
 })