delete api/files is now transactional.

add namespace parameter for improved transaction logging

app/api/entities/routes.js

@@ -96,7 +96,7 @@ export default app => {
             await abort();
           }
           return req.body.entity ? saveResult : entity;
-        });
+        }, 'POST /api/entities');
         res.json(result);
         if (tenants.current().featureFlags.v1_transactions) {
           req.emitToSessionSocket(

app/api/files/jsRoutes.js

@@ -99,7 +99,7 @@ const routes = app => {
         if (email) {
           await mailer.send(email);
         }
-      });
+      }, 'POST /api/public');
       res.json(result);
     }
   );

app/api/files/routes.ts

@@ -15,6 +15,7 @@ import { UserSchema } from 'shared/types/userType';
 import { createError, handleError, validation } from '../utils';
 import { files } from './files';
 import { storage } from './storage';
+import { withTransaction } from 'api/utils/withTransaction';
 
 const checkEntityPermission = async (
   file: FileType,
@@ -266,18 +267,24 @@ export default (app: Application) => {
     }),
 
     async (req: Request<{}, {}, {}, { _id: string }>, res) => {
-      const [fileToDelete] = await files.get({ _id: req.query._id });
-      if (
-        !fileToDelete ||
-        !(await checkEntityPermission(fileToDelete, permissionsContext.getUserInContext(), 'write'))
-      ) {
-        throw createError('file not found', 404);
-      }
-
-      const [deletedFile] = await files.delete({ _id: req.query._id });
-      const thumbnailFileName = `${deletedFile._id}.jpg`;
-      await files.delete({ filename: thumbnailFileName });
-      res.json([deletedFile]);
+      await withTransaction(async () => {
+        const [fileToDelete] = await files.get({ _id: req.query._id });
+        if (
+          !fileToDelete ||
+          !(await checkEntityPermission(
+            fileToDelete,
+            permissionsContext.getUserInContext(),
+            'write'
+          ))
+        ) {
+          throw createError('file not found', 404);
+        }
+
+        const [deletedFile] = await files.delete({ _id: req.query._id });
+        const thumbnailFileName = `${deletedFile._id}.jpg`;
+        await files.delete({ filename: thumbnailFileName });
+        res.json([deletedFile]);
+      }, 'DELETE /api/files');
     }
   );
 

app/api/utils/withTransaction.ts

@@ -39,14 +39,17 @@ const performDelayedReindexes = async () => {
 };
 
 const withTransaction = async <T>(
-  operation: (context: TransactionOperation) => Promise<T>
+  operation: (context: TransactionOperation) => Promise<T>,
+  namespace?: string
 ): Promise<T> => {
-  const logger = DefaultLogger();
-  const startTime = performance.now();
-
   if (!tenants.current().featureFlags?.v1_transactions) {
     return operation({ abort: async () => {} });
   }
+
+  const logger = DefaultLogger();
+  const startTime = performance.now();
+  const logNamespace = namespace ? `(${namespace})` : '';
+
   const session = await dbSessionContext.startSession();
   session.startTransaction();
   let wasManuallyAborted = false;
@@ -59,7 +62,7 @@ const withTransaction = async <T>(
       wasManuallyAborted = true;
       const elapsedTime = performance.now() - startTime;
       logger.info(
-        `[v1_transactions] Transactions was manually aborted, session id -> ${inspect(session.id)} (${elapsedTime.toFixed(2)}ms)`
+        `[v1_transactions] Transactions ${logNamespace} was manually aborted, session id -> ${inspect(session.id)} (${elapsedTime.toFixed(2)}ms)`
       );
     },
   };
@@ -68,7 +71,7 @@ const withTransaction = async <T>(
     const result = await operation(context);
     const operationTime = performance.now() - startTime;
     logger.info(
-      `[v1_transactions] Transaction operations was successfully completed, session id -> ${inspect(session.id)} (${operationTime.toFixed(2)}ms)`
+      `[v1_transactions] Transaction ${logNamespace} operations was successfully completed, session id -> ${inspect(session.id)} (${operationTime.toFixed(2)}ms)`
     );
 
     if (!wasManuallyAborted) {
@@ -77,29 +80,29 @@ const withTransaction = async <T>(
       await performDelayedFileStores();
       const fileStoresTime = performance.now() - beforeFileStores;
       logger.info(
-        `[v1_transactions] Transaction saved all files before session commit, session id -> ${inspect(session.id)} (${fileStoresTime.toFixed(2)}ms)`
+        `[v1_transactions] Transaction ${logNamespace} saved all files before session commit, session id -> ${inspect(session.id)} (${fileStoresTime.toFixed(2)}ms)`
       );
 
       const beforeCommit = performance.now();
       await session.commitTransaction();
       const commitTime = performance.now() - beforeCommit;
       logger.info(
-        `[v1_transactions] Transaction session was commited, session id -> ${inspect(session.id)} (${commitTime.toFixed(2)}ms)`
+        `[v1_transactions] Transaction ${logNamespace} session was commited, session id -> ${inspect(session.id)} (${commitTime.toFixed(2)}ms)`
       );
 
       const beforeReindex = performance.now();
       await performDelayedReindexes();
       const reindexTime = performance.now() - beforeReindex;
       logger.info(
-        `[v1_transactions] Transaction elasticsearch reindexes after session was commited, session id -> ${inspect(session.id)} (${reindexTime.toFixed(2)}ms)`
+        `[v1_transactions] Transaction ${logNamespace} elasticsearch reindexes after session was commited, session id -> ${inspect(session.id)} (${reindexTime.toFixed(2)}ms)`
       );
     }
     return result;
   } catch (e) {
     if (!wasManuallyAborted) {
       const errorTime = performance.now() - startTime;
       logger.info(
-        `[v1_transactions] Transaction aborted due to error: ${inspect(e)}, session id -> ${inspect(session.id)} (${errorTime.toFixed(2)}ms)`
+        `[v1_transactions] Transaction ${logNamespace} aborted due to error: ${inspect(e)}, session id -> ${inspect(session.id)} (${errorTime.toFixed(2)}ms)`
       );
       await session.abortTransaction();
     }
@@ -109,13 +112,13 @@ const withTransaction = async <T>(
     dbSessionContext.clearContext();
     const clearTime = performance.now() - beforeClearContext;
     logger.info(
-      `[v1_transactions] Transaction cleared all context info, session id -> ${inspect(session.id)} (${clearTime.toFixed(2)}ms)`
+      `[v1_transactions] Transaction ${logNamespace} cleared all context info, session id -> ${inspect(session.id)} (${clearTime.toFixed(2)}ms)`
     );
     const beforeClearSession = performance.now();
     await session.endSession();
     const endSessionTime = performance.now() - beforeClearSession;
     logger.info(
-      `[v1_transactions] Transaction session ended, session id -> ${inspect(session.id)} (${endSessionTime.toFixed(2)}ms)`
+      `[v1_transactions] Transaction ${logNamespace} session ended, session id -> ${inspect(session.id)} (${endSessionTime.toFixed(2)}ms)`
     );
   }
 };