Fix integrity issues with after destroy hook

[github/Chocobozzz/PeerTube.git] / server / models / video / video-blacklist-interface.ts

diff --git a/server/models/video/video-blacklist-interface.ts b/server/models/video/video-blacklist-interface.ts
index 5ca4238016cda88b7fe4e1e4970c7989093ecd17..9d167c0374584afe32522edc1b757d61ab9ea6bb 100644 (file)
--- a/server/models/video/video-blacklist-interface.ts
+++ b/server/models/video/video-blacklist-interface.ts
@@ -1,27 +1,29 @@
 import * as Sequelize from 'sequelize'
 import * as Promise from 'bluebird'
 
+import { SortType } from '../../helpers'
 import { ResultList } from '../../../shared'
+import { VideoInstance } from './video-interface'
 
 // Don't use barrel, import just what we need
-import { BlacklistedVideo as FormatedBlacklistedVideo } from '../../../shared/models/video-blacklist.model'
+import { BlacklistedVideo as FormattedBlacklistedVideo } from '../../../shared/models/videos/video-blacklist.model'
 
 export namespace BlacklistedVideoMethods {
-  export type ToFormatedJSON = (this: BlacklistedVideoInstance) => FormatedBlacklistedVideo
+  export type ToFormattedJSON = (this: BlacklistedVideoInstance) => FormattedBlacklistedVideo
 
   export type CountTotal = () => Promise<number>
 
   export type List = () => Promise<BlacklistedVideoInstance[]>
 
-  export type ListForApi = (start: number, count: number, sort: string) => Promise< ResultList<BlacklistedVideoInstance> >
+  export type ListForApi = (start: number, count: number, sort: SortType) => Promise< ResultList<BlacklistedVideoInstance> >
 
   export type LoadById = (id: number) => Promise<BlacklistedVideoInstance>
 
-  export type LoadByVideoId = (id: string) => Promise<BlacklistedVideoInstance>
+  export type LoadByVideoId = (id: number) => Promise<BlacklistedVideoInstance>
 }
 
 export interface BlacklistedVideoClass {
-  toFormatedJSON: BlacklistedVideoMethods.ToFormatedJSON
+  toFormattedJSON: BlacklistedVideoMethods.ToFormattedJSON
   countTotal: BlacklistedVideoMethods.CountTotal
   list: BlacklistedVideoMethods.List
   listForApi: BlacklistedVideoMethods.ListForApi
@@ -30,7 +32,9 @@ export interface BlacklistedVideoClass {
 }
 
 export interface BlacklistedVideoAttributes {
-  videoId: string
+  videoId: number
+
+  Video?: VideoInstance
 }
 
 export interface BlacklistedVideoInstance
@@ -39,7 +43,7 @@ export interface BlacklistedVideoInstance
   createdAt: Date
   updatedAt: Date
 
-  toFormatedJSON: BlacklistedVideoMethods.ToFormatedJSON
+  toFormattedJSON: BlacklistedVideoMethods.ToFormattedJSON
 }
 
 export interface BlacklistedVideoModel