Logging und sowas

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

@@ -58,7 +58,7 @@ export class User implements IUser {
   @DeleteDateColumn()
   deletedAt: Date;
 
-  @OneToOne(() => UserSettings, (settings) => settings.user, { cascade: true, onDelete: 'CASCADE', onUpdate: 'NO ACTION',   })
+  @OneToOne(() => UserSettings, (settings) => settings.user, { cascade: true, onUpdate: 'NO ACTION',   })
   settings: UserSettings;
 
   accessToken?: string;

api/src/model/entitites/user/user.settings.entity.ts

@@ -6,7 +6,7 @@ export class UserSettings {
   @PrimaryGeneratedColumn('uuid')
   id: string;
 
-  @OneToOne(() => User, (user) => user.settings)
+  @OneToOne(() => User, (user) => user.settings, { onDelete: 'CASCADE' })
   @JoinColumn()
   user: User;
 

api/src/modules/system/dto/update-system.dto.ts

@@ -1,4 +1,6 @@
 import { PartialType } from '@nestjs/mapped-types';
 import { CreateSystemDto } from './create-system.dto';
 
-export class UpdateSystemDto extends PartialType(CreateSystemDto) {}
+export class UpdateSystemDto extends PartialType(CreateSystemDto) {
+  id: string;
+}

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

@@ -48,9 +48,9 @@ export class SystemController {
     return this.systemService.findOne(id);
   }
 
-  @Put(':id')
+  @Put()
-  update(@Param('id') id: string, @Body() updateSystemDto: UpdateSystemDto) {
+  update(@Req() req: AuthenticatedRequest, @Body() updateSystemDto: UpdateSystemDto) {
-    return this.systemService.update(id, updateSystemDto);
+    return this.systemService.update(req.user, updateSystemDto);
   }
 
   @Delete(':id')

api/src/modules/system/system.module.ts

@@ -5,10 +5,11 @@ import { AuthModule } from '../auth/auth.module';
 import { DatabaseModule } from 'src/shared/database/database.module';
 import { MailModule } from '../mail/mail.module';
 import { ConfigService } from '@nestjs/config';
+import { SharedServiceModule } from 'src/shared/service/shared.service.module';
 
 @Module({
   controllers: [SystemController],
   providers: [SystemService, ConfigService],
-  imports: [AuthModule, DatabaseModule, MailModule],
+  imports: [AuthModule, DatabaseModule, MailModule, SharedServiceModule],
 })
 export class SystemModule {}

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

@@ -6,6 +6,7 @@ import { User } from 'src/model/entitites';
 import { IUser } from 'src/model/interface';
 import { MailService } from '../mail/mail.service';
 import { ConfigService } from '@nestjs/config';
+import { ActivityHelperService } from 'src/shared/service/activity.logger.service';
 
 @Injectable()
 export class SystemService {
@@ -14,7 +15,8 @@ export class SystemService {
     private userRepo: UserRepository,
     private systemActivityRepo: ActivityRepository,
     private mailService: MailService,
-    private readonly configService: ConfigService
+    private readonly configService: ConfigService,
+    private readonly activityService: ActivityHelperService
     ) {}
   
   get isDevelopMode(): boolean {
@@ -59,12 +61,21 @@ export class SystemService {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  update(id: string, updateSystemDto: UpdateSystemDto) {
+  async update(user: User, updateSystemDto: UpdateSystemDto) {
-    throw new HttpException(
+    if (!user || !user.id || !updateSystemDto.id) { throw new HttpException('forbidden', HttpStatus.FORBIDDEN); }
-      `This action updates a #${id} system but is not implemented`,
+    console.log(updateSystemDto);
-      HttpStatus.NOT_IMPLEMENTED,
+    const system = await this.systemRepo.findOne({ where: { id: updateSystemDto.id, managers: { id: user.id } }, withDeleted: true });
-    );
+
-    return `This action updates a #${id} system`;
+    if (!system) { throw new HttpException('forbidden', HttpStatus.FORBIDDEN); }
+
+
+    if (system.name !== updateSystemDto.name) {
+      await this.activityService.logSystemRenamed({ system, newName: updateSystemDto.name, user })
+      system.name = updateSystemDto.name;
+      
+    }
+
+    return true;
   }
 
   async remove(id: string) {

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

@@ -13,8 +13,8 @@ export class UserService {
     private readonly systemActivityRepo: ActivityRepository,
     private readonly userSettingsRepository: UserSettingsRepository,
     private readonly helper: HelperService,
-  ) {
+  ) {}
-  }
+
 
 
   getAllUsers(): Promise<User[]> {

api/src/shared/service/activity.logger.service.ts

@@ -14,6 +14,17 @@ export class ActivityHelperService {
     private readonly cylinderRepo: CylinderRepository,
   ) {}
 
+  async logSystemRenamed({system, newName, user}: { system: KeySystem, newName: string, user: User}) {
+    let msg = `Schließanlage von ${system.name} zu ${newName} umbenannt`;
+
+    return this.activityRepo.save(
+      this.activityRepo.create({
+      system,
+      user,
+      message: msg,
+    }))
+  }
+
 
   async logDeleteKey(user: User, key: Key, system?: KeySystem) {
     if (!key || !user) { return; }

client/src/app/modules/cylinder/components/create-cylinder/create-cylinder.component.html

@@ -18,6 +18,7 @@
               <mat-hint>Zylinderlänge und co.</mat-hint>
         </mat-form-field>
 
+        
         <mat-form-field>
             <mat-label>Schließanlage</mat-label>
             <mat-select formControlName="system">
@@ -26,6 +27,7 @@
                 }
             </mat-select>
             <mat-hint>Zu welcher Schließanlage gehört der Zylinder?</mat-hint>
+            <mat-progress-bar mode="indeterminate" *ngIf="isLoading"></mat-progress-bar>
         </mat-form-field>
 
     </form>

client/src/app/modules/cylinder/components/create-cylinder/create-cylinder.component.ts

@@ -9,10 +9,12 @@ import { MatInputModule } from '@angular/material/input';
 import { MatSelectModule } from '@angular/material/select';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { CommonModule } from '@angular/common';
 
 @Component({
     selector: 'app-create-cylinder',
-    imports: [MatFormFieldModule, MatInputModule, MatDialogModule, ReactiveFormsModule, FormsModule, MatSelectModule, MatButtonModule, MatIconModule],
+    imports: [MatFormFieldModule, MatInputModule, MatDialogModule, ReactiveFormsModule, FormsModule, MatSelectModule, MatButtonModule, MatIconModule, MatProgressBarModule, CommonModule],
     templateUrl: './create-cylinder.component.html',
     styleUrl: './create-cylinder.component.scss'
 })
@@ -22,6 +24,7 @@ export class CreateCylinderComponent {
   readonly dialogRef = inject(MatDialogRef<CreateCylinderComponent>);
 
   systems: any[] = [];
+  isLoading = true;
 
   createForm = new FormGroup({
     name: new FormControl<string | null>(null, Validators.required),
@@ -35,6 +38,13 @@ export class CreateCylinderComponent {
         this.systems = systems;
       }
     });
+    this.loadCylinders();
+  }
+
+  private async loadCylinders() {
+    this.isLoading = true;
+    await this.api.refreshSystems();
+    this.isLoading = false;
   }
 
   save() {

client/src/app/modules/keys/create/create.component.html

@@ -29,12 +29,12 @@
         <mat-label>Schließzylinder</mat-label>
         <mat-select formControlName="cylinder" multiple>
           @for (item of cylinders; track $index) {
-            <mat-option [value]="item">{{ item.name }}</mat-option>
+            <mat-option [value]="item">{{ item.name }} ({{item.system.name}}) </mat-option>
           }
         </mat-select>
         <mat-hint>Wo sperrt der Schlüssel?</mat-hint>
       </mat-form-field>
-        <button mat-icon-button (click)="openSelectMultipleCylinders()" style="margin-bottom: 12px;">
+        <button mat-icon-button (click)="openSelectMultipleCylinders()" style="margin-bottom: 12px;" matTooltip="Zylinderauswahl in neuem Fenster öffnen">
           <mat-icon>open_in_new</mat-icon>
         </button>
     </div>

client/src/app/modules/keys/create/create.component.ts

@@ -14,10 +14,11 @@ import { MatIconModule } from '@angular/material/icon';
 import {MatCheckboxModule} from '@angular/material/checkbox';
 import { IKey } from '../../../model/interface/key.interface';
 import { ICylinder } from '../../../model/interface/cylinder.interface';
+import { MatTooltipModule } from '@angular/material/tooltip';
 
 @Component({
     selector: 'app-create',
-    imports: [MatDialogModule, MatButtonModule, ReactiveFormsModule, FormsModule, MatFormFieldModule, MatInputModule, MatSelectModule, MatDialogModule, MatIconModule, MatCheckboxModule],
+    imports: [MatDialogModule, MatButtonModule, ReactiveFormsModule, FormsModule, MatFormFieldModule, MatInputModule, MatSelectModule, MatDialogModule, MatIconModule, MatCheckboxModule, MatTooltipModule],
     templateUrl: './create.component.html',
     styleUrl: './create.component.scss'
 })

client/src/app/modules/system/system.component.ts

@@ -1,7 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { Component, inject, LOCALE_ID } from '@angular/core';
 import { AgGridAngular } from 'ag-grid-angular';
-import { GridApi, GridOptions, GridReadyEvent } from 'ag-grid-community';
+import { CellEditingStoppedEvent, GridApi, GridOptions, GridReadyEvent } from 'ag-grid-community';
 import { ApiService } from '../../shared/api.service';
 import { HELPER } from '../../shared/helper.service';
 import { MatButtonModule } from '@angular/material/button';
@@ -29,7 +29,7 @@ export class SystemComponent extends AgGridContainerComponent {
   constructor() {
     super();
     this.gridOptions.columnDefs = [
-      { colId: 'name', field: 'name', headerName: 'Name', sort: 'asc', flex: 1},
+      { colId: 'name', field: 'name', headerName: 'Name', sort: 'asc', flex: 1, editable: true},
       { colId: 'cylinderCount', field: 'cylinders', headerName: 'Zylinderanzahl', flex: 0, cellRenderer: (data: any) => data.value?.length || 0},
       { field: 'createdAt', headerName: 'Angelegt', cellRenderer: (data: any) => data.value ? this.datePipe.transform(new Date(data.value)) : '-' },
       { field: 'updatedAt', headerName: 'Upgedated', cellRenderer: (data: any) => data.value ? this.datePipe.transform(new Date(data.value)) : '-' },
@@ -51,6 +51,7 @@ export class SystemComponent extends AgGridContainerComponent {
 
   onGridReady(params: GridReadyEvent) {
     this.gridApi = params.api;
+    this.gridApi.addEventListener("cellEditingStopped", evt => this.cellEditEnd(evt));
     this.api.systems.asObservable().subscribe({
       next: systems => {
         this.gridApi.setGridOption("rowData", systems);
@@ -60,6 +61,14 @@ export class SystemComponent extends AgGridContainerComponent {
     this.loadSystems();
   }
 
+  async cellEditEnd(event: CellEditingStoppedEvent) {
+    const key: any = event.data;
+    if (!event.valueChanged || event.newValue == event.oldValue) { return; }
+
+    this.api.updateSystem(key)
+
+  }
+
   openCreateSystem() {
     this.dialog.open(CreateSystemComponent).afterClosed().subscribe({
           next: sys => {

client/src/app/shared/api.service.ts

@@ -92,6 +92,24 @@ export class ApiService {
     })
   }
 
+  updateSystem(cylinder: any): Promise<boolean> {
+    return new Promise<boolean>(resolve => {
+      this.http.put('api/system', cylinder).pipe(
+        this.toast.observe({
+        loading: `Schließanlage ${cylinder} wird gespeichert...`,
+        success: `Schließanlage ${cylinder.name} gespeichert.`,
+        error: 'Es ist ein Fehler aufgetreten'
+      })
+      ).subscribe({
+        next: () => resolve(true),
+        error: () => resolve(false),
+        complete: () => {
+          this.refreshCylinders()
+        }
+      })
+    })
+  }
+
   createKey(key: any) {
     return this.http.post<IKey>('api/key', key);
   }