Better models define typing

[github/Chocobozzz/PeerTube.git] / server / models / application.ts

diff --git a/server/models/application.ts b/server/models/application.ts
index acd0dfbf2e38fb9d8c5f651dd29a9b64046027ca..55bb40d840de3178249ddbd0392354a9f9f0a14f 100644 (file)
--- a/server/models/application.ts
+++ b/server/models/application.ts
@@ -13,7 +13,7 @@ let Application: Sequelize.Model<ApplicationInstance, ApplicationAttributes>
 let loadMigrationVersion: ApplicationMethods.LoadMigrationVersion
 let updateMigrationVersion: ApplicationMethods.UpdateMigrationVersion
 
-export default function defineApplication (sequelize: Sequelize.Sequelize, DataTypes) {
+export default function defineApplication (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
   Application = sequelize.define<ApplicationInstance, ApplicationAttributes>('Application',
     {
       migrationVersion: {
@@ -35,7 +35,7 @@ export default function defineApplication (sequelize: Sequelize.Sequelize, DataT
 
 // ---------------------------------------------------------------------------
 
-loadMigrationVersion = function (callback: (err: Error, version: number) => void) {
+loadMigrationVersion = function (callback: ApplicationMethods.LoadMigrationVersionCallback) {
   const query = {
     attributes: [ 'migrationVersion' ]
   }
@@ -47,15 +47,10 @@ loadMigrationVersion = function (callback: (err: Error, version: number) => void
   })
 }
 
-updateMigrationVersion = function (newVersion: number, transaction: any, callback: any) {
+updateMigrationVersion = function (newVersion: number, transaction: Sequelize.Transaction, callback: ApplicationMethods.UpdateMigrationVersionCallback) {
   const options: Sequelize.UpdateOptions = {
-    where: {}
-  }
-
-  if (!callback) {
-    transaction = callback
-  } else {
-    options.transaction = transaction
+    where: {},
+    transaction: transaction
   }
 
   return Application.update({ migrationVersion: newVersion }, options).asCallback(callback)