fix: minor

MuNuChapterHKN · May 25, 2024 · dad4992 · dad4992
1 parent defd47b
commit dad4992
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 96 deletions.
diff --git a/api/src/mocks/data.ts b/api/src/mocks/data.ts
@@ -229,3 +229,78 @@ export const mockAvailability = {
 export const mockCreateAvailabilityDto = {
   timeSlotId: mockTimeSlot.id,
 } as CreateAvailabilityDto;
+
+export const mockTimeSlotsJoined = [
+  {
+    start: new Date('2022-01-01T09:00:00'),
+    end: new Date('2022-01-01T10:00:00'),
+    id: 1,
+    recruitmentSession: 3,
+    availabilities: [
+      {
+        state: AvailabilityState.Interviewing,
+        user: {
+          role: Role.None,
+          is_board: false,
+          is_expert: true,
+        },
+      },
+      {
+        state: AvailabilityState.Free,
+        user: {
+          role: Role.Member,
+          is_board: true,
+          is_expert: false,
+        },
+      },
+      {
+        state: AvailabilityState.Free,
+        user: {
+          role: Role.Applicant,
+          is_board: false,
+          is_expert: false,
+        },
+      },
+      {
+        state: AvailabilityState.Free,
+        user: {
+          role: Role.Member,
+          is_board: false,
+          is_expert: true,
+        },
+      },
+      {
+        state: AvailabilityState.Interviewing,
+        user: {
+          role: Role.Member,
+          is_board: false,
+          is_expert: true,
+        },
+      },
+      {
+        state: AvailabilityState.Interviewing,
+        user: {
+          role: Role.Admin,
+          is_board: false,
+          is_expert: true,
+        },
+      },
+    ],
+  },
+  {
+    start: new Date('2022-01-01T9:00:00'),
+    end: new Date('2022-01-01T20:00:00'),
+    id: 2,
+    recruitmentSession: 3,
+    availabilities: [
+      {
+        state: AvailabilityState.Free,
+        user: {
+          role: Role.Member,
+          is_board: true,
+          is_expert: true,
+        },
+      },
+    ],
+  },
+];
diff --git a/api/src/timeslots/timeslots.service.spec.ts b/api/src/timeslots/timeslots.service.spec.ts
@@ -1,4 +1,9 @@
-import { mockGenerateTimeSlots, mockTimeSlot, testDate } from 'src/mocks/data';
+import {
+  mockGenerateTimeSlots,
+  mockTimeSlot,
+  mockTimeSlotsJoined,
+  testDate,
+} from 'src/mocks/data';
 import { mockedRepository } from 'src/mocks/repositories';
 import { TestingModule, Test } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
@@ -283,80 +288,7 @@ describe('TimeSlotsService', () => {
         innerJoinAndSelect: jest.fn().mockReturnThis(),
         where: jest.fn().mockReturnThis(),
         andWhere: jest.fn().mockReturnThis(),
-        getMany: jest.fn().mockResolvedValue([
-          {
-            start: new Date('2022-01-01T09:00:00'),
-            end: new Date('2022-01-01T10:00:00'),
-            id: 1,
-            recruitmentSession: 3,
-            availabilities: [
-              {
-                state: AvailabilityState.Interviewing,
-                user: {
-                  role: Role.None,
-                  is_board: false,
-                  is_expert: true,
-                },
-              },
-              {
-                state: AvailabilityState.Free,
-                user: {
-                  role: Role.Member,
-                  is_board: true,
-                  is_expert: false,
-                },
-              },
-              {
-                state: AvailabilityState.Free,
-                user: {
-                  role: Role.Applicant,
-                  is_board: false,
-                  is_expert: false,
-                },
-              },
-              {
-                state: AvailabilityState.Free,
-                user: {
-                  role: Role.Member,
-                  is_board: false,
-                  is_expert: true,
-                },
-              },
-              {
-                state: AvailabilityState.Interviewing,
-                user: {
-                  role: Role.Member,
-                  is_board: false,
-                  is_expert: true,
-                },
-              },
-              {
-                state: AvailabilityState.Interviewing,
-                user: {
-                  role: Role.Admin,
-                  is_board: false,
-                  is_expert: true,
-                },
-              },
-            ],
-          },
-          {
-            start: new Date('2022-01-01T9:00:00'),
-            end: new Date('2022-01-01T20:00:00'),
-            id: 2,
-            recruitmentSession: 3,
-            availabilities: [
-              {
-                state: AvailabilityState.Free,
-                user: {
-                  role: Role.Member,
-                  is_board: true,
-                  is_expert: true,
-                },
-              },
-            ],
-          },
-        ]),
+        getMany: jest.fn().mockResolvedValue(mockTimeSlotsJoined),
       };
 
       // Mock the timeSlotRepository and its methods

diff --git a/api/src/timeslots/timeslots.service.ts b/api/src/timeslots/timeslots.service.ts
@@ -185,30 +185,23 @@ export class TimeSlotsService {
 
     const allMatches = await queryBuilder.getMany();
 
-    let goodTimeSlots: TimeSlot[] = [];
-    allMatches.forEach((timeSlot) => {
-      let boardMembers = 0;
-      let expertMembers = 0;
-      for (let availability of timeSlot.availabilities) {
-        // redundant checks
-        if (availability.state !== AvailabilityState.Free) continue;
-        if (availability.user.role === Role.None) continue;
-        if (availability.user.role === Role.Applicant) continue;
-
-        if (availability.user.is_board) ++boardMembers;
-        else if (availability.user.is_expert) ++expertMembers;
-      }
-
-      if ((boardMembers && expertMembers) || boardMembers > 1) {
-        const timeslotToPush = {
+    return allMatches
+      .filter((timeSlot) => {
+        let [boardMembers, expertMembers] = [0, 0];
+        for (let av of timeSlot.availabilities) {
+          if (av.state !== AvailabilityState.Free) continue;
+          if ([Role.None, Role.Applicant].includes(av.user.role)) continue;
+          if (av.user.is_board) ++boardMembers;
+          else if (av.user.is_expert) ++expertMembers;
+        }
+        return (boardMembers && expertMembers) || boardMembers > 1;
+      })
+      .map((timeSlot) => {
+        return {
           id: timeSlot.id,
           start: timeSlot.start,
           end: timeSlot.end,
         } as TimeSlot;
-        goodTimeSlots.push(timeslotToPush);
-      }
-    });
-
-    return goodTimeSlots;
+      });
   }
 }