Merge pull request #7 from fagbokforlaget/fix-data-can-be-null

fagbokforlaget · Jul 27, 2023 · b23046f · b23046f
2 parents 46f3280 + 832bb81
commit b23046f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 5 deletions.
diff --git a/src/async-logger-provider.interface.ts b/src/async-logger-provider.interface.ts
@@ -1,3 +1,3 @@
 export abstract class AsyncLoggerProvider {
-  abstract log(subject: string, data: Record<string, unknown>): void;
+  abstract log(subject: string, data: Record<string, unknown>): Promise<void>;
 }
diff --git a/src/message-dispatcher.interceptor.ts b/src/message-dispatcher.interceptor.ts
@@ -31,8 +31,6 @@ export class MessageDispatcherInterceptor implements NestInterceptor {
 
     return next.handle().pipe(
       tap(async (data) => {
-        if (!data) return;
-
         const request = context.switchToHttp().getRequest();
 
         let ids = options.objectIdGetter(request, data);

diff --git a/test/message-dispatcher.spec.ts b/test/message-dispatcher.spec.ts
@@ -82,7 +82,7 @@ describe('Message Dispatcher', () => {
       });
     });
 
-    describe('for nonexisting object', () => {
+    describe('for nonexisting data object', () => {
       it('should not create nor send a message on nonexistant id', async () => {
         const res = await request(app.getHttpServer())
           .get(`/test/nodata`)
@@ -109,6 +109,28 @@ describe('Message Dispatcher', () => {
         expect(res.text).toEqual('');
         expect(transport.log).not.toHaveBeenCalled();
       });
+
+      it('should send message when no data returned but object is taken from request', async () => {
+        const id = '123';
+        const res = await request(app.getHttpServer())
+          .get(`/test/noreturn/${id}`)
+          .expect(204);
+
+        expect(res.text).toEqual('');
+        expect(transport.log).toHaveBeenCalledWith(subject, {
+          action: { type: 'urn:forlagshuset:action:object', verb: 'deleted' },
+          object: {
+            id,
+            type: 'urn:forlagshuset:object:erudio:namespace',
+          },
+          payload: undefined,
+          service: {
+            id: serviceId,
+            type: 'urn:forlagshuset:service:app',
+          },
+          timestamp: expect.anything(),
+        });
+      });
     });
   });
 });
diff --git a/test/mocks/message-dispatcher-test.controller.ts b/test/mocks/message-dispatcher-test.controller.ts
@@ -1,4 +1,4 @@
-import { Controller, Get, Param } from '@nestjs/common';
+import { Controller, Get, HttpCode, Param, Req } from '@nestjs/common';
 import {
   Action,
   MessageEventEmitter,
@@ -33,6 +33,19 @@ export class MessageDispatcherTestController {
     return;
   }
 
+  @MessageEventEmitter({
+    objectIdGetter: (request) => request.obj,
+    action: Action.DELETED,
+  })
+  @Get('/noreturn/:id')
+  @HttpCode(204)
+  async testNoReturn(
+    @Param() params: { id: string },
+    @Req() req: any,
+  ): Promise<void> {
+    req.obj = params.id;
+  }
+
   @MessageEventEmitter({
     objectIdGetter: (request) => request.params.id,
     action: Action.CREATED,