X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fdatabase-utils.ts;h=1005d2cf19694f16e3f0cf1f000834a9c3a83972;hb=6360e12616d54c2321ee5e3a6523a8b60d70c0a7;hp=fb8ad22b06436849355a5009e200f8e34c9bb5bd;hpb=8d468a16fd33ec2660c3c59b3f7def53eb0cc4a1;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts
index fb8ad22b0..1005d2cf1 100644
--- a/server/helpers/database-utils.ts
+++ b/server/helpers/database-utils.ts
@@ -1,42 +1,83 @@
 import * as retry from 'async/retry'
 import * as Bluebird from 'bluebird'
+import { Model } from 'sequelize-typescript'
 import { logger } from './logger'
 
-type RetryTransactionWrapperOptions = { errorMessage: string, arguments?: any[] }
+function retryTransactionWrapper <T, A, B, C> (
+  functionToRetry: (arg1: A, arg2: B, arg3: C) => Promise<T> | Bluebird<T>,
+  arg1: A,
+  arg2: B,
+  arg3: C
+): Promise<T>
+
+function retryTransactionWrapper <T, A, B> (
+  functionToRetry: (arg1: A, arg2: B) => Promise<T> | Bluebird<T>,
+  arg1: A,
+  arg2: B
+): Promise<T>
+
+function retryTransactionWrapper <T, A> (
+  functionToRetry: (arg1: A) => Promise<T> | Bluebird<T>,
+  arg1: A
+): Promise<T>
+
 function retryTransactionWrapper <T> (
-  functionToRetry: (...args) => Promise<T> | Bluebird<T>,
-  options: RetryTransactionWrapperOptions
-): Promise<T> {
-  const args = options.arguments ? options.arguments : []
+  functionToRetry: () => Promise<T> | Bluebird<T>
+): Promise<T>
 
+function retryTransactionWrapper <T> (
+  functionToRetry: (...args: any[]) => Promise<T> | Bluebird<T>,
+  ...args: any[]
+): Promise<T> {
   return transactionRetryer<T>(callback => {
-    functionToRetry.apply(this, args)
+    functionToRetry.apply(null, args)
         .then((result: T) => callback(null, result))
         .catch(err => callback(err))
   })
   .catch(err => {
-    logger.error(options.errorMessage, err)
+    logger.error(`Cannot execute ${functionToRetry.name} with many retries.`, { err })
     throw err
   })
 }
 
 function transactionRetryer <T> (func: (err: any, data: T) => any) {
   return new Promise<T>((res, rej) => {
-    retry({
-      times: 5,
-
-      errorFilter: err => {
-        const willRetry = (err.name === 'SequelizeDatabaseError')
-        logger.debug('Maybe retrying the transaction function.', { willRetry })
-        return willRetry
-      }
-    }, func, (err, data) => err ? rej(err) : res(data))
+    retry(
+      {
+        times: 5,
+
+        errorFilter: err => {
+          const willRetry = (err.name === 'SequelizeDatabaseError')
+          logger.debug('Maybe retrying the transaction function.', { willRetry, err })
+          return willRetry
+        }
+      },
+      func,
+      (err, data) => err ? rej(err) : res(data)
+    )
+  })
+}
+
+function updateInstanceWithAnother <T extends Model<T>> (instanceToUpdate: Model<T>, baseInstance: Model<T>) {
+  const obj = baseInstance.toJSON()
+
+  for (const key of Object.keys(obj)) {
+    instanceToUpdate.set(key, obj[key])
+  }
+}
+
+function resetSequelizeInstance (instance: Model<any>, savedFields: object) {
+  Object.keys(savedFields).forEach(key => {
+    const value = savedFields[key]
+    instance.set(key, value)
   })
 }
 
 // ---------------------------------------------------------------------------
 
 export {
+  resetSequelizeInstance,
   retryTransactionWrapper,
-  transactionRetryer
+  transactionRetryer,
+  updateInstanceWithAnother
 }