Adicionado teste para veririfcar se a instancia da aplicação só retorna após o fim da execução do migration.

fernandocode · fernandocode · commit 585b42c3c415 · 2020-03-24T17:14:11.000-03:00
diff --git a/projects/ionic-database-builder/src/lib/defaults/database-settings-factory-default.ts b/projects/ionic-database-builder/src/lib/defaults/database-settings-factory-default.ts
@@ -3,7 +3,6 @@ import { Injector, Injectable } from '@angular/core';
 import { DatabaseSettingsModel } from '../model/database-settings-model';
 import { DatabaseSettingsFactoryContract } from '../utils';
 
-@Injectable()
 export class DatabaseSettingsFactoryDefault extends DatabaseSettingsFactoryContract {
 
     private _model: DatabaseSettingsModel;
diff --git a/projects/ionic-database-builder/src/lib/services/database-migration-contract.ts b/projects/ionic-database-builder/src/lib/services/database-migration-contract.ts
@@ -5,6 +5,15 @@ import { Version } from '../model/version-model';
 
 export abstract class DatabaseMigrationContract {
 
+    public onStart() {
+    }
+
+    public onFinish() {
+    }
+
+    public onProgress() {
+    }
+
     public abstract to(
         version: Version,
         database: DatabaseObject,
diff --git a/projects/ionic-database-builder/src/lib/services/database-migration.ts b/projects/ionic-database-builder/src/lib/services/database-migration.ts
@@ -48,6 +48,7 @@ export class DatabaseMigration extends DatabaseMigrationBase implements Database
 
             let observablesNested: Array<Observable<any>> = [];
             if (this._databaseMigrationContract) {
+                this._databaseMigrationContract.onStart();
                 const toObservables = this._databaseMigrationContract.to(
                     version,
                     database,
@@ -63,13 +64,18 @@ export class DatabaseMigration extends DatabaseMigrationBase implements Database
                 observablesNested.push(this.reset(database));
             }
 
+            if (observablesNested.length > 0) {
+                this._databaseMigrationContract.onProgress();
+            }
             this.callNested(observablesNested, 0)
                 .subscribe((result: boolean) => {
                     observer.next(result);
                     observer.complete();
                 }, (error: any) => {
                     observer.error(error);
                     observer.complete();
+                }, () => {
+                    this._databaseMigrationContract.onFinish();
                 });
         });
     }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,10 +1,4 @@
 import { Component } from '@angular/core';
-import { Uf } from './database/models/uf';
-import { Regiao } from './database/models/regiao';
-import { SubRegiao } from './database/models/sub-regiao';
-import { Cidade } from './database/models/cidade';
-import { Classificacao } from './database/models/classificacao';
-import { Cliente } from './database/models/cliente';
 import { Database } from 'ionic-database-builder';
 
 @Component({
diff --git a/src/app/database/provider/database-migration-service.ts b/src/app/database/provider/database-migration-service.ts
@@ -15,7 +15,9 @@ export class DatabaseMigrationService extends DatabaseMigrationContract {
         const observablesNested: Observable<any>[] = [];
 
         if (!(window as any)._resetCalled) {
-            resettable.reset(database);
+            // resettable.reset(database).subscribe(sub => {}, err => console.error(err));
+            observablesNested.push(resettable.reset(database));
+            console.log('start resetable');
             (window as any)._resetCalled = true;
         }
 
diff --git a/src/app/database/provider/database-migration-test-service.ts b/src/app/database/provider/database-migration-test-service.ts
@@ -0,0 +1,61 @@
+import { GetMapper, DatabaseObject } from 'database-builder';
+import { Injectable, EventEmitter } from '@angular/core';
+import { Observable } from 'rxjs';
+import { DatabaseMigrationContract, DatabaseResettableContract, Version } from 'ionic-database-builder';
+
+export enum MigrationStatus {
+    Started,
+    Finished
+}
+
+@Injectable()
+export class MigrationFlowService {
+
+    public $statusEvent: EventEmitter<MigrationStatus> = new EventEmitter();
+
+    private _status: MigrationStatus;
+
+    public get status(): MigrationStatus {
+        return this._status;
+    }
+
+    public set status(v: MigrationStatus) {
+        // console.log(`update status: ${v === MigrationStatus.Started ? 'Started' : 'Finished'}`);
+        this._status = v;
+        this.$statusEvent.emit(v);
+    }
+
+}
+
+@Injectable()
+export class DatabaseMigrationTestService extends DatabaseMigrationContract {
+
+    constructor(private flow: MigrationFlowService) {
+        super();
+    }
+
+    public onStart() {
+        this.flow.status = MigrationStatus.Started;
+    }
+
+    public onFinish() {
+        this.flow.status = MigrationStatus.Finished;
+    }
+
+    public to(
+        version: Version,
+        database: DatabaseObject,
+        mappers: GetMapper,
+        resettable: DatabaseResettableContract
+    ): Observable<any>[] {
+        const observablesNested: Observable<any>[] = [];
+
+        if (!(window as any)._resetCalled) {
+            observablesNested.push(resettable.reset(database));
+            console.log('start resetable');
+            (window as any)._resetCalled = true;
+        }
+
+        return observablesNested;
+    }
+}
diff --git a/src/app/migration-test.spec.ts b/src/app/migration-test.spec.ts
@@ -0,0 +1,103 @@
+import { Cidade } from './database/models/cidade';
+import { TestBed, async } from '@angular/core/testing';
+import { AppComponent } from './app.component';
+import { DatabaseSettingsFactory } from './database/factory/database-settings-factory';
+import { DatabaseMigrationService } from './database/provider/database-migration-service';
+import { TableMapper } from './database/mapper/table-mapper';
+import { IonicDatabaseBuilderModule, Database, WebSqlDatabaseService } from 'ionic-database-builder';
+import { Uf } from './database/models/uf';
+import { Regiao } from './database/models/regiao';
+import { SubRegiao } from './database/models/sub-regiao';
+import { Classificacao } from './database/models/classificacao';
+import { Cliente } from './database/models/cliente';
+import { PlatformLoadDefault } from 'projects/ionic-database-builder/src/lib/utils/platform-load-default';
+import { MigrationFlowService, DatabaseMigrationTestService, MigrationStatus } from './database/provider/database-migration-test-service';
+
+describe('Migration test', () => {
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            declarations: [
+                AppComponent
+            ],
+            imports: [
+                IonicDatabaseBuilderModule.forRoot(
+                    DatabaseSettingsFactory,
+                    WebSqlDatabaseService,
+                    DatabaseMigrationTestService,
+                    PlatformLoadDefault,
+                    false,
+                    true,
+                )
+            ],
+            providers: [
+                TableMapper,
+                MigrationFlowService
+            ],
+        });
+    }));
+
+    const clienteToSave = {
+        codeImport: 1,
+        razaoSocial: void 0,
+        apelido: 'Apelido',
+        cidade: {
+            codeImport: 2,
+            nome: 'Cidade',
+            uf: {
+                codeImport: 'SC',
+                nome: 'Santa Catarina'
+            } as Uf,
+            subRegiao: {
+                codeImport: 4,
+                nome: 'Sub Região',
+                regiao: {
+                    codeImport: 5,
+                    nome: 'Região'
+                } as Regiao
+            } as SubRegiao,
+        } as Cidade,
+        classificacao: {
+            codeImport: 3,
+            descricao: 'Top'
+        } as Classificacao,
+        desativo: false
+    } as Cliente;
+
+    it('Test mapper insert T', async () => {
+        const migrationFlow: MigrationFlowService = TestBed.get(MigrationFlowService);
+
+        let wasStarted: boolean = false;
+        migrationFlow.$statusEvent.subscribe((status: MigrationStatus) => {
+            if (!wasStarted && status === MigrationStatus.Started) {
+                wasStarted = true;
+            }
+            // console.log(`update status: ${status === MigrationStatus.Started ? 'Started' : 'Finished'}`);
+        });
+
+        const database: Database = TestBed.get(Database);
+
+        expect(migrationFlow.status).toBeUndefined();
+        const crud = await database.crud().toPromise();
+        expect(migrationFlow.status).toEqual(MigrationStatus.Finished);
+        expect(wasStarted).toEqual(true);
+
+        await crud.delete(Cliente).execute().toPromise();
+
+        const insert = crud.insert(Cliente, { modelToSave: clienteToSave });
+        const result = insert.compile();
+        expect(result[0].params.toString()).toEqual([
+            clienteToSave.codeImport, clienteToSave.razaoSocial, clienteToSave.apelido,
+            clienteToSave.desativo, clienteToSave.cidade.codeImport, clienteToSave.classificacao.codeImport
+        ].toString());
+        expect(result[0].query).toEqual('INSERT INTO Cliente (codeImport, razaoSocial, apelido, desativo, cidade_codeImport, classificacao_codeImport) VALUES (?, ?, ?, ?, ?, ?)');
+
+        const insertResult = await insert.execute().toPromise();
+        expect(insertResult[0].insertId).toBeGreaterThan(0);
+
+        const queryResultNull = await crud.query(Cliente)
+            .where(where => where.isNull(x => x.razaoSocial))
+            .toList().toPromise();
+
+        expect(queryResultNull.length).toEqual(1);
+    });
+});
diff --git a/src/test.ts b/src/test.ts
@@ -15,7 +15,7 @@ getTestBed().initTestEnvironment(
   platformBrowserDynamicTesting()
 );
 // Then we find all the tests.
-// const context = require.context('./', true, /managed-transaction\.spec\.ts$/);
+// const context = require.context('./', true, /migration-test\.spec\.ts$/);
 const context = require.context('./', true, /\.spec\.ts$/);
 // And load the modules.
 context.keys().map(context);

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@ export class DatabaseMigrationService extends DatabaseMigrationContract {`
`15`	`15`	`const observablesNested: Observable<any>[] = [];`
`16`	`16`
`17`	`17`	`if (!(window as any)._resetCalled) {`
`18`		`- resettable.reset(database);`
	`18`	`+ // resettable.reset(database).subscribe(sub => {}, err => console.error(err));`
	`19`	`+ observablesNested.push(resettable.reset(database));`
	`20`	`+ console.log('start resetable');`
`19`	`21`	`(window as any)._resetCalled = true;`
`20`	`22`	`}`
`21`	`23`