Lost Keys

api/src/modules/cylinder/cylinder.service.ts

@@ -1,7 +1,7 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { Cylinder, User } from 'src/model/entitites';
 import { ActivityRepository, CylinderRepository, KeyRepository } from 'src/model/repositories';
-import { ManageHelperService } from 'src/shared/service/system.helper.service';
+import { HelperService } from 'src/shared/service/system.helper.service';
 
 @Injectable()
 export class CylinderService {
@@ -9,7 +9,7 @@ export class CylinderService {
     private readonly cylinderRepo: CylinderRepository,
     private readonly keyRepo: KeyRepository,
     private systemActivityRepo: ActivityRepository, 
-    private readonly helper: ManageHelperService
+    private readonly helper: HelperService
   ) {}
 
   async getCylinders(user: User): Promise<Cylinder[]> {

api/src/modules/key/key.controller.ts

@@ -24,6 +24,11 @@ export class KeyController {
     return this.service.getUsersKeys(req.user);
   }
 
+  @Get('lost')
+  getLostKeys(@Req() req: AuthenticatedRequest) {
+    return this.service.getLostKeys(req.user);
+  }
+
   @Post()
   postKey(@Req() req: AuthenticatedRequest, @Body() key: Key) {
     return this.service.createKey(req.user, key);

api/src/modules/key/key.service.ts

@@ -1,14 +1,13 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { Customer, Cylinder, Key, User } from 'src/model/entitites';
-import { IUser } from 'src/model/interface';
 import {
-  ActivityRepository,
   CylinderRepository,
   KeyRepository,
   KeySystemRepository,
 } from 'src/model/repositories';
 import { KeyHandoutRepository } from 'src/model/repositories/key-handout.repository';
 import { ActivityHelperService } from 'src/shared/service/activity.logger.service';
+import { HelperService } from 'src/shared/service/system.helper.service';
 import { IsNull, Not } from 'typeorm';
 
 @Injectable()
@@ -16,14 +15,25 @@ export class KeyService {
   constructor(
     private readonly keyrepository: KeyRepository,
     private readonly cylinderRepository: CylinderRepository,
-    private readonly systemRepo: KeySystemRepository,
-    private handoverRepo: KeyHandoutRepository,
-    private readonly activityService: ActivityHelperService
+    private readonly handoverRepo: KeyHandoutRepository,
+    private readonly activityService: ActivityHelperService,
+    private readonly helper: HelperService,
   ) {}
 
   async getUsersKeys(user: User): Promise<Key[]> {
     const keys = await this.keyrepository.find({
-      where: { cylinder: { system: { managers: { id: user.id } } } },
+      where: { cylinder: { system: { managers: { id: user.id } } }, keyLost: IsNull() },
+      relations: ['cylinder', 'cylinder.system', 'customer'],
+    });
+    for (let k of keys) {
+      k.customer = await this.getCustomerOfLastHandout(user, k.id);
+    }
+    return keys;
+  }
+
+  async getLostKeys(user: User): Promise<Key[]> {
+    const keys = await this.keyrepository.find({
+      where: { cylinder: { system: { managers: { id: user.id } } }, keyLost: Not(IsNull()) },
       relations: ['cylinder', 'cylinder.system', 'customer'],
     });
     for (let k of keys) {
@@ -36,10 +46,19 @@ export class KeyService {
     if (!user || !user.id) {
       throw new HttpException('forbidden', HttpStatus.FORBIDDEN);
     }
-    await this.keyrepository.findOneOrFail({
-      where: { cylinder: { system: { managers: { id: user.id } } } },
+
+    const k = await this.keyrepository.findOneOrFail({
+      where: { id: key.id, cylinder: { system: { managers: { id: user.id } } } },
+      relations: ['cylinder', 'cylinder.system'],
+      withDeleted: true
     });
 
+    if (k.name != key.name) {
+      await this.activityService.logKeyRenamed(user, key, key.cylinder[0].system, k.name);
+    }
+    if (k.keyLost != key.keyLost) {
+      await this.activityService.logKeyLostUpdate(user, key, key.keyLost);
+    }
     return this.keyrepository.save(this.keyrepository.create(key));
   }
 
@@ -121,6 +140,7 @@ export class KeyService {
     const key = await this.keyrepository.findOneOrFail({
       where: { id, cylinder: { system: { managers: { id: user.id } } } },
     });
+    await this.activityService.logDeleteKey(user, key);
     return this.keyrepository.softRemove(key);
   }
 
@@ -136,11 +156,14 @@ export class KeyService {
   }
 
   async restoreKey(user: User, keyID: string) {
+    
     const key = await this.keyrepository.findOneOrFail({
       where: { cylinder: { system: { managers: { id: user.id } } }, id: keyID },
       withDeleted: true,
     });
     key.deletedAt = null;
+    await this.activityService.logKeyRestored(user, key);
+    await this.helper.deleteKeyArchiveCache();
     return this.keyrepository.save(key);
   }
 }

api/src/modules/user/user.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { User } from 'src/model/entitites';
 import { IUser } from 'src/model/interface';
 import { ActivityRepository, KeySystemRepository, RoleRepository, UserRepository } from 'src/model/repositories';
-import { ManageHelperService } from 'src/shared/service/system.helper.service';
+import { HelperService } from 'src/shared/service/system.helper.service';
 @Injectable()
 export class UserService {
   constructor(
@@ -10,7 +10,7 @@ export class UserService {
     private readonly roleRepo: RoleRepository,
     private readonly systemRepo: KeySystemRepository,
     private readonly systemActivityRepo: ActivityRepository,
-    private readonly helper: ManageHelperService,
+    private readonly helper: HelperService,
   ) {}
 
   getAllUsers(): Promise<User[]> {