Use async/await in controllers

[github/Chocobozzz/PeerTube.git] / server / initializers / migrator.ts

diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts
index d381551b583bec39aa1b8b9b0908b7122b48c921..7b535aea956e42febb0c29d707ca9d0398e8eee9 100644 (file)
--- a/server/initializers/migrator.ts
+++ b/server/initializers/migrator.ts
@@ -35,9 +35,7 @@ function migrate () {
       return getMigrationScripts().then(migrationScripts => ({ actualVersion, migrationScripts }))
     })
     .then(({ actualVersion, migrationScripts }) => {
-      return Promise.mapSeries(migrationScripts, entity => {
-        return executeMigration(actualVersion, entity)
-      })
+      return Promise.each(migrationScripts, entity => executeMigration(actualVersion, entity))
     })
     .then(() => {
       logger.info('Migrations finished. New migration version schema: %s', LAST_MIGRATION_VERSION)
@@ -66,14 +64,16 @@ function getMigrationScripts () {
       script: string
     }[] = []
 
-    files.forEach(function (file) {
-      // Filename is something like 'version-blabla.js'
-      const version = file.split('-')[0]
-      filesToMigrate.push({
-        version,
-        script: file
+    files
+      .filter(file => file.endsWith('.js.map') === false)
+      .forEach(file => {
+        // Filename is something like 'version-blabla.js'
+        const version = file.split('-')[0]
+        filesToMigrate.push({
+          version,
+          script: file
+        })
       })
-    })
 
     return filesToMigrate
   })
@@ -95,13 +95,14 @@ function executeMigration (actualVersion: number, entity: { version: string, scr
     const options = {
       transaction: t,
       queryInterface: db.sequelize.getQueryInterface(),
-      sequelize: db.sequelize
+      sequelize: db.sequelize,
+      db
     }
 
-    migrationScript.up(options)
+    return migrationScript.up(options)
       .then(() => {
         // Update the new migration version
-        db.Application.updateMigrationVersion(versionScript, t)
+        return db.Application.updateMigrationVersion(versionScript, t)
       })
   })
 }