fix(): Fix all issues, so we can test, build and run the server

Author: Gery Hirschfeld

build/tasks/test.js

@@ -29,12 +29,12 @@ gulp.task('test:pretty', (callback) => {
 });
 
 gulp.task('test:run', () =>
-    gulp.src(['test/lib/setup.ts', path.join(path.join(paths.test, '**/*.spec.js'))], { read: true })
+    gulp.src([path.join(path.join(paths.test, '**/*.spec.js'))], { read: true })
         .pipe($.jasmine())
 );
 
 gulp.task('test:pretty:run', () =>
-    gulp.src(['test/lib/setup.ts', path.join(path.join(paths.test, '**/*.spec.js'))], { read: true })
+    gulp.src([path.join(path.join(paths.test, '**/*.spec.js'))], { read: true })
         .pipe($.jasmine({
             reporter: new SpecReporter()
         }))

knexfile.ts

@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
 
-const config = require('./config');
+const config = require('./src/core/config');
 
 _.forOwn(config, (value, key) => config[key] = value.database);
 

src/context.ts

@@ -0,0 +1,41 @@
+import * as Express from 'express';
+
+import { RepositoriesContext } from './repositories-context';
+import { DataLoadersContext } from './dataloaders-context';
+
+
+export class Context {
+
+    constructor(
+        private request: Express.Request,
+        private repsonse: Express.Response,
+        private repositories: RepositoriesContext,
+        private dataLoaders: DataLoadersContext
+    ) { }
+
+    public get Response() {
+        return this.repsonse;
+    }
+
+    public get Request() {
+        return this.request;
+    }
+
+    public get Repositories() {
+        return this.repositories;
+    }
+
+    public get DataLoaders() {
+        return this.dataLoaders;
+    }
+
+    public getLanguage() {
+        return this.request.acceptsLanguages();
+    }
+
+    public hasUserRoles(roles: string[]): boolean {
+        // TODO: Here you should check if the user as the needed roles for the requested query
+        return true;
+    }
+
+}

src/context/context.ts

@@ -0,0 +1,35 @@
+import * as DataLoader from 'dataloader';
+
+import { AuthorRepository } from '../repositories/author.repository';
+import { BookRepository } from '../repositories/book.repository';
+
+import { Logger } from '../core/logger';
+const log = Logger('app:context:DataLoadersContext');
+
+
+export class DataLoadersContext {
+
+    private authorDataLaoder: DataLoader<number, any>;
+    private bookDataLaoder: DataLoader<number, any>;
+
+    public get AuthorDataLoader() {
+        return this.authorDataLaoder;
+    }
+
+    public get BookDataLoader() {
+        return this.bookDataLaoder;
+    }
+
+    public setAuthorDataLoader(authorRepository: AuthorRepository): DataLoadersContext {
+        this.authorDataLaoder = new DataLoader((ids: number[]) => authorRepository.findAuthorsByIds(ids));
+        log.debug('setAuthorDataLoader');
+        return this;
+    }
+
+    public setBookDataLoader(bookRepository: BookRepository): DataLoadersContext {
+        this.bookDataLaoder = new DataLoader((ids: number[]) => bookRepository.findBooksByIds(ids));
+        log.debug('setBookDataLoader');
+        return this;
+    }
+
+}

src/context/dataloaders-context.ts

@@ -0,0 +1,33 @@
+import { AuthorRepository } from '../repositories/author.repository';
+import { BookRepository } from '../repositories/book.repository';
+
+import { Logger } from '../core/logger';
+const log = Logger('app:context:RepositoriesContext');
+
+
+export class RepositoriesContext {
+
+    private authorRepository: AuthorRepository;
+    private bookRepository: BookRepository;
+
+    public get AuthorRepository() {
+        return this.authorRepository;
+    }
+
+    public get BookRepository() {
+        return this.bookRepository;
+    }
+
+    public setAuthorRepository(authorRepository: AuthorRepository): RepositoriesContext {
+        this.authorRepository = authorRepository;
+        log.debug('setAuthorRepository');
+        return this;
+    }
+
+    public setBookRepository(bookRepository: BookRepository): RepositoriesContext {
+        this.bookRepository = bookRepository;
+        log.debug('setBookRepository');
+        return this;
+    }
+
+}

src/context/repositories-context.ts

@@ -1,4 +1,4 @@
-const config = require('../../config');
+const config = require('./config');
 
 export const name = (): string => process.env.NODE_ENV || 'development';
 

config.ts src/core/config.ts

@@ -8,7 +8,7 @@ import { makeAuthor } from '../factories/author.factory';
 exports.seed = (db: Knex) => {
 
     // generate fake authors
-    let entries = _.times(1000, () => makeAuthor().buildRaw());
+    let entries = _.times(1000, () => makeAuthor().toDatabaseObject);
 
     // Inserts seed entries
     return db(TABLE.AUTHOR).insert(entries);

src/core/environment.ts

@@ -13,7 +13,7 @@ exports.seed = async (db: Knex) => {
 
     let entries = [];
     _.forEach(authorIds, (authorId: number) => {
-        entries = _.concat(entries, _.times(10, () => makeBook(authorId).buildRaw()));
+        entries = _.concat(entries, _.times(10, () => makeBook(authorId).toDatabaseObject()));
     });
 
     // Inserts seed entries

src/database/seeds/20170220183349_authors.ts

@@ -33,31 +33,39 @@ app.use(morgan('dev', debugStream));
 app.use(morgan('combined', winstonStream));
 
 
+// Requests to /graphql redirect to /
+app.all('/graphql', (req, res) => res.redirect('/'));
+
+
 // Add GraphQL API to our express app
 import { db } from './core/database';
 import { schema } from './schemas';
 import { RootValue } from './root-value';
-import { Context } from './context';
+import { Context } from './context/context';
+import { RepositoriesContext } from './context/repositories-context';
+import { DataLoadersContext } from './context/dataloaders-context';
 
 import { AuthorRepository } from './repositories/author.repository';
 import { BookRepository } from './repositories/book.repository';
 
-// Requests to /graphql redirect to /
-app.all('/graphql', (req, res) => res.redirect('/'));
+
+const repositoriesContext = new RepositoriesContext()
+    .setAuthorRepository(new AuthorRepository(db))
+    .setBookRepository(new BookRepository(db));
+
+const dataLoadersContext = new DataLoadersContext()
+    .setAuthorDataLoader(repositoriesContext.AuthorRepository)
+    .setBookDataLoader(repositoriesContext.BookRepository);
+
 
 app.use('/', (req: express.Request, res: express.Response) => {
     log.debug('Setup GraphQLHTTP');
 
-    // Set all needed repositories and config a data loader within the setter
-    const context = new Context(req, res)
-        .setAuthorRepository(new AuthorRepository(db))
-        .setBookRepository(new BookRepository(db));
-
     // Creates a GraphQLHTTP per request
     GraphQLHTTP({
         schema: schema,
         rootValue: new RootValue(),
-        context: context,
+        context: new Context(req, res, repositoriesContext, dataLoadersContext),
         graphiql: environment.server.graphiql
     })(req, res);
 

src/database/seeds/20170221195948_book.ts

@@ -1,4 +1,4 @@
-import { Context } from '../context';
+import { Context } from '../context/context';
 
 
 export interface IGraphQLField {
@@ -84,7 +84,7 @@ export class AbstractField {
     public resolve = async (source, args, context: Context): Promise<any> => {
         //first check roles
         if (!context.hasUserRoles(this.allow)) {
-            return context.repsonse.send(401);
+            return context.Response.send(401);
         }
 
         //go throw before

src/index.ts

@@ -0,0 +1,7 @@
+import { AbstractQuery, IGraphQLQuery } from './abstract.query';
+
+export interface IGraphQLMutation extends IGraphQLQuery {
+}
+
+export class AbstractMutation extends AbstractQuery {
+}

src/schemas/abstract.field.ts

@@ -1,4 +1,4 @@
-import { Context } from '../context';
+import { Context } from '../context/context';
 
 
 export interface IGraphQLQuery {
@@ -84,7 +84,7 @@ export class AbstractQuery {
     public resolve = async (root, args, context: Context): Promise<any> => {
         //first check roles
         if (!context.hasUserRoles(this.allow)) {
-            return context.repsonse.send(401);
+            return context.Response.send(401);
         }
 
         //go throw before

src/schemas/abstract.mutation.ts

@@ -1,6 +1,6 @@
 import { GraphQLFieldDefinition } from 'graphql';
 
-import { Context } from '../../context';
+import { Context } from '../../context/context';
 import { AbstractField, IGraphQLField } from '../abstract.field';
 import { AuthorType } from '../author/author.type';
 import { Book } from '../../models/book.model';
@@ -21,10 +21,10 @@ export class AuthorField extends AbstractField implements GraphQLFieldDefinition
         log.debug('Resolve auhtor %s of the book ' + source.id, source.authorId);
 
         // Repo way
-        // return context.repos.author.findAuthorById(source.authorId);
+        // return context.getRepositories().getAuthorRepository().findAuthorById(source.authorId);
 
         // DataLoader
-        return context.loaders.author.load(source.authorId);
+        return context.DataLoaders.AuthorDataLoader.load(source.authorId);
 
         // Benchmark with 1000 Authors and per Author 10 Books
         // With Loaders => ca. 2s