integrated audit into events

modified the events service and controller approve endpoint to accept admin id
added more tests for approval event service

Author: snebo

src/events/events.admin.controller.ts

@@ -1,28 +1,28 @@
 import {
   Controller,
-  UseGuards,
-  Param,
   Delete,
+  Param,
   Patch,
+  Request,
+  UseGuards,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiParam, ApiTags } from '@nestjs/swagger';
-import { EventService } from './events.users.service';
 import { JwtAdminsGuard } from 'src/shared/auth/guards/jwt.admins.guard';
-
+import { ApiReq } from 'src/shared/interfaces';
+import { EventService } from './events.users.service';
 
 @ApiTags('admins')
 @Controller('admins')
 export class EventAdminsController {
-  constructor(
-    private readonly eventService: EventService,
-  ) {}
+  constructor(private readonly eventService: EventService) {}
 
   @ApiBearerAuth()
   @UseGuards(JwtAdminsGuard)
   @Patch('event/:id/approve')
   @ApiParam({ name: 'id', type: 'string' })
-  async approveEvent(@Param('id') id: string) {
-    return this.eventService.approveEvent(id);
+  async approveEvent(@Param('id') id: string, @Request() req: ApiReq) {
+    const admin_id = req.user._id.toString();
+    return this.eventService.approveEvent(id, admin_id);
   }
 
   @ApiBearerAuth()
@@ -32,5 +32,4 @@ export class EventAdminsController {
   async softDeleteEvent(@Param('id') id: string) {
     return this.eventService.softDeleteEvent(id);
   }
-
 }

src/events/events.service.spec.ts

@@ -61,6 +61,8 @@ describe('EventService', () => {
 
     notificationsServiceMock = {
       createNotification: jest.fn().mockResolvedValue(undefined),
+      getNotificationByUserId: jest.fn().mockResolvedValue(undefined),
+      resolveNotification: jest.fn().mockResolvedValue(undefined),
     };
 
     const module: TestingModule = await Test.createTestingModule({
@@ -171,15 +173,56 @@ describe('EventService', () => {
   });
 
   describe('approveEvent', () => {
-    it('should approve an event', async () => {
-      eventModelMock.findByIdAndUpdate.mockResolvedValueOnce(mockEvent); // direct return
-      const result = await service.approveEvent(mockEvent._id.toString());
+    it('should approve an event and resolve notification', async () => {
+      const admin_id = 'admin_id';
+      const message = 'event approved';
+
+      // Mock findByIdAndUpdate to resolve with updated event
+      eventModelMock.findByIdAndUpdate = jest.fn().mockResolvedValue(mockEvent);
+
+      // Mock findById to return the same event
+      eventModelMock.findById = jest.fn().mockResolvedValue(mockEvent);
+
+      // Mock notifications
+      notificationsServiceMock.getNotificationByUserId = jest
+        .fn()
+        .mockResolvedValue({ _id: 'notif_id' });
+      notificationsServiceMock.resolveNotification = jest
+        .fn()
+        .mockResolvedValue(undefined);
+
+      const result = await service.approveEvent(
+        mockEvent._id.toString(),
+        admin_id,
+        message,
+      );
+
       expect(result).toEqual(mockEvent);
       expect(eventModelMock.findByIdAndUpdate).toHaveBeenCalledWith(
         mockEvent._id.toString(),
         { status: Status.APPROVED },
         { new: true },
       );
+      expect(eventModelMock.findById).toHaveBeenCalledWith({
+        _id: mockEvent._id.toString(),
+      });
+      expect(
+        notificationsServiceMock.getNotificationByUserId,
+      ).toHaveBeenCalledWith(mockEvent.host, mockEvent._id.toString());
+      expect(notificationsServiceMock.resolveNotification).toHaveBeenCalledWith(
+        'notif_id',
+        admin_id,
+        message,
+        'APPROVED',
+      );
+    });
+
+    it('should throw NotFoundException if event not found', async () => {
+      eventModelMock.findByIdAndUpdate = jest.fn().mockResolvedValue(null);
+
+      await expect(
+        service.approveEvent(mockEvent._id.toString(), 'admin_id'),
+      ).rejects.toThrow(NotFoundException);
     });
   });
 });

src/events/events.users.controller.spec.ts

@@ -10,7 +10,7 @@ describe('EventUserController', () => {
   let controller: EventUserController;
   let service: jest.Mocked<EventService>;
 
-  const mockEvent = { id: '1', title: 'Sample Event' };
+  const mockEvent = { id: '1', title: 'Sample Event', admin_id: 'admin_id' };
 
   afterEach(async () => {
     jest.clearAllMocks();

src/events/events.users.service.ts

@@ -102,18 +102,34 @@ export class EventService {
     return deleteEvent;
   }
 
-  async approveEvent(id: string): Promise<Event> {
-    let approveEvent = this.eventModel.findByIdAndUpdate(
+  async approveEvent(
+    id: string,
+    admin_id: string,
+    message: string = 'event approved',
+  ): Promise<Event> {
+    const approveEvent = await this.eventModel.findByIdAndUpdate(
       id,
       { status: Status.APPROVED },
       { new: true },
     );
+
     if (!approveEvent) {
       throw new NotFoundException(`Event with ID ${id} not found`);
     }
 
+    const event = await this.eventModel.findById({ _id: id });
     //TODO: move event to audit
-
+    const existingNotification =
+      await this.notificationsService.getNotificationByUserId(
+        event.host,
+        event._id.toString(),
+      );
+    await this.notificationsService.resolveNotification(
+      existingNotification._id.toString(),
+      admin_id,
+      message,
+      'APPROVED',
+    );
     return approveEvent;
   }
 }

src/users/users.service.ts

@@ -498,7 +498,7 @@ export class UsersService {
         userApplication._id.toString(),
         userApplication._id.toString(),
       );
-    this.notificationsService.resolveNotification(
+    await this.notificationsService.resolveNotification(
       existingNotification._id.toString(),
       admin_id,
       message,
@@ -552,7 +552,7 @@ export class UsersService {
         userApplication._id.toString(),
         userApplication._id.toString(),
       );
-    this.notificationsService.resolveNotification(
+    await this.notificationsService.resolveNotification(
       existingNotification._id.toString(),
       admin_id,
       message,