Merge pull request #237 from johanbook/journal-fix

Ignore non-user issued commands in journal

services/api/src/client/context/user-id.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from "@nestjs/common";
 import { AsyncLocalStorage } from "node:async_hooks";
 
-import { ApplicationError } from "src/core/error-handling";
+import { MissingUserIdError } from "src/core/authentication";
 
 import { REQUEST_CONTEXT_KEY } from "./als.module";
 import { RequestContext } from "./request-context.interface";
@@ -17,7 +17,7 @@ export class UserIdService {
     const store = this.als.getStore();
 
     if (!store) {
-      throw new ApplicationError(
+      throw new MissingUserIdError(
         "Unable to obtain user ID due to missing store",
       );
     }

services/api/src/core/authentication/index.ts

@@ -0,0 +1 @@
+export { MissingUserIdError } from "./missing-user-id.error";

services/api/src/core/authentication/missing-user-id.error.ts

@@ -0,0 +1,3 @@
+import { ApplicationError } from "src/core/error-handling";
+
+export class MissingUserIdError extends ApplicationError {}

services/api/src/core/journal/application/handlers/command-handlers/create-journal-entry.handler.ts

@@ -3,6 +3,7 @@ import { InjectRepository } from "@nestjs/typeorm";
 import { Repository } from "typeorm";
 
 import { UserIdService } from "src/client/context/user-id.service";
+import { MissingUserIdError } from "src/core/authentication";
 
 import { JournalEntry } from "../../../infrastructure/entities/journal-entry.entity";
 import { CreateJournalEntryCommand } from "../../contracts/commands/create-journal-entry.command";
@@ -18,7 +19,19 @@ export class CreateJournalEntryHandler
   ) {}
 
   async execute(command: CreateJournalEntryCommand) {
-    const userId = this.userIdService.getUserId();
+    let userId: string;
+
+    // User ID will not be available for system-issued commands (e.g. event handlers)
+    // This skips logging any commands where user id cannot be found
+    try {
+      userId = this.userIdService.getUserId();
+    } catch (error) {
+      if (error instanceof MissingUserIdError) {
+        return;
+      }
+
+      throw error;
+    }
 
     const newJournalEntry = new JournalEntry();