Server: create transaction refractoring

2 files changed, 56 insertions, 35 deletions

diff --git a/server/helpers/database-utils.js b/server/helpers/database-utils.js
new file mode 100644
index 000000000..046717517
--- /dev/null
+++ b/server/helpers/database-utils.js
@@ -0,0 +1,55 @@
+'use strict'
+
+const retry = require('async/retry')
+
+const db = require('../initializers/database')
+const logger = require('./logger')
+
+const utils = {
+  retryTransactionWrapper,
+  transactionRetryer,
+  startSerializableTransaction
+}
+
+// { arguments, errorMessage }
+function retryTransactionWrapper (functionToRetry, options, finalCallback) {
+  const args = options.arguments ? options.arguments : []
+
+  utils.transactionRetryer(
+    function (callback) {
+      return functionToRetry.apply(this, args.concat([ callback ]))
+    },
+    function (err) {
+      if (err) {
+        logger.error(options.errorMessage, { error: err })
+      }
+
+      // Do not return the error, continue the process
+      return finalCallback(null)
+    }
+  )
+}
+
+function transactionRetryer (func, callback) {
+  retry({
+    times: 5,
+
+    errorFilter: function (err) {
+      const willRetry = (err.name === 'SequelizeDatabaseError')
+      logger.debug('Maybe retrying the transaction function.', { willRetry })
+      return willRetry
+    }
+  }, func, callback)
+}
+
+function startSerializableTransaction (callback) {
+  console.log(db)
+  db.sequelize.transaction({ isolationLevel: 'SERIALIZABLE' }).asCallback(function (err, t) {
+    // We force to return only two parameters
+    return callback(err, t)
+  })
+}
+
+// ---------------------------------------------------------------------------
+
+module.exports = utils
diff --git a/server/helpers/utils.js b/server/helpers/utils.js
index fb4dd08cc..9f4b14582 100644
--- a/server/helpers/utils.js
+++ b/server/helpers/utils.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const crypto = require('crypto')
-const retry = require('async/retry')
 
 const logger = require('./logger')
 
@@ -10,9 +9,7 @@ const utils = {
   cleanForExit,
   generateRandomString,
   isTestInstance,
-  getFormatedObjects,
-  retryWrapper,
-  transactionRetryer
+  getFormatedObjects
 }
 
 function badRequest (req, res, next) {
@@ -49,37 +46,6 @@ function getFormatedObjects (objects, objectsTotal) {
   }
 }
 
-// { arguments, errorMessage }
-function retryWrapper (functionToRetry, options, finalCallback) {
-  const args = options.arguments ? options.arguments : []
-
-  utils.transactionRetryer(
-    function (callback) {
-      return functionToRetry.apply(this, args.concat([ callback ]))
-    },
-    function (err) {
-      if (err) {
-        logger.error(options.errorMessage, { error: err })
-      }
-
-      // Do not return the error, continue the process
-      return finalCallback(null)
-    }
-  )
-}
-
-function transactionRetryer (func, callback) {
-  retry({
-    times: 5,
-
-    errorFilter: function (err) {
-      const willRetry = (err.name === 'SequelizeDatabaseError')
-      logger.debug('Maybe retrying the transaction function.', { willRetry })
-      return willRetry
-    }
-  }, func, callback)
-}
-
 // ---------------------------------------------------------------------------
 
 module.exports = utils