Add migration to the e2e tests

Author: hirsch88

src/api/models/Pet.ts

@@ -18,12 +18,13 @@ export class Pet {
     public age: number;
 
     @Column({
+        name: 'user_id',
         nullable: true,
     })
     public userId: number;
 
     @ManyToOne(type => User, user => user.pets)
-    @JoinColumn({ name: 'userId' })
+    @JoinColumn({ name: 'user_id' })
     public user: User;
 
     public toString(): string {

src/api/repositories/PetRepository.ts

@@ -5,12 +5,12 @@ import { Pet } from '../models/Pet';
 export class PetRepository extends Repository<Pet> {
 
     /**
-     * Find by userId is used for our data-loader to get all needed pets in one query.
+     * Find by user_id is used for our data-loader to get all needed pets in one query.
      */
     public findByUserIds(ids: string[]): Promise<Pet[]> {
         return this.createQueryBuilder()
             .select()
-            .where(`pet.userId IN (${ids.map(id => `'${id}'`).join(', ')})`)
+            .where(`pet.user_id IN (${ids.map(id => `'${id}'`).join(', ')})`)
             .getMany();
     }
 

src/database/migrations/1511105183653-CreateUserTable.ts

@@ -1,19 +1,40 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
+import { MigrationInterface, QueryRunner, Table } from 'typeorm';
 
 export class CreateUserTable1511105183653 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`
-            CREATE TABLE \`user\` (
-                \`id\` varchar(255) NOT NULL PRIMARY KEY,
-                \`first_name\` varchar(255) NOT NULL,
-                \`last_name\` varchar(255) NOT NULL,
-                \`email\` varchar(255) NOT NULL) ENGINE=InnoDB;`
-        );
+        const table = new Table('user', [
+            {
+                name: 'id',
+                type: 'varchar',
+                length: 255,
+                isPrimary: true,
+                isNullable: false,
+            }, {
+                name: 'first_name',
+                type: 'varchar',
+                length: 255,
+                isPrimary: false,
+                isNullable: false,
+            }, {
+                name: 'last_name',
+                type: 'varchar',
+                length: 255,
+                isPrimary: false,
+                isNullable: false,
+            }, {
+                name: 'email',
+                type: 'varchar',
+                length: 255,
+                isPrimary: false,
+                isNullable: false,
+            },
+        ]);
+        await queryRunner.createTable(table);
     }
 
     public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`DROP TABLE \`user\`;`);
+        await queryRunner.dropTable('user');
     }
 
 }

src/database/migrations/1512663524808-CreatePetTable.ts

@@ -1,19 +1,40 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
+import { MigrationInterface, QueryRunner, Table } from 'typeorm';
 
 export class CreatePetTable1512663524808 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`
-            CREATE TABLE \`pet\` (
-                \`id\` varchar(255) NOT NULL PRIMARY KEY,
-                \`name\` varchar(255) NOT NULL,
-                \`age\` int(11) NOT NULL,
-                \`userId\` varchar(255)) ENGINE=InnoDB;`
-        );
+        const table = new Table('pet', [
+            {
+                name: 'id',
+                type: 'varchar',
+                length: 255,
+                isPrimary: true,
+                isNullable: false,
+            }, {
+                name: 'name',
+                type: 'varchar',
+                length: 255,
+                isPrimary: false,
+                isNullable: false,
+            }, {
+                name: 'age',
+                type: 'int',
+                length: 11,
+                isPrimary: false,
+                isNullable: false,
+            }, {
+                name: 'user_id',
+                type: 'varchar',
+                length: 255,
+                isPrimary: false,
+                isNullable: true,
+            },
+        ]);
+        await queryRunner.createTable(table);
     }
 
     public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`DROP TABLE \`pet\`;`);
+        await queryRunner.dropTable('pet');
     }
 
 }

src/database/migrations/1512663990063-AddUserRelationToPetTable.ts

@@ -1,21 +1,21 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
+import { MigrationInterface, QueryRunner, TableForeignKey } from 'typeorm';
 
 export class AddUserRelationToPetTable1512663990063 implements MigrationInterface {
 
+    private tableForeignKey = new TableForeignKey(
+        'fk_user_pet',
+        ['user_id'],
+        ['id'],
+        'user',
+        ''
+    );
+
     public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`
-            ALTER TABLE \`pet\`
-                ADD CONSTRAINT \`fk_user_pet\`
-                FOREIGN KEY (\`userId\`)
-                REFERENCES \`user\`(\`id\`);`
-        );
+        await queryRunner.createForeignKey('pet', this.tableForeignKey);
     }
 
     public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`
-        ALTER TABLE \`pet\`
-            DROP FOREIGN KEY \`fk_user_pet\`;`
-        );
+        await queryRunner.dropForeignKey('pet', this.tableForeignKey);
     }
 
 }

src/loaders/typeormLoader.ts

@@ -15,6 +15,7 @@ export const typeormLoader: MicroframeworkLoader = async (settings: Microframewo
         synchronize: env.db.synchronize,
         logging: env.db.logging,
         entities: env.app.dirs.entities,
+        migrations: env.app.dirs.migrations,
     });
 
     if (settings) {

test/e2e/api/users.test.ts

@@ -5,7 +5,7 @@ import { getFactory } from './../../../src/lib/seeds/index';
 import { Factory } from './../../../src/lib/seeds/Factory';
 import { User } from './../../../src/api/models/User';
 import { bootstrapApp, BootstrapSettings } from '../utils/bootstrap';
-import { synchronizeDatabase, closeDatabase } from '../../utils/database';
+import { migrateDatabase, closeDatabase } from '../../utils/database';
 import { fakeAuthenticationForUser } from '../utils/auth';
 
 
@@ -20,7 +20,7 @@ describe('/api/users', () => {
     let bruce: User;
     let authServer: nock.Scope;
     beforeAll(async () => settings = await bootstrapApp());
-    beforeAll(async () => synchronizeDatabase(settings.connection));
+    beforeAll(async () => migrateDatabase(settings.connection));
     beforeAll(async () => factory = getFactory(settings.connection));
     beforeAll(async () => bruce = await factory.runSeed<User>(CreateBruce));
     beforeAll(async () => authServer = fakeAuthenticationForUser(bruce, true));

test/integration/PetService.test.ts

@@ -3,7 +3,7 @@ import { Connection } from 'typeorm';
 
 import { Pet } from '../../src/api/models/Pet';
 import { PetService } from './../../src/api/services/PetService';
-import { createDatabaseConnection, synchronizeDatabase, closeDatabase } from '../utils/database';
+import { createDatabaseConnection, migrateDatabase, closeDatabase } from '../utils/database';
 
 describe('PetService', () => {
 
@@ -13,7 +13,7 @@ describe('PetService', () => {
 
     let connection: Connection;
     beforeAll(async () => connection = await createDatabaseConnection());
-    beforeEach(() => synchronizeDatabase(connection));
+    beforeEach(() => migrateDatabase(connection));
 
     // -------------------------------------------------------------------------
     // Tear down

test/utils/database.ts

@@ -10,14 +10,21 @@ export const createDatabaseConnection = async (): Promise<Connection> => {
         database: env.db.database,
         logging: env.db.logging,
         entities: env.app.dirs.entities,
+        migrations: env.app.dirs.migrations,
     });
     return connection;
 };
 
-export const synchronizeDatabase = (connection: Connection) => {
+export const synchronizeDatabase = async (connection: Connection) => {
+    await connection.dropDatabase();
     return connection.synchronize(true);
 };
 
+export const migrateDatabase = async (connection: Connection) => {
+    await connection.dropDatabase();
+    return connection.runMigrations();
+};
+
 export const closeDatabase = (connection: Connection) => {
     return connection.close();
 };