Merge pull request #277 from SCVApp/master

order by position

Author: urbankrepel

src/lockers/entities/locker.entity.ts

@@ -17,4 +17,7 @@ export class LockerEntity {
 
   @Column({ type: 'varchar', length: 5 })
   identifier: string;
+
+  @Column({ type: 'int', default: 0 })
+  position: number;
 }

src/lockers/lockers.module.ts

@@ -1,6 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CommonModule } from 'src/common/common.module';
+import { NotificationModule } from 'src/notification/notification.module';
 import { PassModule } from 'src/pass/pass.module';
 import { LockerEntity } from './entities/locker.entity';
 import { LockerControllerEntity } from './entities/lockerController.entity';
@@ -18,6 +19,7 @@ import { LockersService } from './lockers.service';
     ]),
     CommonModule,
     PassModule,
+    NotificationModule,
   ],
   controllers: [LockersController],
   providers: [LockersService, LockersGateway],

src/lockers/lockers.service.ts

@@ -17,6 +17,7 @@ import { PassService } from 'src/pass/service/pass.service';
 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';
 
 @Injectable()
 export class LockersService {
@@ -33,6 +34,8 @@ export class LockersService {
     private readonly jwtService: JwtService,
     @Inject(forwardRef(() => PassService))
     private readonly passService: PassService,
+    @Inject(forwardRef(() => NotificationService))
+    private readonly notificationService: NotificationService,
   ) {}
 
   async getControllersWithAvailableLockers(): Promise<
@@ -223,10 +226,11 @@ export class LockersService {
       locker.controller.token,
       locker.identifier,
     );
-    return await this.lockersGateway.openLocker(
+    const success = await this.lockersGateway.openLocker(
       locker.controller.id.toString(),
       jwtToken,
     );
+    return success;
   }
 
   async openLockerById(lockerId: number): Promise<void> {
@@ -284,6 +288,7 @@ export class LockersService {
       .addSelect('lockers_users.start_time', 'startTime')
       .addSelect('lockers_users.end_time', 'endTime')
       .addSelect('user_passes.azure_id', 'azureId')
+      .orderBy('lockers.position', 'ASC')
       .getRawMany();
 
     return lockersData.map((data) => {

src/notification/notification.service.ts

@@ -12,6 +12,7 @@ import { DeviceEntity } from './entities/device.entity';
 import { PassService } from 'src/pass/service/pass.service';
 import { ApiKeyEntity } from './entities/apiKey.entity';
 import * as crypto from 'crypto';
+import { UserPassEntity } from 'src/pass/entities/passUser.entity';
 
 @Injectable()
 export class NotificationService {
@@ -179,4 +180,29 @@ export class NotificationService {
   async findApiKey(key: string) {
     return this.apiKeyRepository.findOne({ where: { key } });
   }
+
+  async sendToUser(user: UserPassEntity, title: string, body: string) {
+    const devices = await this.deviceRepository.find({ where: { user } });
+    const tokens = devices.map((device) => device.notification_token);
+    for (const token of tokens) {
+      this.FCM.send(
+        {
+          notification: {
+            title,
+            body,
+          },
+          token,
+        },
+        (err, response) => {
+          if (err) {
+            this.logger.error('Notification sending failed');
+            this.logger.error(err);
+          } else {
+            this.logger.log('Notification sent');
+            this.logger.log(response);
+          }
+        },
+      );
+    }
+  }
 }