@villedemontreal/mongo 7.0.0-beta → 7.0.1

package/src/mongoUpdater.test.ts

@@ -50,14 +50,14 @@ describe('Mongo Updater', () => {
     await mongoDb.dropDatabase();
   });
 
-  describe('getSchemaVersion', async () => {
+  describe('getSchemaVersion', () => {
     it('should contain schema version 0.0.0', async () => {
       const version: string = await mongoUpdater.getAppSchemaVersion();
       assert.strictEqual(version, '0.0.0');
     });
   });
 
-  describe('checkInstall', async () => {
+  describe('checkInstall', () => {
     let installAppSchemaCollectionSpy: sinon.SinonSpy;
 
     beforeEach(async () => {
@@ -108,14 +108,14 @@ describe('Mongo Updater', () => {
     });
   });
 
-  describe('getSchemaVersion', async () => {
+  describe('getSchemaVersion', () => {
     it('should contain schema version 0.0.0', async () => {
       const version: string = await mongoUpdater.getAppSchemaVersion();
       assert.strictEqual(version, '0.0.0');
     });
   });
 
-  describe('lock', async () => {
+  describe('lock', () => {
     it('lock should be equal to false', async () => {
       const schema: MongoDb.Collection = mongoDb.collection(
         testconfig.updater.appSchemaCollectionName
@@ -143,7 +143,7 @@ describe('Mongo Updater', () => {
     });
   });
 
-  describe('unlock', async () => {
+  describe('unlock', () => {
     it('lock should be equal to true', async () => {
       const schema: MongoDb.Collection = mongoDb.collection(
         testconfig.updater.appSchemaCollectionName
@@ -177,7 +177,7 @@ describe('Mongo Updater', () => {
     });
   });
 
-  describe('updateSchemaVersion', async () => {
+  describe('updateSchemaVersion', () => {
     it('should contain schema version 0.0.0', async () => {
       const version: string = await mongoUpdater.getAppSchemaVersion();
       assert.strictEqual(version, '0.0.0');
@@ -198,7 +198,7 @@ describe('Mongo Updater', () => {
     });
   });
 
-  describe('checkUpdate', async () => {
+  describe('checkUpdate', () => {
     let lockSpy: sinon.SinonSpy;
     let applyUpdateSchemasSpy: sinon.SinonSpy;
     let updateSchemaVersionSpy: sinon.SinonSpy;
@@ -262,7 +262,7 @@ describe('Mongo Updater', () => {
     });
   });
 
-  describe('getUpdateFiles', async () => {
+  describe('getUpdateFiles', () => {
     it('should not contain files for version between 0.0.0 and 0.0.0', async () => {
       const files: string[] = await mongoUpdater.getAppSchemaUpdateFiles('0.0.0', '0.0.0');
       assert.strictEqual(files.length, 0);
@@ -281,7 +281,7 @@ describe('Mongo Updater', () => {
     });
   });
 
-  describe('applyUpdateSchemas', async () => {
+  describe('applyUpdateSchemas', () => {
     let getUpdateFilesSpy: sinon.SinonSpy;
     beforeEach(async () => {
       getUpdateFilesSpy = sinon.spy(mongoUpdater, 'getAppSchemaUpdateFiles');

package/src/mongoUpdater.ts

@@ -235,7 +235,7 @@ export class MongoUpdater implements IMongoUpdater {
   }
 
   public async getAppSchemaCollection(): Promise<MongoDb.Collection> {
-    return await this.mongoDb.collection(this.appSchemaCollectionName);
+    return this.mongoDb.collection(this.appSchemaCollectionName);
   }
 
   public async getAppSchemaVersion(): Promise<string> {
@@ -367,14 +367,15 @@ export class MongoUpdater implements IMongoUpdater {
     logger.info('Checking for db app schema updates:');
 
     let lockAcquired = false;
+    let currentAppSchemaVersion: string | undefined;
     const targetVersion: string = this.findMongoAppSchemaTargetVersion();
     try {
-      while (true) {
+      while (!lockAcquired) {
         // ==========================================
         // Checks if the appSchema version has to be
         // updated.
         // ==========================================
-        const currentAppSchemaVersion: string = await this.getAppSchemaVersion();
+        currentAppSchemaVersion = await this.getAppSchemaVersion();
         if (semver.gte(currentAppSchemaVersion, targetVersion)) {
           // tslint:disable-next-line: prefer-template
           logger.info(
@@ -383,13 +384,6 @@ export class MongoUpdater implements IMongoUpdater {
           return;
         }
 
-        if (lockAcquired) {
-          logger.info(` > Applying some required updates...`);
-          await this.applyAppSchemaUpdates(currentAppSchemaVersion, targetVersion);
-          await this.updateAppSchemaVersion(currentAppSchemaVersion, targetVersion);
-          return;
-        }
-
         // ==========================================
         // Tries to get the lock. Will do this as long
         // as the lock can't be acquired (ie : it is
@@ -408,6 +402,11 @@ export class MongoUpdater implements IMongoUpdater {
           logger.info(` > Lock acquired.`);
         }
       }
+      if (lockAcquired && currentAppSchemaVersion) {
+        logger.info(` > Applying some required updates...`);
+        await this.applyAppSchemaUpdates(currentAppSchemaVersion, targetVersion);
+        await this.updateAppSchemaVersion(currentAppSchemaVersion, targetVersion);
+      }
     } finally {
       if (lockAcquired) {
         await this.unlockAppSchemaDocument();

package/src/plugins/pagination/index.test.ts

@@ -46,7 +46,7 @@ describe('plugin pagination', () => {
     return authorModel.create({ name: 'Arthur Conan Doyle' }).then((author) => {
       for (let i = 1; i <= 100; i++) {
         book = new bookModel({
-          title: 'Book #' + i,
+          title: `Book #${i}`,
           date: new Date(date.getTime() + i),
           author: author._id,
         });