fixed content dispos to include asian stuff

Author: CropWatchDevelopment

src/pdf/pdf.controller.ts

@@ -8,7 +8,7 @@ import {
   Req,
   Query,
 } from '@nestjs/common';
-import { ApiBearerAuth, ApiQuery, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { ApiBearerAuth, ApiOkResponse, ApiProduces, ApiQuery, ApiSecurity, ApiTags } from '@nestjs/swagger';
 import { Response } from 'express';
 import { PdfService } from './pdf.service';
 import { SupabaseAuthGuard } from 'src/auth/guards/supabase.guard';
@@ -36,6 +36,24 @@ export class PdfController {
     type: 'string',
     description: 'End date (format: YYYY-MM-DD)',
   })
+  @ApiOkResponse({
+    description: 'PDF file',
+    headers: {
+      'Content-Disposition': {
+        description: 'Indicates a file attachment with filename',
+        schema: { type: 'string' },
+      },
+    },
+    content: {
+      'application/pdf': {
+        schema: {
+          type: 'string',
+          format: 'binary',
+        },
+      },
+    },
+  })
+  @ApiProduces('application/pdf')
   async getFile(
     @Res() res: Response,
     @Req() req,
@@ -59,16 +77,20 @@ export class PdfController {
     const user_id = req.user.id;
 
     // Pass the dates to your service if needed:
-    const pdfBuffer = await this.pdfService.createPdfBinary(
+    const reportResponse = await this.pdfService.createPdfBinary(
       user_id,
       devEui,
       start,
       end,
     );
 
+    const pdfBuffer = reportResponse.pdf;
+    const encodedFilename = encodeURIComponent(reportResponse.fileName);
+    const asciiFilename = "report.pdf";
+    console.log(reportResponse.fileName)
     res.set({
+      "Content-Disposition": `attachment; filename="${asciiFilename}"; filename*=UTF-8''${encodedFilename}`,
       'Content-Type': 'application/pdf',
-      'Content-Disposition': 'attachment; filename="report.pdf"',
       'Content-Length': pdfBuffer.length,
     });
 

src/pdf/pdf.service.ts

@@ -20,7 +20,7 @@ export class PdfService {
     private readonly profileService: ProfilesService
   ) { }
 
-  public async createPdfBinary(user_id: string, devEui: string, start: Date, end: Date): Promise<Buffer> {
+  public async createPdfBinary(user_id: string, devEui: string, start: Date, end: Date) {
     if (!user_id) throw new Error('User ID is required');
     if (!devEui) throw new Error('DevEui is required');
     let rawData = await this.fetchDataAndReportFromDB(devEui, user_id, start, end);
@@ -44,9 +44,14 @@ export class PdfService {
         { name: 'notice', min: -17.99, max: -15.1, color: 'yellow' },
         { name: 'normal', min: -18, max: -1000, color: 'white' }
       ];
-      return await buildColdChainReport(rawData, tableColorRange, reportUserData);
+      const pdf = await buildColdChainReport(rawData, tableColorRange, reportUserData);
+      return {
+        pdf,
+        fileName: `${location.name}-${device.name}-${moment(start).format('YYYYMMDD').toString()}-${moment(end).format('YYYYMMDD').toString()}.pdf`
+      }
+
     } else if (device.report_endpoint.includes('co2-report')) {
-      return await buildCO2Report(
+      const pdf = await buildCO2Report(
         rawData,
         device.dev_eui,
         profile.employer,
@@ -55,6 +60,10 @@ export class PdfService {
         device.name,
         `${moment(start).format('YYYY/MM/DD').toString()} - ${moment(end).format('YYYY/MM/DD').toString()}`,
       );
+      return {
+        pdf,
+        fileName: `${location.name}-${device.name}-${moment(start).format('YYYYMMDD').toString()}-${moment(end).format('YYYYMMDD').toString()}.pdf`
+      }
     } else {
       throw new Error('Report endpoint not setup for this device');
     }
@@ -76,6 +85,8 @@ export class PdfService {
       findAllParams,
       user_id
     );
+
     return reportData;
+
   }
 }