X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Frequest%2Frequest-interface.ts;h=dae35651bf9ebfd3ad85d1ec08d9ed3b4b7129f0;hb=0d0e8dd0904b380b70e19ebcb4763d65601c4632;hp=70fd734e1eb4ebe17e0f8c8711f3a51acd18056f;hpb=74889a71fe687dda74f2a687653122327807af36;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/models/request/request-interface.ts b/server/models/request/request-interface.ts
index 70fd734e1..dae35651b 100644
--- a/server/models/request/request-interface.ts
+++ b/server/models/request/request-interface.ts
@@ -1,6 +1,9 @@
 import * as Sequelize from 'sequelize'
+import * as Promise from 'bluebird'
 
-import { PodInstance, PodAttributes } from '../pod'
+import { AbstractRequestClass } from './abstract-request-interface'
+import { PodInstance, PodAttributes } from '../pod/pod-interface'
+import { RequestEndpoint } from '../../../shared/models/request-scheduler.model'
 
 export type RequestsGrouped = {
   [ podId: number ]: {
@@ -10,20 +13,16 @@ export type RequestsGrouped = {
 }
 
 export namespace RequestMethods {
-  export type CountTotalRequestsCallback = (err: Error, total: number) => void
-  export type CountTotalRequests = (callback: CountTotalRequestsCallback) => void
+  export type CountTotalRequests = () => Promise<number>
 
-  export type ListWithLimitAndRandomCallback = (err: Error, requestsGrouped?: RequestsGrouped) => void
-  export type ListWithLimitAndRandom = (limitPods, limitRequestsPerPod, callback: ListWithLimitAndRandomCallback) => void
+  export type ListWithLimitAndRandom = (limitPods: number, limitRequestsPerPod: number) => Promise<RequestsGrouped>
 
-  export type RemoveWithEmptyToCallback = (err: Error) => void
-  export type RemoveWithEmptyTo = (callback: RemoveWithEmptyToCallback) => void
+  export type RemoveWithEmptyTo = () => Promise<number>
 
-  export type RemoveAllCallback = (err: Error) => void
-  export type RemoveAll = (callback: RemoveAllCallback) => void
+  export type RemoveAll = () => Promise<void>
 }
 
-export interface RequestClass {
+export interface RequestClass extends AbstractRequestClass<RequestsGrouped> {
   countTotalRequests: RequestMethods.CountTotalRequests
   listWithLimitAndRandom: RequestMethods.ListWithLimitAndRandom
   removeWithEmptyTo: RequestMethods.RemoveWithEmptyTo
@@ -32,7 +31,7 @@ export interface RequestClass {
 
 export interface RequestAttributes {
   request: object
-  endpoint: string
+  endpoint: RequestEndpoint
 }
 
 export interface RequestInstance extends RequestClass, RequestAttributes, Sequelize.Instance<RequestAttributes> {