Fetch video likes/dislikes too

[github/Chocobozzz/PeerTube.git] / server / helpers / database-utils.ts

diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts
index e174dc3e960594ee7e6e2412ec09b5f6d9f9bd02..dacd747c92c700a0bbd0913e25adfce54f79754e 100644 (file)
--- a/server/helpers/database-utils.ts
+++ b/server/helpers/database-utils.ts
@@ -1,39 +1,37 @@
 // TODO: import from ES6 when retry typing file will include errorFilter function
 import * as retry from 'async/retry'
-import * as Promise from 'bluebird'
-
+import * as Bluebird from 'bluebird'
 import { logger } from './logger'
 
 type RetryTransactionWrapperOptions = { errorMessage: string, arguments?: any[] }
-function retryTransactionWrapper (functionToRetry: (... args) => Promise<any>, options: RetryTransactionWrapperOptions) {
+function retryTransactionWrapper <T> (
+  functionToRetry: (...args) => Promise<T> | Bluebird<T>,
+  options: RetryTransactionWrapperOptions
+): Promise<T> {
   const args = options.arguments ? options.arguments : []
 
-  return transactionRetryer(
-    function (callback) {
-      functionToRetry.apply(this, args)
-        .then(result => callback(null, result))
+  return transactionRetryer<T>(callback => {
+    functionToRetry.apply(this, args)
+        .then((result: T) => callback(null, result))
         .catch(err => callback(err))
-    }
-  )
+  })
   .catch(err => {
-    // Do not throw the error, continue the process
     logger.error(options.errorMessage, err)
+    throw err
   })
 }
 
-function transactionRetryer (func: Function) {
-  return new Promise((res, rej) => {
+function transactionRetryer <T> (func: (err: any, data: T) => any) {
+  return new Promise<T>((res, rej) => {
     retry({
       times: 5,
 
-      errorFilter: function (err) {
+      errorFilter: err => {
         const willRetry = (err.name === 'SequelizeDatabaseError')
         logger.debug('Maybe retrying the transaction function.', { willRetry })
         return willRetry
       }
-    }, func, function (err) {
-      err ? rej(err) : res()
-    })
+    }, func, (err, data) => err ? rej(err) : res(data))
   })
 }