From 350e31d6b64e4973dfa5e9f7b46841cb09aeb1ad Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Tue, 14 Nov 2017 17:31:26 +0100
Subject: Follow works
---
server/models/application/application-interface.ts | 9 ++++++---
server/models/application/application.ts | 11 ++++++++++-
2 files changed, 16 insertions(+), 4 deletions(-)
(limited to 'server/models/application')
diff --git a/server/models/application/application-interface.ts b/server/models/application/application-interface.ts
index 33254ba2d..2c391dba3 100644
--- a/server/models/application/application-interface.ts
+++ b/server/models/application/application-interface.ts
@@ -1,18 +1,21 @@
import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
+import * as Bluebird from 'bluebird'
export namespace ApplicationMethods {
- export type LoadMigrationVersion = () => Promise<number>
+ export type LoadMigrationVersion = () => Bluebird<number>
export type UpdateMigrationVersion = (
newVersion: number,
transaction: Sequelize.Transaction
- ) => Promise<[ number, ApplicationInstance[] ]>
+ ) => Bluebird<[ number, ApplicationInstance[] ]>
+
+ export type CountTotal = () => Bluebird<number>
}
export interface ApplicationClass {
loadMigrationVersion: ApplicationMethods.LoadMigrationVersion
updateMigrationVersion: ApplicationMethods.UpdateMigrationVersion
+ countTotal: ApplicationMethods.CountTotal
}
export interface ApplicationAttributes {
diff --git a/server/models/application/application.ts b/server/models/application/application.ts
index 507b7a843..8ba40a895 100644
--- a/server/models/application/application.ts
+++ b/server/models/application/application.ts
@@ -11,6 +11,7 @@ import {
let Application: Sequelize.Model<ApplicationInstance, ApplicationAttributes>
let loadMigrationVersion: ApplicationMethods.LoadMigrationVersion
let updateMigrationVersion: ApplicationMethods.UpdateMigrationVersion
+let countTotal: ApplicationMethods.CountTotal
export default function defineApplication (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
Application = sequelize.define<ApplicationInstance, ApplicationAttributes>('Application',
@@ -26,7 +27,11 @@ export default function defineApplication (sequelize: Sequelize.Sequelize, DataT
}
)
- const classMethods = [ loadMigrationVersion, updateMigrationVersion ]
+ const classMethods = [
+ countTotal,
+ loadMigrationVersion,
+ updateMigrationVersion
+ ]
addMethodsToModel(Application, classMethods)
return Application
@@ -34,6 +39,10 @@ export default function defineApplication (sequelize: Sequelize.Sequelize, DataT
// ---------------------------------------------------------------------------
+countTotal = function () {
+ return this.count()
+}
+
loadMigrationVersion = function () {
const query = {
attributes: [ 'migrationVersion' ]
--
cgit v1.2.3