Refactoring transaction boilerplate

Author: davimacedo

src/Adapters/Storage/Mongo/MongoStorageAdapter.js

@@ -1055,13 +1055,13 @@ export class MongoStorageAdapter implements StorageAdapter {
     return Promise.resolve(transactionalSection);
   }
 
-  commitTransactionalSession(transactionalSection): Promise<void> {
+  commitTransactionalSession(transactionalSection: any): Promise<void> {
     return transactionalSection.commitTransaction().then(() => {
       transactionalSection.endSession();
     });
   }
 
-  abortTransactionalSession(transactionalSection): Promise<void> {
+  abortTransactionalSession(transactionalSection: any): Promise<void> {
     return transactionalSection.abortTransaction().then(() => {
       transactionalSection.endSession();
     });

src/Adapters/Storage/StorageAdapter.js

@@ -115,6 +115,6 @@ export interface StorageAdapter {
     conn: ?any
   ): Promise<void>;
   createTransactionalSession(): Promise<any>;
-  commitTransactionalSession(transactionalSession: string): Promise<void>;
-  abortTransactionalSession(transactionalSession: string): Promise<void>;
+  commitTransactionalSession(transactionalSession: any): Promise<void>;
+  abortTransactionalSession(transactionalSession: any): Promise<void>;
 }

src/Controllers/DatabaseController.js

@@ -411,7 +411,7 @@ class DatabaseController {
   schemaCache: any;
   schemaPromise: ?Promise<SchemaController.SchemaController>;
   skipMongoDBServer13732Workaround: boolean;
-  transactionalSession: ?any;
+  _transactionalSession: ?any;
 
   constructor(
     adapter: StorageAdapter,
@@ -425,6 +425,7 @@ class DatabaseController {
     // it. Instead, use loadSchema to get a schema.
     this.schemaPromise = null;
     this.skipMongoDBServer13732Workaround = skipMongoDBServer13732Workaround;
+    this._transactionalSession = null;
   }
 
   collectionExists(className: string): Promise<boolean> {
@@ -1533,15 +1534,33 @@ class DatabaseController {
   }
 
   createTransactionalSession() {
-    return this.adapter.createTransactionalSession();
+    return this.adapter
+      .createTransactionalSession()
+      .then(transactionalSession => {
+        this._transactionalSession = transactionalSession;
+      });
   }
 
-  commitTransactionalSession(transactionalSession) {
-    return this.adapter.commitTransactionalSession(transactionalSession);
+  commitTransactionalSession() {
+    if (!this._transactionalSession) {
+      throw new Error('There is no transactional session to commit');
+    }
+    return this.adapter
+      .commitTransactionalSession(this._transactionalSession)
+      .then(() => {
+        this._transactionalSession = null;
+      });
   }
 
-  abortTransactionalSession(transactionalSession) {
-    return this.adapter.abortTransactionalSession(transactionalSession);
+  abortTransactionalSession() {
+    if (!this._transactionalSession) {
+      throw new Error('There is no transactional session to abort');
+    }
+    return this.adapter
+      .abortTransactionalSession(this._transactionalSession)
+      .then(() => {
+        this._transactionalSession = null;
+      });
   }
 
   // TODO: create indexes on first creation of a _User object. Otherwise it's impossible to

src/batch.js

@@ -88,15 +88,11 @@ function handleBatch(router, req) {
     initialPromise = req.config.database.createTransactionalSession();
   }
 
-  return initialPromise.then(transactionalSession => {
+  return initialPromise.then(() => {
     const promises = req.body.requests.map(restRequest => {
       const routablePath = makeRoutablePath(restRequest.path);
       // Construct a request that we can send to a handler
 
-      if (transactionalSession) {
-        req.config.database.transactionalSession = transactionalSession;
-      }
-
       const request = {
         body: restRequest.body,
         config: req.config,
@@ -118,23 +114,19 @@ function handleBatch(router, req) {
 
     return Promise.all(promises)
       .then(results => {
-        if (transactionalSession) {
-          return req.config.database
-            .commitTransactionalSession(transactionalSession)
-            .then(() => {
-              return { response: results };
-            });
+        if (req.body.transaction) {
+          return req.config.database.commitTransactionalSession().then(() => {
+            return { response: results };
+          });
         } else {
           return { response: results };
         }
       })
       .catch(error => {
-        if (transactionalSession) {
-          return req.config.database
-            .abortTransactionalSession(transactionalSession)
-            .then(() => {
-              throw error;
-            });
+        if (req.body.transaction) {
+          return req.config.database.abortTransactionalSession().then(() => {
+            throw error;
+          });
         } else {
           throw error;
         }