Dashboard

api/src/model/entitites/activity.entity.ts

@@ -0,0 +1,28 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  ManyToOne,
+  OneToMany,
+  PrimaryGeneratedColumn,
+} from 'typeorm';
+import { User } from './user.entity';
+import { KeySystem } from './system.entity';
+
+@Entity()
+export class Activity {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @CreateDateColumn({ name: 'created_at' })
+  createdAt: Date;
+
+  @ManyToOne(() => User)
+  user: User;
+
+  @ManyToOne(() => KeySystem)
+  system: KeySystem;
+
+  @Column({ type: 'text'})
+  message: string;
+}

api/src/model/entitites/index.ts

@@ -6,3 +6,4 @@ export * from './key.entity';
 export * from './key_activity.entity';
 export * from './customer.entity';
 export * from './key-handout.entity';
+export * from './activity.entity';

api/src/model/entitites/key-handout.entity.ts

@@ -8,6 +8,7 @@ import {
 } from 'typeorm';
 import { Key } from './key.entity';
 import { Customer } from './customer.entity';
+import { User } from './user.entity';
 
 @Entity()
 export class KeyHandout {
@@ -29,6 +30,9 @@ export class KeyHandout {
   @CreateDateColumn()
   created: Date;
 
+  @ManyToOne(() => User)
+  user: User;
+
   @BeforeInsert()
   insertTimestamp() {
     if (this.timestamp == null) {

api/src/model/entitites/key.entity.ts

@@ -6,12 +6,14 @@ import {
   JoinTable,
   ManyToMany,
   ManyToOne,
+  OneToMany,
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm';
 import { Cylinder } from './cylinder.entity';
 import { IKey } from '../interface/key.interface';
 import { Customer } from './customer.entity';
+import { KeyHandout } from './key-handout.entity';
 
 @Entity()
 export class Key implements IKey {
@@ -45,4 +47,7 @@ export class Key implements IKey {
 
   @DeleteDateColumn()
   deletedAt: Date;
+
+  @OneToMany(() => KeyHandout, (handout) => handout.key)
+  handouts: KeyHandout[];
 }

api/src/model/repositories/activity.repository.ts

@@ -0,0 +1,10 @@
+import { Injectable } from '@nestjs/common';
+import { Repository, DataSource } from 'typeorm';
+import { Activity } from '../entitites';
+
+@Injectable()
+export class ActivityRepository extends Repository<Activity> {
+  constructor(dataSource: DataSource) {
+    super(Activity, dataSource.createEntityManager());
+  }
+}

api/src/model/repositories/index.ts

@@ -6,3 +6,4 @@ export * from './cylinder.repository';
 export * from './key.repository';
 export * from './key_activity.repository';
 export * from './customer.repository';
+export * from './activity.repository';

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

@@ -2,6 +2,7 @@ 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,
   KeyActivityRepository,
   KeyRepository,
@@ -18,6 +19,7 @@ export class KeyService {
     private readonly systemRepo: KeySystemRepository,
     private activityRepo: KeyActivityRepository,
     private handoverRepo: KeyHandoutRepository,
+    private systemActivityRepo: ActivityRepository, 
   ) {}
 
   async getUsersKeys(user: User): Promise<Key[]> {
@@ -74,19 +76,30 @@ export class KeyService {
   async handoverKey(user: IUser, data: any, keyID: string) {
     const key: Key = await this.keyrepository.findOneOrFail({
       where: { id: keyID, cylinder: { system: { managers: { id: user.id } } } },
+      relations: [ 'cylinder', 'cylinder.system' ]
     });
 
     key.handedOut = data.direction == 'out';
     this.keyrepository.save(key);
 
-    return this.handoverRepo.save(
+    const res = await this.handoverRepo.save(
       this.handoverRepo.create({
         customer: data.customer,
         direction: data.direction,
         timestamp: data.timestamp,
         key: key,
+        user: user as any
       }),
     );
+
+    const msg = `Schlüssel ${key.nr} ${res.direction == 'out' ? 'ausgegeben an ' : 'zurückgegeben von '}${res.customer.name}`
+    this.systemActivityRepo.save(
+      this.systemActivityRepo.create({
+      system: key.cylinder[0].system,
+      user: user as any,
+      message: msg,
+    }))
+    return res;
   }
 
   getKeyHandovers(user: User, keyID: string) {
@@ -121,8 +134,14 @@ export class KeyService {
     }
   }
 
-  createKey(user: User, key: any) {
-    return this.keyrepository.save(this.keyrepository.create(key));
+  async createKey(user: User, key: any) {
+    const k = await this.keyrepository.save(this.keyrepository.create(key));
+    this.systemActivityRepo.save({
+      message: `Schlüssel ${(k as any).nr} angelegt`,
+      user: user,
+      system: (k as any).cylinder[0].system
+    });
+    return k;
   }
 
   async deleteKey(user: User, id: string) {

api/src/modules/system/system.controller.ts

@@ -32,17 +32,21 @@ export class SystemController {
   findAll(@Req() req: AuthenticatedRequest) {
     return this.systemService.findAll(req.user);
   }
+  
+  @Get(':id/manager')
+  getManagers(@Param('id') id: string) {
+    return this.systemService.getManagers(id);
+  }
+  @Post(':id/manager')
+  manaManager(@Param('id') id: string, @Body() body: any){
+    return this.systemService.manageManagers(id, body);
+  }
 
   @Get(':id')
   findOne(@Param('id') id: string) {
     return this.systemService.findOne(id);
   }
 
-  @Get(':id/manager')
-  getManagers(@Param('id') id: string) {
-    return this.systemService.getManagers(id);
-  }
-
   @Patch(':id')
   update(@Param('id') id: string, @Body() updateSystemDto: UpdateSystemDto) {
     return this.systemService.update(id, updateSystemDto);
@@ -52,9 +56,4 @@ export class SystemController {
   remove(@Param('id') id: string) {
     return this.systemService.remove(id);
   }
-
-  @Post(':id/manager')
-  manaManager(@Param('id') id: string, @Body() body: any){
-    return this.systemService.manageManagers(id, body);
-  }
 }

api/src/modules/system/system.service.ts

@@ -3,6 +3,7 @@ import { CreateSystemDto } from './dto/create-system.dto';
 import { UpdateSystemDto } from './dto/update-system.dto';
 import { KeySystemRepository, UserRepository } from 'src/model/repositories';
 import { User } from 'src/model/entitites';
+import { IUser } from 'src/model/interface';
 
 @Injectable()
 export class SystemService {

api/src/modules/user/user.controller.ts

@@ -22,6 +22,16 @@ export class UserController {
     return this.userService.saveUser(user);
   }
 
+  @Get('stats')
+  getStats(@Req() req: AuthenticatedRequest) {
+    return this.userService.getUserStats(req.user);
+  }
+
+  @Get('activities')
+  getUseractivities(@Req() req: AuthenticatedRequest) {
+    return this.userService.getActivitiesforUser(req.user)
+  }
+
   @Delete(':id')
   deleteUserWithId(@Req() req: AuthenticatedRequest, @Param('id') id: string) {
     if (req.user.role.name != "admin") {

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

@@ -1,13 +1,16 @@
 import { Injectable } from '@nestjs/common';
 import { User } from 'src/model/entitites';
 import { IUser } from 'src/model/interface';
-import { RoleRepository, UserRepository } from 'src/model/repositories';
+import { ActivityRepository, KeyActivityRepository, KeySystemRepository, RoleRepository, UserRepository } from 'src/model/repositories';
+import { FindOperator, FindOperators } from 'typeorm';
 
 @Injectable()
 export class UserService {
   constructor(
     private readonly userRepo: UserRepository,
     private readonly roleRepo: RoleRepository,
+    private readonly systemRepo: KeySystemRepository,
+    private readonly systemActivityRepo: ActivityRepository
   ) {}
 
   getAllUsers(): Promise<User[]> {
@@ -28,4 +31,30 @@ export class UserService {
     return this.userRepo.deleteUserById(id);
   }
 
+  async getUserStats(user: IUser) {
+    const systems = await this.systemRepo.find({
+      where: { managers: { id: user.id }},
+      relations: ['cylinders', 'cylinders.keys'],
+      
+    });
+
+    const cylinders = systems.map(s => s.cylinders).flat()
+    const keys = cylinders.map(c => c.keys).flat().map(k => k.id);
+    const keycount = [...new Set(keys)]
+
+    return {
+      keys: keycount.length,
+      cylinders: cylinders.length,
+      systems: systems.length
+    }
+  }
+
+  async getActivitiesforUser(user: IUser) {
+    const activities = await this.systemActivityRepo.find({
+      where: { system: { managers: { id: user.id } }},
+      order: { createdAt: 'DESC' },
+      relations: ['user']
+    });
+    return activities;
+  }
 }

api/src/shared/database/database.module.ts

@@ -1,6 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import {
+  Activity,
   Customer,
   Cylinder,
   Key,
@@ -12,6 +13,7 @@ import {
 } from 'src/model/entitites';
 import { KeySystem } from 'src/model/entitites/system.entity';
 import {
+  ActivityRepository,
   CustomerRepository,
   CylinderRepository,
   KeyActivityRepository,
@@ -33,6 +35,7 @@ const ENTITIES = [
   KeyActivity,
   Customer,
   KeyHandout,
+  Activity,
 ];
 const REPOSITORIES = [
   UserRepository,
@@ -44,6 +47,7 @@ const REPOSITORIES = [
   KeyActivityRepository,
   CustomerRepository,
   KeyHandoutRepository,
+  ActivityRepository,
 ];
 
 @Module({