fix(attributes): updated toJSON to use getRawAttributes (#198)

## Continuous Integration
* ci: added git identification configuration

## Fix
* fix(attributes): updated `toJSON` to use `getRawAttributes`

Author: nandi95

.github/workflows/deploy-api-docs.yml

@@ -20,6 +20,8 @@ jobs:
         run: npm run docs:api
       - name: Update gh-pages branch
         run: |
+          git config --global user.email "nandor.kraszlan@gmail.com"
+          git config --global user.name "Nandor Kraszlan"
           cp -r ./api-docs/* ./
           git add -f assets
           git add -f classes

src/Calliope/Concerns/HasAttributes.ts

@@ -686,7 +686,7 @@ export default class HasAttributes extends GuardsAttributes implements Jsonable,
      * @inheritDoc
      */
     public toJSON<T extends ReturnType<typeof JSON.parse> = RawAttributes<this>>(): T {
-        const json = this.getAttributes() as SimpleAttributes;
+        const json = this.getRawAttributes() as SimpleAttributes;
 
         const relations = (this as unknown as HasRelations).getRelations();
 
@@ -696,7 +696,7 @@ export default class HasAttributes extends GuardsAttributes implements Jsonable,
                 return;
             }
 
-            json[relation] = (relations[relation]! as ModelCollection<Model>).map(model => model.toJSON()).toArray();
+            json[relation] = (relations[relation] as ModelCollection<Model>).map(model =>  model.toJSON()).toArray();
         });
 
         return json as unknown as T;

tests/Calliope/Concerns/HasAttributes.test.ts

@@ -4,6 +4,7 @@ import ModelCollection from '../../../src/Calliope/ModelCollection';
 import { isEqual } from 'lodash';
 import Contract from '../../mock/Models/Contract';
 import Team from '../../mock/Models/Team';
+import type { RawAttributes } from '../../../src';
 import { Collection } from '../../../src';
 
 let hasAttributes: User;
@@ -748,6 +749,20 @@ describe('HasAttributes', () => {
                 ]
             });
         });
+
+        it('should take attributes in their raw form', () => {
+            // raw because json isn't something that is displayed to the user
+            const shift = Shift.create({ attr: 1 });
+
+            shift.getAttrAttribute = (value: number) => {
+                return value + 1;
+            };
+
+            hasAttributes.addRelation('shifts', shift);
+            expect((hasAttributes.toJSON().shifts as [RawAttributes<Shift>])[0].attr).toBe(1);
+
+            delete shift.getAttrAttribute;
+        });
     });
 
     describe('toString()', () => {

tests/mock/Models/Shift.ts

@@ -9,4 +9,8 @@ export default class Shift extends Model {
     public factory(): ShiftFactory {
         return new ShiftFactory;
     }
+
+    public get fillable(): string[] {
+        return ['*'];
+    }
 }