feature: added endpoint for finding all queues by labId

Author: SharpDevOps10

src/queues/dto/create-queue.dto.ts

@@ -2,10 +2,6 @@ import { IsEnum, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 import { QueueStatus } from '@prisma/client';
 
 export class CreateQueueDto {
-  @IsString()
-  @IsNotEmpty()
-    creatorId: string;
-
   @IsString()
   @IsNotEmpty()
     labId: string;

src/queues/queue.controller.ts

@@ -9,8 +9,9 @@ export class QueuesController {
   constructor (private readonly queuesService: QueuesService) {}
 
   @Post()
-  async createQueue (@Body() createQueueDto: CreateQueueDto) {
-    return this.queuesService.createQueue(createQueueDto);
+  async createQueue (@Body() createQueueDto: CreateQueueDto, @Req() req: Request) {
+    const creatorId = req['user'].userId;
+    return this.queuesService.createQueue(createQueueDto, creatorId);
   }
 
   @Public()
@@ -19,6 +20,12 @@ export class QueuesController {
     return await this.queuesService.findQueueById(id);
   }
 
+  @Public()
+  @Get('lab/:labId')
+  async findAllQueuesByLabId (@Param('labId') labId: string) {
+    return await this.queuesService.findAllQueuesByLabId(labId);
+  }
+
   @Delete(':id')
   async deleteQueueById (@Param('id') id: string, @Req() req: Request) {
     return this.queuesService.deleteQueueById(id, req);

src/queues/queues.service.spec.ts

@@ -50,10 +50,9 @@ describe('QueuesService', () => {
       });
 
       const queueDto: CreateQueueDto = {
-        creatorId: user.id,
         labId: 'lab1',
       };
-      const queue = await queuesService.createQueue(queueDto);
+      const queue = await queuesService.createQueue(queueDto, user.id);
 
       expect(queue).toHaveProperty('id');
       expect(queue.creatorId).toBe(user.id);
@@ -74,10 +73,7 @@ describe('QueuesService', () => {
         },
       });
 
-      const queue = await queuesService.createQueue({
-        creatorId: user.id,
-        labId: 'lab2',
-      });
+      const queue = await queuesService.createQueue({ labId: 'lab2' }, user.id);
 
       const foundQueue = await queuesService.findQueueById(queue.id);
 
@@ -110,10 +106,7 @@ describe('QueuesService', () => {
         },
       } as unknown as Request;
 
-      const queue = await queuesService.createQueue({
-        creatorId: admin.id,
-        labId: 'lab3',
-      });
+      const queue = await queuesService.createQueue({ labId: 'lab3' }, admin.id);
 
       const deletedQueue = await queuesService.deleteQueueById(queue.id, req);
       expect(deletedQueue).toStrictEqual(queue);
@@ -137,10 +130,7 @@ describe('QueuesService', () => {
         },
       } as unknown as Request;
 
-      const queue = await queuesService.createQueue({
-        creatorId: creator.id,
-        labId: 'lab4',
-      });
+      const queue = await queuesService.createQueue({ labId: 'lab4' }, creator.id);
 
       const deletedQueue = await queuesService.deleteQueueById(queue.id, req);
       expect(deletedQueue).toStrictEqual(queue);
@@ -175,10 +165,7 @@ describe('QueuesService', () => {
         },
       } as unknown as Request;
 
-      const queue = await queuesService.createQueue({
-        creatorId: creator.id,
-        labId: 'lab5',
-      });
+      const queue = await queuesService.createQueue({ labId: 'lab5' }, creator.id);
 
       await expect(queuesService.deleteQueueById(queue.id, req)).rejects.toThrow(ForbiddenException);
     });
@@ -204,10 +191,9 @@ describe('QueuesService', () => {
       } as unknown as Request;
 
       const queue = await queuesService.createQueue({
-        creatorId: user.id,
         labId: 'lab6',
         status: 'PENDING',
-      });
+      }, user.id);
 
       const joinedQueue = await queuesService.joinQueue(queue.id, req);
       expect(joinedQueue).toStrictEqual(
@@ -239,10 +225,9 @@ describe('QueuesService', () => {
       } as unknown as Request;
 
       const queue = await queuesService.createQueue({
-        creatorId: user.id,
         labId: 'lab7',
         status: 'SKIPPED',
-      });
+      }, user.id);
 
       await expect(queuesService.joinQueue(queue.id, req)).rejects.toThrow(ForbiddenException);
     });
@@ -266,10 +251,9 @@ describe('QueuesService', () => {
       } as unknown as Request;
 
       const queue = await queuesService.createQueue({
-        creatorId: user.id,
         labId: 'lab8',
         status: 'PENDING',
-      });
+      }, user.id);
 
       await queuesService.joinQueue(queue.id, req);
       await expect(queuesService.joinQueue(queue.id, req)).rejects.toThrow(ConflictException);
@@ -295,10 +279,7 @@ describe('QueuesService', () => {
         },
       } as unknown as Request;
 
-      const queue = await queuesService.createQueue({
-        creatorId: user.id,
-        labId: 'lab9',
-      });
+      const queue = await queuesService.createQueue({ labId: 'lab9' }, user.id);
 
       await queuesService.joinQueue(queue.id, req);
 
@@ -331,10 +312,7 @@ describe('QueuesService', () => {
         },
       } as unknown as Request;
 
-      const queue = await queuesService.createQueue({
-        creatorId: user.id,
-        labId: 'lab10',
-      });
+      const queue = await queuesService.createQueue({ labId: 'lab10' }, user.id);
 
       await expect(queuesService.leaveQueue(queue.id, req)).rejects.toThrow(NotFoundException);
     });
@@ -370,10 +348,7 @@ describe('QueuesService', () => {
         },
       } as unknown as Request;
 
-      const queue = await queuesService.createQueue({
-        creatorId: user.id,
-        labId: 'lab11',
-      });
+      const queue = await queuesService.createQueue({ labId: 'lab11' }, user.id);
 
       await queuesService.joinQueue(queue.id, {
         user: {
@@ -421,10 +396,7 @@ describe('QueuesService', () => {
         },
       } as unknown as Request;
 
-      const queue = await queuesService.createQueue({
-        creatorId: user.id,
-        labId: 'lab12',
-      });
+      const queue = await queuesService.createQueue({ labId: 'lab12' }, user.id);
 
       await queuesService.joinQueue(queue.id, {
         user: {
@@ -464,10 +436,7 @@ describe('QueuesService', () => {
         },
       } as unknown as Request;
 
-      const queue = await queuesService.createQueue({
-        creatorId: user.id,
-        labId: 'lab13',
-      });
+      const queue = await queuesService.createQueue({ labId: 'lab13' }, user.id);
 
       await expect(queuesService.leaveQueue(queue.id, req)).rejects.toThrow(NotFoundException);
     });
@@ -493,10 +462,9 @@ describe('QueuesService', () => {
       } as unknown as Request;
 
       const queue = await queuesService.createQueue({
-        creatorId: admin.id,
         labId: 'lab14',
         status: 'COMPLETED',
-      });
+      }, admin.id);
 
       await queuesService.resumeQueueStatus(queue.id, req);
       const updatedQueue = await queuesService.findQueueById(queue.id);
@@ -522,10 +490,9 @@ describe('QueuesService', () => {
       } as unknown as Request;
 
       const queue = await queuesService.createQueue({
-        creatorId: user.id,
         labId: 'lab15',
         status: 'SKIPPED',
-      });
+      }, user.id);
 
       await expect(queuesService.resumeQueueStatus(queue.id, req)).rejects.toThrow(ForbiddenException);
     });
@@ -549,10 +516,9 @@ describe('QueuesService', () => {
       } as unknown as Request;
 
       const queue = await queuesService.createQueue({
-        creatorId: admin.id,
         labId: 'lab16',
         status: 'PENDING',
-      });
+      }, admin.id);
 
       await expect(queuesService.resumeQueueStatus(queue.id, req)).rejects.toThrow(ConflictException);
     });

src/queues/queues.service.ts

@@ -12,8 +12,8 @@ export class QueuesService {
     private readonly userService: UsersService,
   ) {}
 
-  async createQueue (queue: CreateQueueDto): Promise<Queue> {
-    return this.queueRepository.create(queue);
+  async createQueue (queue: CreateQueueDto, creatorId: string): Promise<Queue> {
+    return this.queueRepository.create(queue, creatorId);
   }
 
   async findQueueById (id: string): Promise<Queue> {
@@ -22,6 +22,10 @@ export class QueuesService {
     return queue;
   }
 
+  async findAllQueuesByLabId (labId: string): Promise<Queue[]> {
+    return this.queueRepository.findAllByLabId(labId);
+  }
+
   async deleteQueueById (id: string, req: Request): Promise<Queue> {
     const userId = req['user'].userId;
     const isAdmin = await this.userService.isAdmin(userId);

src/repositories/queues.repository.ts

@@ -1,15 +1,15 @@
 import { Injectable } from '@nestjs/common';
 import { PrismaService } from '../prisma/prisma.service';
-import { CreateQueueDto } from '../queues/dto/create-queue.dto';
 import { QueueStatus } from '@prisma/client';
+import { CreateQueueDto } from '../queues/dto/create-queue.dto';
 
 @Injectable()
 
 export class QueuesRepository {
   constructor (private readonly prisma: PrismaService) {}
 
-  async create (createQueueDto: CreateQueueDto) {
-    const { creatorId, labId, status } = createQueueDto;
+  async create (createQueueDto: CreateQueueDto, creatorId: string) {
+    const { labId, status } = createQueueDto;
     return this.prisma.queue.create({
       data: {
         creatorId,
@@ -25,6 +25,12 @@ export class QueuesRepository {
     });
   }
 
+  async findAllByLabId (labId: string) {
+    return this.prisma.queue.findMany({
+      where: { labId },
+    });
+  }
+
   async deleteById (id: string) {
     return this.prisma.queue.delete({
       where: { id },