3 files changed, 27 insertions, 85 deletions

diff --git a/server/models/application/application-interface.ts b/server/models/application/application-interface.ts
deleted file mode 100644
index 2c391dba3..000000000
--- a/server/models/application/application-interface.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import * as Sequelize from 'sequelize'
-import * as Bluebird from 'bluebird'
-
-export namespace ApplicationMethods {
-  export type LoadMigrationVersion = () => Bluebird<number>
-
-  export type UpdateMigrationVersion = (
-    newVersion: number,
-    transaction: Sequelize.Transaction
-  ) => Bluebird<[ number, ApplicationInstance[] ]>
-
-  export type CountTotal = () => Bluebird<number>
-}
-
-export interface ApplicationClass {
-  loadMigrationVersion: ApplicationMethods.LoadMigrationVersion
-  updateMigrationVersion: ApplicationMethods.UpdateMigrationVersion
-  countTotal: ApplicationMethods.CountTotal
-}
-
-export interface ApplicationAttributes {
-  migrationVersion: number
-}
-
-export interface ApplicationInstance extends ApplicationClass, ApplicationAttributes, Sequelize.Instance<ApplicationAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-}
-
-export interface ApplicationModel extends ApplicationClass, Sequelize.Model<ApplicationInstance, ApplicationAttributes> {}
diff --git a/server/models/application/application.ts b/server/models/application/application.ts
index 8ba40a895..f3c0f1052 100644
--- a/server/models/application/application.ts
+++ b/server/models/application/application.ts
@@ -1,61 +1,35 @@
-import * as Sequelize from 'sequelize'
-
-import { addMethodsToModel } from '../utils'
-import {
-  ApplicationAttributes,
-  ApplicationInstance,
-
-  ApplicationMethods
-} from './application-interface'
-
-let Application: Sequelize.Model<ApplicationInstance, ApplicationAttributes>
-let loadMigrationVersion: ApplicationMethods.LoadMigrationVersion
-let updateMigrationVersion: ApplicationMethods.UpdateMigrationVersion
-let countTotal: ApplicationMethods.CountTotal
+import { Transaction } from 'sequelize'
+import { AllowNull, Column, Default, IsInt, Model, Table } from 'sequelize-typescript'
+
+@Table({
+  tableName: 'application'
+})
+export class ApplicationModel extends Model<ApplicationModel> {
+
+  @AllowNull(false)
+  @Default(0)
+  @IsInt
+  @Column
+  migrationVersion: number
+
+  static countTotal () {
+    return ApplicationModel.count()
+  }
 
-export default function defineApplication (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  Application = sequelize.define<ApplicationInstance, ApplicationAttributes>('Application',
-    {
-      migrationVersion: {
-        type: DataTypes.INTEGER,
-        defaultValue: 0,
-        allowNull: false,
-        validate: {
-          isInt: true
-        }
-      }
+  static loadMigrationVersion () {
+    const query = {
+      attributes: [ 'migrationVersion' ]
     }
-  )
-
-  const classMethods = [
-    countTotal,
-    loadMigrationVersion,
-    updateMigrationVersion
-  ]
-  addMethodsToModel(Application, classMethods)
-
-  return Application
-}
 
-// ---------------------------------------------------------------------------
-
-countTotal = function () {
-  return this.count()
-}
-
-loadMigrationVersion = function () {
-  const query = {
-    attributes: [ 'migrationVersion' ]
+    return ApplicationModel.findOne(query).then(data => data ? data.migrationVersion : null)
   }
 
-  return Application.findOne(query).then(data => data ? data.migrationVersion : null)
-}
+  static updateMigrationVersion (newVersion: number, transaction: Transaction) {
+    const options = {
+      where: {},
+      transaction: transaction
+    }
 
-updateMigrationVersion = function (newVersion: number, transaction: Sequelize.Transaction) {
-  const options: Sequelize.UpdateOptions = {
-    where: {},
-    transaction: transaction
+    return ApplicationModel.update({ migrationVersion: newVersion }, options)
   }
-
-  return Application.update({ migrationVersion: newVersion }, options)
 }
diff --git a/server/models/application/index.ts b/server/models/application/index.ts
deleted file mode 100644
index 706f85cb9..000000000
--- a/server/models/application/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './application-interface'