Create types for model enums

8 files changed, 22 insertions, 12 deletions

diff --git a/server/models/job/job-interface.ts b/server/models/job/job-interface.ts
index ab6678257..31b377367 100644
--- a/server/models/job/job-interface.ts
+++ b/server/models/job/job-interface.ts
@@ -1,8 +1,10 @@
 import * as Sequelize from 'sequelize'
 
+import { JobState } from '../../../shared/models/job.model'
+
 export namespace JobMethods {
   export type ListWithLimitCallback = (err: Error, jobInstances: JobInstance[]) => void
-  export type ListWithLimit = (limit: number, state: string, callback: ListWithLimitCallback) => void
+  export type ListWithLimit = (limit: number, state: JobState, callback: ListWithLimitCallback) => void
 }
 
 export interface JobClass {
@@ -10,7 +12,7 @@ export interface JobClass {
 }
 
 export interface JobAttributes {
-  state: string
+  state: JobState
   handlerName: string
   handlerInputData: object
 }
diff --git a/server/models/job/job.ts b/server/models/job/job.ts
index 60a6c551b..38e4e8f30 100644
--- a/server/models/job/job.ts
+++ b/server/models/job/job.ts
@@ -11,6 +11,7 @@ import {
 
   JobMethods
 } from './job-interface'
+import { JobState } from '../../../shared/models/job.model'
 
 let Job: Sequelize.Model<JobInstance, JobAttributes>
 let listWithLimit: JobMethods.ListWithLimit
@@ -48,7 +49,7 @@ export default function defineJob (sequelize: Sequelize.Sequelize, DataTypes: Se
 
 // ---------------------------------------------------------------------------
 
-listWithLimit = function (limit: number, state: string, callback: JobMethods.ListWithLimitCallback) {
+listWithLimit = function (limit: number, state: JobState, callback: JobMethods.ListWithLimitCallback) {
   const query = {
     order: [
       [ 'id', 'ASC' ]
diff --git a/server/models/request/request-interface.ts b/server/models/request/request-interface.ts
index 70fd734e1..483850633 100644
--- a/server/models/request/request-interface.ts
+++ b/server/models/request/request-interface.ts
@@ -1,6 +1,7 @@
 import * as Sequelize from 'sequelize'
 
 import { PodInstance, PodAttributes } from '../pod'
+import { RequestEndpoint } from '../../../shared/models/request-scheduler.model'
 
 export type RequestsGrouped = {
   [ podId: number ]: {
@@ -32,7 +33,7 @@ export interface RequestClass {
 
 export interface RequestAttributes {
   request: object
-  endpoint: string
+  endpoint: RequestEndpoint
 }
 
 export interface RequestInstance extends RequestClass, RequestAttributes, Sequelize.Instance<RequestAttributes> {
diff --git a/server/models/request/request-video-event-interface.ts b/server/models/request/request-video-event-interface.ts
index 219d8edc0..3ed03339a 100644
--- a/server/models/request/request-video-event-interface.ts
+++ b/server/models/request/request-video-event-interface.ts
@@ -3,10 +3,12 @@ import * as Sequelize from 'sequelize'
 import { VideoInstance } from '../video'
 import { PodInstance } from '../pod'
 
+import { RequestVideoEventType } from '../../../shared/models/request-scheduler.model'
+
 export type RequestsVideoEventGrouped = {
   [ podId: number ]: {
     id: number
-    type: string
+    type: RequestVideoEventType
     count: number
     video: VideoInstance
     pod: PodInstance
@@ -35,7 +37,7 @@ export interface RequestVideoEventClass {
 }
 
 export interface RequestVideoEventAttributes {
-  type: string
+  type: RequestVideoEventType
   count: number
 }
 
diff --git a/server/models/request/request-video-qadu-interface.ts b/server/models/request/request-video-qadu-interface.ts
index 625b063dc..805771cda 100644
--- a/server/models/request/request-video-qadu-interface.ts
+++ b/server/models/request/request-video-qadu-interface.ts
@@ -3,6 +3,8 @@ import * as Sequelize from 'sequelize'
 import { VideoInstance } from '../video'
 import { PodInstance } from '../pod'
 
+import { RequestVideoQaduType } from '../../../shared/models/request-scheduler.model'
+
 export type RequestsVideoQaduGrouped = {
   [ podId: number ]: {
     request: RequestVideoQaduInstance
@@ -33,7 +35,7 @@ export interface RequestVideoQaduClass {
 }
 
 export interface RequestVideoQaduAttributes {
-  type: string
+  type: RequestVideoQaduType
 }
 
 export interface RequestVideoQaduInstance extends RequestVideoQaduClass, RequestVideoQaduAttributes, Sequelize.Instance<RequestVideoQaduAttributes> {
diff --git a/server/models/user/user-interface.ts b/server/models/user/user-interface.ts
index 6726e8ab5..fd98a042e 100644
--- a/server/models/user/user-interface.ts
+++ b/server/models/user/user-interface.ts
@@ -2,7 +2,7 @@ import * as Sequelize from 'sequelize'
 import * as Bluebird from 'bluebird'
 
 // Don't use barrel, import just what we need
-import { User as FormatedUser } from '../../../shared/models/user.model'
+import { UserRole, User as FormatedUser } from '../../../shared/models/user.model'
 
 export namespace UserMethods {
   export type IsPasswordMatchCallback = (err: Error, same: boolean) => void
@@ -51,7 +51,7 @@ export interface UserAttributes {
   username: string
   email: string
   displayNSFW?: boolean
-  role: string
+  role: UserRole
 }
 
 export interface UserInstance extends UserClass, UserAttributes, Sequelize.Instance<UserAttributes> {
diff --git a/server/models/user/user-video-rate-interface.ts b/server/models/user/user-video-rate-interface.ts
index e48869fd2..a726639b1 100644
--- a/server/models/user/user-video-rate-interface.ts
+++ b/server/models/user/user-video-rate-interface.ts
@@ -1,8 +1,10 @@
 import * as Sequelize from 'sequelize'
 
+import { VideoRateType } from '../../../shared/models/user-video-rate.model'
+
 export namespace UserVideoRateMethods {
   export type LoadCallback = (err: Error, userVideoRateInstance: UserVideoRateInstance) => void
-  export type Load = (userId, videoId, transaction, callback) => void
+  export type Load = (userId: number, videoId: string, transaction: Sequelize.Transaction, callback: LoadCallback) => void
 }
 
 export interface UserVideoRateClass {
@@ -10,7 +12,7 @@ export interface UserVideoRateClass {
 }
 
 export interface UserVideoRateAttributes {
-  type: string
+  type: VideoRateType
 }
 
 export interface UserVideoRateInstance extends UserVideoRateClass, UserVideoRateAttributes, Sequelize.Instance<UserVideoRateAttributes> {
diff --git a/server/models/user/user-video-rate.ts b/server/models/user/user-video-rate.ts
index 68be62fc2..1094eb281 100644
--- a/server/models/user/user-video-rate.ts
+++ b/server/models/user/user-video-rate.ts
@@ -67,7 +67,7 @@ function associate (models) {
   })
 }
 
-load = function (userId: number, videoId: number, transaction: Sequelize.Transaction, callback: UserVideoRateMethods.LoadCallback) {
+load = function (userId: number, videoId: string, transaction: Sequelize.Transaction, callback: UserVideoRateMethods.LoadCallback) {
   const options: Sequelize.FindOptions = {
     where: {
       userId,