pdf

api/Dockerfile

@@ -3,7 +3,7 @@ FROM node:22 AS build
 WORKDIR /app
 
 COPY package*.json ./
-RUN npm ci
+RUN npm install
 COPY . .
 RUN npm run build
 
@@ -12,7 +12,7 @@ FROM node:22 AS deps
 WORKDIR /app
 
 COPY package*.json ./
-RUN npm ci --omit=dev && npm cache clean --force
+RUN npm install --omit=dev && npm cache clean --force
 
 # -------- RUNTIME --------
 FROM node:22-slim AS runtime

api/package.json

@@ -29,14 +29,13 @@
     "@nestjs/core": "11.1.14",
     "@nestjs/jwt": "11.0.2",
     "@nestjs/mapped-types": "2.1.0",
-    "@nestjs/platform-express": "11.1.14",
+    "@nestjs/platform-express": "11.1.16",
     "@nestjs/typeorm": "11.0.0",
     "axios": "1.13.5",
     "cache-manager": "7.2.8",
     "class-transformer": "^0.5.1",
     "class-validator": "0.14.1",
     "mysql2": "3.18.2",
-    "puppeteer": "^24.39.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "7.8.2",
     "typeorm": "0.3.28"

api/src/app.module.ts

@@ -11,12 +11,10 @@ import { KeyModule } from './modules/key/key.module';
 import { CustomerModule } from './modules/customer/customer.module';
 import { CylinderModule } from './modules/cylinder/cylinder.module';
 import { SystemModule } from './modules/system/system.module';
-import { CacheInterceptor, CacheModule } from '@nestjs/cache-manager';
-import { APP_INTERCEPTOR } from '@nestjs/core';
 import { MailModule } from './modules/mail/mail.module';
 import { LogModule } from './modules/log/log.module';
 import { SseModule } from './modules/realtime/sse/sse.module';
-import { PdfModule } from './shared/pdf/pdf.module';
+import { StorageModule } from './shared/storage/storage.module';
 
 @Module({
   imports: [
@@ -36,7 +34,7 @@ import { PdfModule } from './shared/pdf/pdf.module';
     MailModule,
     LogModule,
     SseModule,
-    PdfModule
+    StorageModule
   ],
   controllers: [AppController],
   providers: [

api/src/model/dto/key-handover.dto.ts

@@ -1,17 +1,17 @@
-export class KeyHandoverDto {
-  handoverId!: string;
-  handoverDate!: Date;
-  place!: string;
+export class KeyHandoutPDFDataDto {
+  handoverId: string;
+  handoverDate: Date;
+  place: string;
 
-  giverName!: string;
-  giverAddress?: string;
+  giverName: string;
+  giverAddress: string;
 
-  receiverName!: string;
-  receiverAddress?: string;
+  receiverName: string;
+  receiverAddress: string;
 
-  keyType!: string;
-  keyNumber?: string;
-  quantity!: number;
-  objectDescription?: string;
-  notes?: string;
+  keyType: string;
+  keyNumber: string;
+  quantity: number;
+  objectDescription: string;
+  notes: string;
 }

api/src/model/entitites/index.ts

@@ -5,3 +5,4 @@ export * from './customer.entity';
 export * from './key-handout.entity';
 export * from './activity.entity';
 export * from './user';
+export * from './key-handout-pdf-data.entity';

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

@@ -0,0 +1,52 @@
+import { Column, CreateDateColumn, Entity, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm";
+import { KeyHandout } from "./key-handout.entity";
+
+@Entity()
+export class KeyHandoutPdfDataEntity {
+
+
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @ManyToOne(() => KeyHandout, handout => handout.pdfs)
+  handout: KeyHandout
+
+  @Column({ type: 'date' })
+  handoverDate: Date;
+
+  @Column({ name: 'giver_name' })
+  giverName: string;
+
+  @Column({ name: 'giver_address', nullable: true })
+  giverAddress: string;
+
+  @Column({ name: 'receiver_name' })
+  receiverName: string;
+
+  @Column({ name: 'receiver_address', nullable: true })
+  receiverAddress: string;
+
+  @CreateDateColumn({ name: 'created_at' })
+  createdAt: Date;
+
+  @Column({ name: 'file_name', nullable: true })
+  fileName: string;
+
+  @Column({ name: 'key_nr' })
+  keyNumber: string;
+
+  @Column({ type: 'int', default: 1 })
+  quantity: number;
+
+  @Column({ name: 'object_description', nullable: true })
+  objectDescription: string;
+
+  @Column({ nullable: true })
+  notes: string;
+  
+  @UpdateDateColumn({ name: 'updatet_at' })
+  updatedAt: Date;
+
+
+
+}

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

@@ -4,11 +4,13 @@ import {
   CreateDateColumn,
   Entity,
   ManyToOne,
+  OneToMany,
   PrimaryGeneratedColumn,
 } from 'typeorm';
 import { Key } from './key.entity';
 import { Customer } from './customer.entity';
 import { User } from './user';
+import { KeyHandoutPdfDataEntity } from './key-handout-pdf-data.entity';
 
 @Entity()
 export class KeyHandout {
@@ -34,8 +36,8 @@ export class KeyHandout {
   user: User;
 
 
-  @Column({ nullable: true })
-  pdfFormKey: string;
+  @OneToMany(() => KeyHandoutPdfDataEntity, pdf => pdf.handout)
+  pdfs: KeyHandoutPdfDataEntity[];
 
   @BeforeInsert()
   insertTimestamp() {

api/src/model/repositories/index.ts

@@ -7,3 +7,4 @@ export * from './key.repository';
 export * from './customer.repository';
 export * from './activity.repository';
 export * from './user.settings.repository';
+export * from './key-handout-pdf-data.repository';

api/src/model/repositories/key-handout-pdf-data.repository.ts

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

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

@@ -8,7 +8,6 @@ import {
   Put,
   Req,
   Res,
-  Sse,
   UseGuards,
 } from '@nestjs/common';
 import { Response } from 'express';
@@ -16,52 +15,61 @@ import { KeyService } from './key.service';
 import { AuthenticatedRequest } from 'src/model/interface/authenticated-request.interface';
 import { AuthGuard } from 'src/core/guards/auth.guard';
 import { Key } from 'src/model/entitites';
-import { interval, map, Observable } from 'rxjs';
-import { KeyHandoverPdfService } from 'src/shared/pdf/key-handover-pdf/key-handover-pdf.service';
-import { KeyHandoverDto } from 'src/model/dto/key-handover.dto';
+import { KeyHandoutPDFDataDto } from 'src/model/dto/key-handover.dto';
 
 
+@UseGuards(AuthGuard)
 @Controller('key')
 export class KeyController {
-  constructor(private service: KeyService, private pdfService: KeyHandoverPdfService) {}
+  constructor(private service: KeyService) {}
 
-  @UseGuards(AuthGuard)
   @Get()
   getKeys(@Req() req: AuthenticatedRequest) {
     return this.service.getUsersKeys(req.user);
   }
 
-  @UseGuards(AuthGuard)
   @Get('lost')
   getLostKeys(@Req() req: AuthenticatedRequest) {
     return this.service.getLostKeys(req.user);
   }
 
-  @UseGuards(AuthGuard)
   @Post()
   postKey(@Req() req: AuthenticatedRequest, @Body() key: Key) {
     return this.service.createKey(req.user, key);
   }
 
-  @UseGuards(AuthGuard)
   @Put()
   updateKey(@Req() req: AuthenticatedRequest, @Body() key: Key) {
     return this.service.updateKey(req.user, key);
   }
 
-  @UseGuards(AuthGuard)
   @Put(':id/restore')
   restoreKey(@Req() req: AuthenticatedRequest, @Param('id') id: string) {
     return this.service.restoreKey(req.user, id);
   }
 
-  @UseGuards(AuthGuard)
-  @Delete(':id')
-  deleteKey(@Req() req: AuthenticatedRequest, @Param('id') id: string) {
-    return this.service.deleteKey(req.user, id);
+
+  @Get(':id/handover/pdf')
+  async getHandoverPDF(@Param('id') id: string, @Res() res: Response) {
+    const { pdf, response } = await this.service.getPdf(id);
+    res.setHeader(
+    'Content-Type',
+    response.headers['content-type'] ?? 'application/pdf',
+    );
+
+    if (response.headers['content-length']) {
+      res.setHeader('Content-Length', response.headers['content-length']);
+    }
+
+    if (response.headers['content-disposition']) {
+      res.setHeader('Content-Disposition', response.headers['content-disposition']);
+    } else {
+      res.setHeader('Content-Disposition', `inline; filename="uebergabe.pdf"`);
+    }
+
+    res.end(pdf);
   }
 
-  @UseGuards(AuthGuard)
   @Post(':id/handover')
   handoutKey(
     @Req() req: AuthenticatedRequest,
@@ -71,26 +79,40 @@ export class KeyController {
     return this.service.handoverKey(req.user, body, id);
   }
 
-  @UseGuards(AuthGuard)
   @Get(':id/handover')
   getKeyHandouts(@Req() req: AuthenticatedRequest, @Param('id') id: string) {
     return this.service.getKeyHandovers(req.user, id);
   }
 
-  @UseGuards(AuthGuard)
   @Get('archive')
   getArchive(@Req() req: AuthenticatedRequest) {
     return this.service.getDeletedKeys(req.user);
   }
 
   @Post('pdf')
-  async generatePdf(@Body() dto: KeyHandoverDto, @Res() res: Response): Promise<void> {
-    const pdfBuffer = await this.pdfService.generatePdf(dto);
+  async generatePdf(@Body() dto: KeyHandoutPDFDataDto, @Res() res: Response) {
+    const { pdf, response } = await this.service.createPdf(dto);
 
-    res.setHeader('Content-Type', 'application/pdf');
-    res.setHeader('Content-Disposition', 'attachment; filename="schluesseluebergabe.pdf"');
-    res.setHeader('Content-Length', pdfBuffer.length);
+    res.setHeader(
+    'Content-Type',
+    response.headers['content-type'] ?? 'application/pdf',
+  );
 
-    res.end(pdfBuffer);
+  if (response.headers['content-length']) {
+    res.setHeader('Content-Length', response.headers['content-length']);
+  }
+
+  if (response.headers['content-disposition']) {
+    res.setHeader('Content-Disposition', response.headers['content-disposition']);
+  } else {
+    res.setHeader('Content-Disposition', `inline; filename="uebergabe.pdf"`);
+  }
+
+  res.end(pdf);
+  }
+
+  @Delete(':id')
+  deleteKey(@Req() req: AuthenticatedRequest, @Param('id') id: string) {
+    return this.service.deleteKey(req.user, id);
   }
 }

api/src/modules/key/key.module.ts

@@ -7,11 +7,12 @@ import { SharedServiceModule } from 'src/shared/service/shared.service.module';
 import { ConfigService } from '@nestjs/config';
 import { MailModule } from '../mail/mail.module';
 import { SseModule } from '../realtime/sse/sse.module';
-import { PdfModule } from 'src/shared/pdf/pdf.module';
+import { HttpModule } from '@nestjs/axios';
+import { StorageModule } from 'src/shared/storage/storage.module';
 
 @Module({
   controllers: [KeyController],
   providers: [KeyService, ConfigService],
-  imports: [DatabaseModule, AuthModule, SharedServiceModule, MailModule, SseModule, PdfModule],
+  imports: [DatabaseModule, AuthModule, SharedServiceModule, MailModule, SseModule, HttpModule, StorageModule],
 })
 export class KeyModule {}

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

@@ -2,17 +2,19 @@ import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { Customer, Cylinder, Key, User } from 'src/model/entitites';
 import {
   CylinderRepository,
+  KeyHandoutPdfDataEntityRepository,
   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 { FindOperator, IsNull, Not } from 'typeorm';
-import { faker } from '@faker-js/faker';
 import { ConfigService } from '@nestjs/config';
 import { MailService } from '../mail/mail.service';
 import { SseService } from '../realtime/sse/sse.service';
+import { KeyHandoutPDFDataDto } from 'src/model/dto/key-handover.dto';
+import { PdfService } from 'src/shared/storage/services/pdf/pdf.service';
+import { AxiosResponse } from 'axios';
 
 @Injectable()
 export class KeyService {
@@ -24,9 +26,11 @@ export class KeyService {
     private readonly helper: HelperService,
     private readonly configService: ConfigService,
     private readonly mailService: MailService,
-    private readonly sseService: SseService
+    private readonly sseService: SseService,
+    private readonly pdfService: PdfService,
+    private readonly handoutPDFRepo: KeyHandoutPdfDataEntityRepository
   ) {
-    console.log("INIT KEYSERVICE")
+    // this.getLatestHandoverPDF('a4f4f32b-96de-4f20-b5bd-ac3a128da121')
   }
 
   get isDevelopMode(): boolean {
@@ -165,7 +169,7 @@ export class KeyService {
         timestamp: { direction: 'DESC' },
         created: { direction: 'DESC' },
       },
-      relations: ['customer'],
+      relations: ['customer', 'pdfs'],
     });
   }
 
@@ -230,4 +234,35 @@ export class KeyService {
     this.sendKeysToSSE(k)
     return k;
   }
+
+  async createPdf(dto: KeyHandoutPDFDataDto): Promise<{ pdf: Buffer, response: AxiosResponse}> {
+    const handout = await this.handoverRepo.findOneByOrFail({ id: dto.handoverId })
+    const data = {
+      ...dto,
+      handout
+    }
+
+    data.handoverDate = new Date(data.handoverDate);
+
+    const entity = await this.handoutPDFRepo.save(this.handoutPDFRepo.create(data));
+
+    const fileName = await this.pdfService.generatePDF(dto);
+    entity.createdAt = new Date();
+    entity.fileName = fileName;
+    await this.handoutPDFRepo.save(entity);
+    const file = await this.pdfService.getPDFByHandoverKey(fileName);
+    return file;
+  }
+
+  async getPdf(handoverId: string): Promise<{ pdf: Buffer, response: AxiosResponse}> {
+    return this.pdfService.getPDFByHandoverKey(handoverId);
+  }
+
+  async getLatestHandoverPDF(handoverId: string) {
+    const pdf = await this.handoutPDFRepo.findOne({
+      where: { handout: { id: handoverId}},
+      order: {createdAt: 'DESC' },
+    });
+    console.log(pdf)
+  }
 }

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

@@ -6,6 +6,7 @@ import {
   Cylinder,
   Key,
   KeyHandout,
+  KeyHandoutPdfDataEntity,
   Role,
   SSOUser,
   User,
@@ -18,6 +19,7 @@ import {
   ActivityRepository,
   CustomerRepository,
   CylinderRepository,
+  KeyHandoutPdfDataEntityRepository,
   KeyRepository,
   KeySystemRepository,
   RoleRepository,
@@ -41,7 +43,8 @@ const ENTITIES = [
   Activity,
   EmailLog,
   UserSettings,
-  Impersonation
+  Impersonation,
+  KeyHandoutPdfDataEntity
 ];
 const REPOSITORIES = [
   UserRepository,
@@ -55,7 +58,8 @@ const REPOSITORIES = [
   ActivityRepository,
   EmailLogRepository,
   UserSettingsRepository,
-  ImpersonationRepository
+  ImpersonationRepository,
+  KeyHandoutPdfDataEntityRepository
 ];
 
 @Module({

api/src/shared/pdf/key-handover-pdf/key-handover-pdf.service.ts

@@ -1,248 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { KeyHandoverDto } from 'src/model/dto/key-handover.dto';
-import * as puppeteer from 'puppeteer';
-import { MinioService } from '../minio/minio.service';
-import { KeyHandoutRepository } from 'src/model/repositories/key-handout.repository';
-import { KeyHandout } from 'src/model/entitites';
-
-@Injectable()
-export class KeyHandoverPdfService {
-
-  constructor(private readonly minioService: MinioService, private handoverRepo: KeyHandoutRepository) {}
-
-  async generatePdf(dto: KeyHandoverDto): Promise<Buffer> {
-    const browser = await puppeteer.launch({
-      headless: true,
-      args: ['--no-sandbox', '--disable-setuid-sandbox'],
-    });
-
-    try {
-      const page = await browser.newPage();
-
-      const html = this.buildHtml(dto);
-
-      await page.setContent(html, {
-        waitUntil: 'networkidle0',
-      });
-
-      const pdf = await page.pdf({
-        format: 'A4',
-        printBackground: true,
-        margin: {
-          top: '20mm',
-          right: '15mm',
-          bottom: '20mm',
-          left: '15mm',
-        },
-        displayHeaderFooter: true,
-        headerTemplate: `<div></div>`,
-        footerTemplate: `
-          <div style="
-            width: 100%;
-            font-size: 10px;
-            padding: 0 20px;
-            color: #666;
-            display: flex;
-            justify-content: space-between;
-          ">
-            <span>Übergabeprotokoll</span>
-            <span>${new Date().toLocaleString()}</span>
-          </div>
-        `,
-      });
-
-      const buffer = Buffer.from(pdf);
-
-      const bucket = 'keyvault-pro-develop';
-      const key = `handover-forms/${Date.now()}-schluesseluebergabe.pdf`;
-      await this.minioService.uploadPdf(bucket, key, buffer);
-      await this.saveKeyToHandover(dto.handoverId, key)
-      return buffer;
-    } finally {
-      await browser.close();
-    }
-  }
-
-  private async saveKeyToHandover(handoverId: string, fileKey: string) {
-    const handover: KeyHandout = await this.handoverRepo.findOneBy({ id: handoverId });
-    if (!handover) { return; }
-    handover.pdfFormKey = fileKey;
-    this.handoverRepo.save(handover);
-  }
-
-  private buildHtml(dto: KeyHandoverDto): string {
-    return `
-      <!doctype html>
-      <html lang="de">
-        <head>
-          <meta charset="UTF-8" />
-          <title>Übergabeprotokoll</title>
-          <style>
-            body {
-              font-family: Arial, Helvetica, sans-serif;
-              font-size: 12px;
-              color: #222;
-              margin: 0;
-              padding: 0;
-            }
-
-            h1 {
-              text-align: center;
-              margin: 0 0 24px 0;
-              font-size: 22px;
-            }
-
-            .section {
-              margin-bottom: 18px;
-            }
-
-            .section-title {
-              font-weight: bold;
-              font-size: 14px;
-              margin-bottom: 8px;
-              border-bottom: 1px solid #ccc;
-              padding-bottom: 4px;
-            }
-
-            .row {
-              margin-bottom: 6px;
-            }
-
-            .label {
-              display: inline-block;
-              width: 170px;
-              font-weight: bold;
-              vertical-align: top;
-            }
-
-            .value {
-              display: inline-block;
-              max-width: 360px;
-              word-break: break-word;
-            }
-
-            .note-box {
-              min-height: 60px;
-              border: 1px solid #ccc;
-              padding: 8px;
-              margin-top: 6px;
-              white-space: pre-wrap;
-            }
-
-            .declaration {
-              margin-top: 24px;
-              line-height: 1.5;
-            }
-
-            .signature-wrapper {
-              margin-top: 60px;
-              display: flex;
-              justify-content: space-between;
-              gap: 40px;
-            }
-
-            .signature-block {
-              width: 45%;
-            }
-
-            .signature-line {
-              border-top: 1px solid #000;
-              margin-top: 50px;
-              padding-top: 6px;
-              text-align: center;
-            }
-          </style>
-        </head>
-        <body>
-          <h1>Übergabeprotokoll</h1>
-
-          <div class="section">
-            <div class="section-title">Übergabedaten</div>
-            <div class="row">
-              <span class="label">Datum der Übergabe:</span>
-              <span class="value">${this.escapeHtml(new Date(dto.handoverDate).toLocaleDateString())}</span>
-            </div>
-            <div class="row" style="display: none">
-              <span class="label">Ort:</span>
-              <span class="value">${this.escapeHtml(dto.place)}</span>
-            </div>
-          </div>
-
-          <div class="section">
-            <div class="section-title">Übergeber</div>
-            <div class="row">
-              <span class="label">Name:</span>
-              <span class="value">${this.escapeHtml(dto.giverName)}</span>
-            </div>
-            <div class="row">
-              <span class="label">Adresse:</span>
-              <span class="value">${this.escapeHtml(dto.giverAddress ?? '-')}</span>
-            </div>
-          </div>
-
-          <div class="section">
-            <div class="section-title">Empfänger</div>
-            <div class="row">
-              <span class="label">Name:</span>
-              <span class="value">${this.escapeHtml(dto.receiverName)}</span>
-            </div>
-            <div class="row">
-              <span class="label">Adresse:</span>
-              <span class="value">${this.escapeHtml(dto.receiverAddress ?? '-')}</span>
-            </div>
-          </div>
-
-          <div class="section">
-            <div class="section-title">Schlüsselangaben</div>
-            <div class="row" style="display: none;">
-              <span class="label">Schlüsselart:</span>
-              <span class="value">${this.escapeHtml(dto.keyType)}</span>
-            </div>
-            <div class="row">
-              <span class="label">Schlüsselnummer:</span>
-              <span class="value">${this.escapeHtml(dto.keyNumber ?? '-')}</span>
-            </div>
-            <div class="row" style="display: none;">
-              <span class="label">Anzahl:</span>
-              <span class="value">${dto.quantity}</span>
-            </div>
-            <div class="row">
-              <span class="label">Objekt / Raum:</span>
-              <span class="value">${this.escapeHtml(dto.objectDescription ?? '-')}</span>
-            </div>
-            <div class="row">
-              <span class="label">Bemerkungen:</span>
-            </div>
-            <div class="note-box">${this.escapeHtml(dto.notes ?? '-')}</div>
-            
-          </div>
-
-          <div class="declaration">
-            Hiermit bestätigt der Empfänger den Erhalt der oben aufgeführten Schlüssel.
-            <br />
-            Mit ihrer Unterschrift bestätigen beide Parteien die ordnungsgemäße Übergabe.
-          </div>
-
-          <div class="signature-wrapper">
-            <div class="signature-block">
-              <div class="signature-line">Unterschrift Übergeber</div>
-            </div>
-            <div class="signature-block">
-              <div class="signature-line">Unterschrift Empfänger</div>
-            </div>
-          </div>
-        </body>
-      </html>
-    `;
-  }
-
-  private escapeHtml(value: string): string {
-    if (!value) { return ""; }
-    return value
-      .replace(/&/g, '&amp;')
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;')
-      .replace(/"/g, '&quot;')
-      .replace(/'/g, '&#39;');
-  }
-}

api/src/shared/pdf/minio/minio.service.ts

@@ -1,30 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
-import { ConfigService } from '@nestjs/config';
-
-@Injectable()
-export class MinioService {
-
-  constructor(private configService: ConfigService) {}
-
-  private readonly client = new S3Client({
-    region: 'us-east-1',
-    endpoint: this.configService.get('MINIOHOST'),
-    credentials: {
-      accessKeyId: this.configService.get('MINIOUSER'),
-      secretAccessKey: this.configService.get('MINIOACCESSKEY'),
-    },
-    forcePathStyle: true,
-  });
-
-  async uploadPdf(bucket: string, key: string, pdfBuffer: Buffer): Promise<void> {
-    await this.client.send(
-      new PutObjectCommand({
-        Bucket: bucket,
-        Key: key,
-        Body: pdfBuffer,
-        ContentType: 'application/pdf',
-      }),
-    );
-  }
-}

api/src/shared/pdf/pdf.module.ts

@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-import { KeyHandoverPdfService } from './key-handover-pdf/key-handover-pdf.service';
-import { MinioService } from './minio/minio.service';
-import { ConfigModule } from '@nestjs/config';
-import { DatabaseModule } from '../database/database.module';
-
-@Module({
-  providers: [KeyHandoverPdfService, MinioService],
-  imports: [ConfigModule, DatabaseModule],
-  exports: [KeyHandoverPdfService]
-})
-export class PdfModule {}

api/src/shared/storage/services/pdf/pdf.service.ts

@@ -0,0 +1,47 @@
+import { HttpService } from '@nestjs/axios';
+import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { AxiosResponse } from 'axios';
+import { firstValueFrom } from 'rxjs';
+import { KeyHandoutPDFDataDto } from 'src/model/dto/key-handover.dto';
+import { KeyHandoutRepository } from 'src/model/repositories/key-handout.repository';
+
+@Injectable()
+export class PdfService {
+
+  private readonly STORAGESERVER = this.configService.get('STORAGE_HOST')
+
+  constructor(
+    private readonly configService: ConfigService,
+    private readonly httpService: HttpService
+  ) {  }
+
+  public async generatePDF(dto: KeyHandoutPDFDataDto): Promise<string> {
+    const response = await this.post(`${this.STORAGESERVER}/pdf/keyhandover`, dto);
+    if (response?.data == null) { throw new HttpException('Konnte nicht erstellt werden', HttpStatus.INTERNAL_SERVER_ERROR) }
+    return response.data;
+    
+  }
+
+  public async getPDFByHandoverKey(key: string): Promise<{ pdf: Buffer, response: AxiosResponse}> {
+    return new Promise(resolve => {
+      this.httpService.get(`${this.STORAGESERVER}/pdf/keyhandover/${key}`, {
+      responseType: 'arraybuffer',
+      }).subscribe({
+        next: pdf => {
+          const pdfBuffer = Buffer.from(pdf.data);
+          resolve({ pdf: pdfBuffer, response: pdf})
+        },
+        error: e => console.log(e)
+      })
+    })
+  }
+
+  private async post(url: string, data: any): Promise<AxiosResponse> {
+    return new Promise(resolve => {
+      this.httpService.post(url, data).subscribe({
+        next: data => resolve(data)
+      })
+    })
+  }
+}

api/src/shared/storage/storage.module.ts

@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+import { StorageService } from './storage.service';
+import { HttpModule } from '@nestjs/axios';
+import { ConfigModule } from '@nestjs/config';
+import { PdfService } from './services/pdf/pdf.service';
+
+@Module({
+  imports: [HttpModule, ConfigModule],
+  providers: [StorageService, PdfService ],
+  exports: [ StorageService, PdfService ]
+})
+export class StorageModule {}

api/src/shared/storage/storage.service.ts

@@ -0,0 +1,8 @@
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class StorageService {
+  constructor() {}
+
+  
+}

client/src/app/modules/keys/components/create-handover-pdf-dialog/create-handover-pdf-dialog.component.html

@@ -1,3 +1,8 @@
+@if(isLoading) {
+  <div class="loading-overlay">
+    <mat-spinner></mat-spinner>
+  </div>
+}
 <h2 mat-dialog-title>Übergabeprotokoll</h2>
 <mat-dialog-content>
   <div class="text" style="margin: 0 0 24px 0;">
@@ -45,8 +50,8 @@
   </form>
 </mat-dialog-content>
 <mat-dialog-actions>
-  <button matButton mat-dialog-close class="btn-warning">Schließen</button>
-  <button matButton="elevated" (click)="createPdf()" class="btn-primary">
+  <button matButton mat-dialog-close class="btn-warning" [disabled]="this.isLoading">Schließen</button>
+  <button matButton="elevated" (click)="createPdf()" class="btn-primary" [disabled]="this.isLoading">
       <mat-icon>save</mat-icon>
       PDF erzeugen
     </button>

client/src/app/modules/keys/components/create-handover-pdf-dialog/create-handover-pdf-dialog.component.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CreateHandoverPdfDialogComponent } from './create-handover-pdf-dialog.component';
-
-describe('CreateHandoverPdfDialogComponent', () => {
-  let component: CreateHandoverPdfDialogComponent;
-  let fixture: ComponentFixture<CreateHandoverPdfDialogComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [CreateHandoverPdfDialogComponent]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(CreateHandoverPdfDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

client/src/app/modules/keys/components/create-handover-pdf-dialog/create-handover-pdf-dialog.component.ts

@@ -8,10 +8,11 @@ import { MatInputModule } from '@angular/material/input';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { IKeyHandoverPDF } from '../../../../model/interface/handover-pdf.interface';
+import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 
 @Component({
   selector: 'app-create-handover-pdf-dialog',
-  imports: [MatDialogModule, FormsModule, ReactiveFormsModule, CommonModule, MatFormFieldModule, MatInputModule, MatButtonModule, MatIconModule],
+  imports: [MatDialogModule, FormsModule, ReactiveFormsModule, CommonModule, MatFormFieldModule, MatInputModule, MatButtonModule, MatIconModule, MatProgressSpinnerModule],
   templateUrl: './create-handover-pdf-dialog.component.html',
   styleUrl: './create-handover-pdf-dialog.component.scss',
 })
@@ -20,6 +21,8 @@ export class CreateHandoverPdfDialogComponent {
   readonly dialogRef = inject(MatDialogRef<CreateHandoverPdfDialogComponent>);
   readonly data = inject<any>(MAT_DIALOG_DATA);
 
+  public isLoading = false;
+
   handoverPDFForm = new FormGroup({
     handoverDate: new FormControl<Date>(new Date(), Validators.required),
     place: new FormControl<string | null>(null, Validators.required),
@@ -35,7 +38,6 @@ export class CreateHandoverPdfDialogComponent {
   });
 
   ngOnInit() {
-    console.log(this.data)
     this.patchInitialData();
   }
 
@@ -52,6 +54,7 @@ export class CreateHandoverPdfDialogComponent {
   }
 
   async createPdf() {
+    this.isLoading = true;
     const dto: IKeyHandoverPDF = {
       ...this.handoverPDFForm.value as any,
       quantity: 1,

client/src/app/modules/keys/components/handover-dialog/handover-dialog.component.ts

@@ -80,7 +80,18 @@ export class HandoverDialogComponent extends AgGridContainerComponent {
         , sort: 'desc'
         , cellRenderer: (data: any) => this.datePipe.transform(new Date(data.value))
       },
-    
+      {
+        colId: 'download',
+        headerName: 'PDF',
+        field: 'pdfs',
+        width: 60,
+        tooltipValueGetter: () => 'Übergabeprotokoll herunterladen',
+        cellRenderer: () => '',
+        cellClass: (data: any) => data.value.length ? 'download-pdf' : '',
+        onCellClicked: (event) => {
+          this.downloadHandoverPDF(event.value)
+        },
+      }
     ]
   }
 
@@ -94,7 +105,7 @@ export class HandoverDialogComponent extends AgGridContainerComponent {
     key: new FormControl(this.data),
     direction: new FormControl('out', Validators.required),
     timestamp: new FormControl(new Date(), Validators.required),
-    handoverDocument: new FormControl<boolean>(false)
+    handoverDocument: new FormControl<boolean>(true)
   });
 
   ngOnInit() {
@@ -104,7 +115,6 @@ export class HandoverDialogComponent extends AgGridContainerComponent {
   loadData() {
     this.isLoading = true;
     const promises: Observable<any>[] = [
-      this.getHandovers(),
       from(this.loadCustomers())
     ];
 
@@ -218,6 +228,14 @@ export class HandoverDialogComponent extends AgGridContainerComponent {
   onGridReady(params: GridReadyEvent) {
     this.gridApi = params.api;
     this.gridApi.addEventListener("cellEditingStopped", evt => {})
+    this.getHandovers();
+    //this.downloadHandoverPDF('5b1f92d9-c66c-49ad-b654-b9a9a6a59752')
+  }
+
+  downloadHandoverPDF(pdfs: any[]) {
+    if (!pdfs || pdfs.length < 1) { return; }
+
+    this.api.getHandoverPdf(pdfs[0]['fileName'])
   }
 
 }

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

@@ -112,6 +112,5 @@ export class CreateKeyComponent {
   async setEditKey(key: IKey) {
     this.createForm.patchValue(key as any);
     this.createForm.controls.cylinder.patchValue(this.cylinders.filter(c => key.cylinder.some(v => v.id == c.id)));
-    console.log(this.createForm.value)
   }
 }

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

@@ -51,7 +51,6 @@ export class SystemComponent extends AgGridContainerComponent {
     await this.api.refreshSystems();
     this.gridApi.setGridOption("loading", false);
     const a = await this.api.getSystemArchive();
-    console.log(a)
   }
 
   onGridReady(params: GridReadyEvent) {

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

@@ -461,9 +461,15 @@ export class ApiService {
   createPdf(data: IKeyHandoverPDF) {
     return new Promise(resolve => {
 
-      this.http.post('/api/key/pdf', data, {
+      this.http.post('api/key/pdf', data, {
         responseType: 'blob',
-      }).subscribe((blob) => {
+      }).pipe( 
+      this.toast.observe({
+        loading: `Erstelle Übergabedokument`,
+        success: `Übergabedokument wurde erfolgreich erstellt und wird gespeichert.`,
+        error: 'Es ist ein Fehler aufgetreten'
+      }))
+      .subscribe((blob) => {
         const url = URL.createObjectURL(blob);
         const a = document.createElement('a');
         a.href = url;
@@ -476,4 +482,20 @@ export class ApiService {
     })
     
   }
+
+  getHandoverPdf(handoverId: string) {
+    return new Promise(resolve => {
+      this.http.get(`api/key/${handoverId}/handover/pdf`,{
+        responseType: 'blob',
+      }).subscribe((blob) => {
+        const url = URL.createObjectURL(blob);
+        const a = document.createElement('a');
+        a.href = url;
+        a.download = 'schluesseluebergabe.pdf';
+        a.click();
+        URL.revokeObjectURL(url);
+        resolve(null)
+      });
+    })
+  }
 }

client/src/styles.scss

@@ -62,6 +62,19 @@ html, body {
 
 }
 
+.download-pdf {
+  background-image: url("./assets/img/pdf.png");
+  background-size: 22px;
+  background-repeat: no-repeat;
+  background-position: center;
+  cursor: pointer;
+  transition: background-color 0.2s ease-in-out;
+  // background-color: red;
+  &:hover {
+    background-color: #ccc;
+  }
+}
+
 .icon-btn-xs {
   width: 28px;
   height: 28px;
@@ -233,4 +246,19 @@ div.ag-row {
   display: flex;
   justify-content: space-between;
   gap: 12px;
+}
+
+.loading-overlay {
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
+  padding: 0;
+  margin: 0;
+  box-sizing: border-box;
+  z-index: 2;
+  background: rgba(255, 255, 255, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }