Merge pull request #279 from SCVApp/master

updated api for the app lockers

Author: urbankrepel

db_migrations/locker_function.sql

@@ -1,18 +1,9 @@
 CREATE OR REPLACE FUNCTION check_locker_availability()
 RETURNS TRIGGER AS $$
-DECLARE
-    old_controller_id INT;
-    new_locker_id INT;
 BEGIN
     IF OLD.locker_id IS NULL OR  NEW.locker_id != OLD.locker_id THEN
         IF EXISTS(SELECT 1 FROM lockers_users WHERE locker_id = NEW.locker_id AND start_time < NOW() AND (end_time IS NULL OR end_time > NOW())) THEN
-            SELECT controller_id INTO old_controller_id FROM lockers WHERE id = NEW.locker_id;
-            SELECT id INTO new_locker_id FROM lockers WHERE controller_id = old_controller_id AND id NOT IN (SELECT locker_id FROM lockers_users WHERE start_time < NOW() AND (end_time IS NULL OR end_time > NOW()));
-            IF new_locker_id IS NULL THEN
-                RAISE EXCEPTION 'No available lockers';
-            ELSE
-                NEW.locker_id := new_locker_id;
-            END IF;
+            RAISE EXCEPTION 'This locker is already in use';
         END IF;
     END IF;
 

src/app.module.ts

@@ -96,6 +96,10 @@ export class AppModule implements NestModule {
           path: 'lockers/my',
           method: RequestMethod.GET,
         },
+        {
+          path: 'lockers/controller/:controllerId',
+          method: RequestMethod.GET,
+        },
       );
     consumer
       .apply(AdminMiddleware)
@@ -117,7 +121,7 @@ export class AppModule implements NestModule {
         'pass',
         'notification',
         {
-          path: 'lockers/controller/:controllerId',
+          path: 'lockers/controller/:controllerId/admin',
           method: RequestMethod.GET,
         },
         {

src/lockers/dto/openLocker.dto.ts

@@ -3,7 +3,7 @@ import { IsNotEmpty, IsNumberString } from 'class-validator';
 export class OpenLockerDto {
   @IsNotEmpty()
   @IsNumberString()
-  controllerId: number;
+  lockerId: number;
 
   azure_id: string;
   access_token: string;

src/lockers/lockers.controller.ts

@@ -45,10 +45,10 @@ export class LockersController {
   }
 
   /*
-  Get all lockers by controller id
+  Get all lockers by controller id for admins
   */
-  @Get('controller/:controllerId')
-  async getLockersByControllerId(
+  @Get('controller/:controllerId/admin')
+  async getLockersByControllerIdAdmin(
     @Param('controllerId', ParseIntPipe) controllerId: number,
     @Res() res: Response,
   ) {
@@ -58,6 +58,21 @@ export class LockersController {
     return res.status(200).json(lockers);
   }
 
+  /*
+  Get all lockers by controller id for users
+  */
+  @Get('controller/:controllerId')
+  async getLockersByControllerId(
+    @Param('controllerId', ParseIntPipe) controllerId: number,
+    @Res() res: Response,
+  ) {
+    const lockers =
+      await this.lockersService.getLockersByControllerIdWithStatus(
+        controllerId,
+      );
+    return res.status(200).json(lockers);
+  }
+
   /*
   User requests to open locker if user currently does not have a locker it will be assigned to him if locker is available
   If user has a locker assigned to him it will be opened
@@ -69,7 +84,7 @@ export class LockersController {
     await this.lockersService.openOrAssignLocker(
       userAzureId,
       userAccessToken,
-      data.controllerId,
+      data.lockerId,
     );
 
     return res.status(200).json({ message: 'Locker opened' });

src/lockers/lockers.service.ts

@@ -18,6 +18,7 @@ import { UserPassEntity } from 'src/pass/entities/passUser.entity';
 import { ControllerWithActiveLockerCount } from './types/controllerWithActiveLockerCount.type';
 import { LockerWithActiveUser } from './types/lockerWithActiveUser.type';
 import { NotificationService } from 'src/notification/notification.service';
+import { LockerWithStatus } from './types/lockerWithStatus.type';
 
 @Injectable()
 export class LockersService {
@@ -115,7 +116,7 @@ export class LockersService {
   async openOrAssignLocker(
     userAzureId: string,
     userAccessToken: string,
-    controllerId: number,
+    lockerId: number,
   ) {
     const user: UserPassEntity = await this.passService.getUserFromAzureId(
       userAzureId,
@@ -132,34 +133,29 @@ export class LockersService {
       }
       return;
     }
-    const firstAvailableLocker = await this.getFirstAvailableLocker(
-      controllerId,
-    );
-    if (!firstAvailableLocker) {
-      throw new NotFoundException('No lockers available');
+    const selectedLocker = await this.getLockerById(lockerId);
+    if (!selectedLocker) {
+      throw new NotFoundException('Locker not found');
     }
 
-    // This is the check from db, becouse we have a trigger on lockers_users table and if we insert already used locker, it will change the locker with the first available one
+    // This is the check from db, becouse we have a trigger on lockers_users table and if we insert already used locker
     const result = await this.lockersUsersRepository
       .insert({
         user,
-        locker: firstAvailableLocker,
+        locker: selectedLocker,
       })
       .catch(() => {
-        throw new InternalServerErrorException('No lockers available');
+        throw new NotFoundException('This locker is already in use');
       });
     if (!result) {
-      throw new NotFoundException('No lockers available');
-    }
-    const assignedLocker = await this.getUsersActiveLocker(user);
-    if (!assignedLocker) {
-      throw new NotFoundException('No lockers available');
+      throw new NotFoundException('This locker is already in use');
     }
-    const success = await this.openLocker(assignedLocker);
+
+    const success = await this.openLocker(selectedLocker);
     if (!success) {
       await this.lockersUsersRepository.delete({
         user,
-        locker: assignedLocker,
+        locker: selectedLocker,
       });
       throw new InternalServerErrorException('Failed to open locker');
     }
@@ -308,6 +304,37 @@ export class LockersService {
     });
   }
 
+  async getLockersByControllerIdWithStatus(
+    cotrollerId: number,
+  ): Promise<LockerWithStatus[]> {
+    const lockersData = await this.lockerRepository
+      .createQueryBuilder('lockers')
+      .leftJoinAndSelect(
+        'lockers_users',
+        'lockers_users',
+        `lockers.id = lockers_users.locker_id
+         AND lockers_users.start_time < NOW()
+         AND (lockers_users.end_time > NOW() OR lockers_users.end_time IS NULL)`,
+      )
+      .where('lockers.controller_id = :controller_id', {
+        controller_id: cotrollerId,
+      })
+      .select('lockers.id', 'lockerId')
+      .addSelect('lockers.identifier', 'identifier')
+      .addSelect('lockers_users.user_id', 'userId')
+      .orderBy('lockers.position', 'ASC')
+      .getRawMany();
+
+    return lockersData.map((data) => {
+      const obj: LockerWithStatus = {
+        id: data.lockerId,
+        identifier: data.identifier,
+        used: data.userId !== null,
+      };
+      return obj;
+    });
+  }
+
   async signJwtToken(controllerToken: string, lockerId: string) {
     return this.jwtService.sign(
       { controllerToken, lockerId },

src/lockers/types/lockerWithStatus.type.ts

@@ -0,0 +1,5 @@
+export class LockerWithStatus {
+  id: number;
+  identifier: string;
+  used: boolean;
+}