changes

apps/edr-freight-api/src/modules/bookings/bookings.controller.ts

@@ -13,7 +13,13 @@ import {
   UseInterceptors,
 } from "@nestjs/common";
 import { AnyFilesInterceptor } from "@nestjs/platform-express";
-import { ApiBody, ApiConsumes, ApiOperation, ApiTags } from "@nestjs/swagger";
+import {
+  ApiBearerAuth,
+  ApiBody,
+  ApiConsumes,
+  ApiOperation,
+  ApiTags,
+} from "@nestjs/swagger";
 
 import { BookingsService } from "./bookings.service";
 import { CreateBookingDto } from "./dto/create-booking.dto";
@@ -23,8 +29,9 @@ import { UpdateStatusDto } from "./dto/update-status.dto";
 
 @ApiTags("bookings")
 @Controller("bookings")
+@ApiBearerAuth()
 export class BookingsController {
-  constructor(private readonly bookingsService: BookingsService) {}
+  constructor(private readonly bookingsService: BookingsService) { }
 
   // ── 1. Create booking (multipart/form-data) ──────────────────────────
   @Post()
@@ -46,7 +53,16 @@ export class BookingsController {
     @Body() dto: CreateBookingDto,
     @UploadedFiles() files: Express.Multer.File[],
   ) {
-    console.log('[BookingsController] Files received:', files?.length, files?.map(f => ({ fieldname: f.fieldname, originalname: f.originalname, size: f.size, mimetype: f.mimetype })));
+    console.log(
+      "[BookingsController] Files received:",
+      files?.length,
+      files?.map((f) => ({
+        fieldname: f.fieldname,
+        originalname: f.originalname,
+        size: f.size,
+        mimetype: f.mimetype,
+      })),
+    );
     return this.bookingsService.create(dto, files ?? []);
   }
 
@@ -56,7 +72,8 @@ export class BookingsController {
   @ApiConsumes("multipart/form-data")
   @ApiOperation({
     summary: "Update a draft booking",
-    description: "Only DRAFT bookings can be updated. New files are merged into existing documents.",
+    description:
+      "Only DRAFT bookings can be updated. New files are merged into existing documents.",
   })
   @ApiBody({ type: UpdateBookingDto })
   update(
@@ -141,7 +158,8 @@ export class BookingsController {
   @Delete(":id/consolidation")
   @ApiOperation({
     summary: "Remove consolidation pairing",
-    description: "Unpairs both bookings and returns them to PENDING_CONSOLIDATION status.",
+    description:
+      "Unpairs both bookings and returns them to PENDING_CONSOLIDATION status.",
   })
   removeConsolidation(@Param("id", ParseUUIDPipe) id: string) {
     return this.bookingsService.removeConsolidation(id);
@@ -151,7 +169,8 @@ export class BookingsController {
   @Get(":id/consolidation")
   @ApiOperation({
     summary: "Get consolidation details",
-    description: "Returns partner booking details and split billing information.",
+    description:
+      "Returns partner booking details and split billing information.",
   })
   getConsolidationDetails(@Param("id", ParseUUIDPipe) id: string) {
     return this.bookingsService.getConsolidationDetails(id);

apps/edr-freight-api/src/modules/bookings/bookings.module.ts

@@ -2,13 +2,14 @@ import { Module } from "@nestjs/common";
 import { TypeOrmModule } from "@nestjs/typeorm";
 
 import { FilesModule } from "../files/files.module";
+import { MinioModule } from "../minio/minio.module";
 import { BookingsController } from "./bookings.controller";
 import { BookingsRepository } from "./bookings.repository";
 import { BookingsService } from "./bookings.service";
 import { Booking } from "./entities/booking.entity";
 
 @Module({
-  imports: [TypeOrmModule.forFeature([Booking]), FilesModule],
+  imports: [TypeOrmModule.forFeature([Booking]), FilesModule, MinioModule],
   controllers: [BookingsController],
   providers: [BookingsService, BookingsRepository],
   exports: [BookingsService],

apps/edr-freight-api/src/modules/bookings/bookings.service.ts

@@ -7,12 +7,14 @@ import {
 import { IsNull, Not } from "typeorm";
 
 import { FilesService } from "../files/files.service";
+import { MinioService } from "../minio/minio.service";
 import { BookingsRepository } from "./bookings.repository";
 import { CreateBookingDto } from "./dto/create-booking.dto";
 import { FilterBookingDto } from "./dto/filter-booking.dto";
 import { UpdateBookingDto } from "./dto/update-booking.dto";
 import { UpdateStatusDto } from "./dto/update-status.dto";
 import { Booking } from "./entities/booking.entity";
+import { FileRecord } from "../files/entities/file.entity";
 
 /** Weight thresholds (tons) that trigger overweight surcharge alerts. */
 const WEIGHT_LIMITS = {
@@ -29,6 +31,7 @@ export class BookingsService {
   constructor(
     private readonly bookingsRepository: BookingsRepository,
     private readonly filesService: FilesService,
+    private readonly minioService: MinioService,
   ) {}
 
   // ── helpers ──────────────────────────────────────────────────────────
@@ -233,15 +236,45 @@ export class BookingsService {
     if (!booking) {
       throw new NotFoundException(`Booking ${id} not found`);
     }
+
+    // Add signed URLs for files (5-minute expiration)
+    if (booking.files && booking.files.length > 0) {
+      booking.files = await Promise.all(
+        booking.files.map(async (file: FileRecord) => {
+          const objectName = this.extractObjectName(file.url);
+          const signedUrl = await this.minioService.getSignedUrl(objectName, 300);
+          return { ...file, signedUrl };
+        })
+      );
+    }
+
     return booking;
   }
 
+  /** Extract object name from Minio URL. */
+  private extractObjectName(url: string): string {
+    const parts = url.split("/");
+    return parts.slice(4).join("/");
+  }
+
   /** Find booking by reference with files. */
   async findByReference(reference: string): Promise<Booking> {
     const booking = await this.bookingsRepository.findByReferenceWithFiles(reference);
     if (!booking) {
       throw new NotFoundException(`Booking with reference "${reference}" not found`);
     }
+
+    // Add signed URLs for files (5-minute expiration)
+    if (booking.files && booking.files.length > 0) {
+      booking.files = await Promise.all(
+        booking.files.map(async (file: FileRecord) => {
+          const objectName = this.extractObjectName(file.url);
+          const signedUrl = await this.minioService.getSignedUrl(objectName, 300);
+          return { ...file, signedUrl };
+        })
+      );
+    }
+
     return booking;
   }