house cleaning

Author: hirsch88

src/api/models/User.ts

@@ -18,22 +18,22 @@ export class User extends Bookshelf.Model<User> {
     public get hasTimestamps(): boolean { return true; }
 
     public get Id(): number { return this.get('id'); }
-    public set Id(value: number) { this.set({ id: value }); };
+    public set Id(value: number) { this.set({ id: value }); }
 
     public get FirstName(): string { return this.get('firstName'); }
-    public set FirstName(value: string) { this.set({ id: value }); };
+    public set FirstName(value: string) { this.set({ id: value }); }
 
     public get LastName(): string { return this.get('lastName'); }
-    public set LastName(value: string) { this.set({ id: value }); };
+    public set LastName(value: string) { this.set({ id: value }); }
 
     public get Email(): string { return this.get('email'); }
-    public set Email(value: string) { this.set({ id: value }); };
+    public set Email(value: string) { this.set({ id: value }); }
 
     public get UpdatedAt(): Date { return this.get('updatedAt'); }
-    public set UpdatedAt(value: Date) { this.set({ id: value }); };
+    public set UpdatedAt(value: Date) { this.set({ id: value }); }
 
     public get CreatedAt(): Date { return this.get('createdAt'); }
-    public set CreatedAt(value: Date) { this.set({ id: value }); };
+    public set CreatedAt(value: Date) { this.set({ id: value }); }
 
     public fullName(): string {
         return this.FirstName + ' ' + this.LastName;

src/api/repositories/UserRepository.ts

@@ -64,7 +64,9 @@ export class UserRepository {
     public static async update(id: number, data: any): Promise<User> {
         const user = User.forge<User>({ id: id });
         try {
-            return await user.save(data, { patch: true });
+            const updatedUser = await user.save(data, { patch: true });
+            return await User.fetchById(updatedUser.id);
+
         } catch (error) {
             throw new DatabaseException('Could not update the user!', error);
         }

src/core/Bookshelf.ts

@@ -2,5 +2,5 @@ import * as bookshelf from 'bookshelf';
 import { Knex } from './Knex';
 
 
-export const Bookshelf: bookshelf = bookshelf(Knex);
+export const Bookshelf: bookshelf = bookshelf(<any>Knex);
 Bookshelf.plugin(['bookshelf-camelcase']);

src/core/api/extendExpressResponse.ts

@@ -71,7 +71,7 @@ export function bodySuccessful<T>(data: T, options: my.ResponseOptions = {}): an
         ...links(options.links),
         data: data
     };
-};
+}
 
 /**
  * This body parse is used for error messages to the client
@@ -82,7 +82,7 @@ export function bodyFailed(message: string, error: any): any {
         message: message,
         error: error
     };
-};
+}
 
 ///////////////////////////////////////////////////////
 function message(value?: string): any {

src/database/factories/index.ts

@@ -1,5 +1,5 @@
 import { Factory } from '../../core/database';
-import * as models from '../../api/models';
+import { User } from '../../api/models/User';
 
 /**
  * FACTORIES
@@ -12,7 +12,7 @@ const factory = Factory.getInstance();
 /**
  * USER - Factory
  */
-factory.define(models.User, (faker: Faker.FakerStatic) => {
+factory.define(User, (faker: Faker.FakerStatic) => {
     const gender = faker.random.number(1);
     const fn = faker.name.firstName(gender);
     const ln = faker.name.lastName(gender);
@@ -24,4 +24,4 @@ factory.define(models.User, (faker: Faker.FakerStatic) => {
 });
 
 
-export * from '../../core/database/Factory'
+export * from '../../core/database/Factory';

src/database/seeds/create_users.ts

@@ -1,11 +1,11 @@
 import * as Knex from 'knex';
 
-import * as models from '../../api/models';
+import { User } from '../../api/models/User';
 import { Factory } from '../factories';
 
 
 exports.seed = async (db: Knex) => {
     const factory = Factory.getInstance();
-    await factory.get(models.User)
+    await factory.get(User)
         .create(10);
 };