Backoffice UAT results addressed, packages and other updates

apps/edr-passenger-api/src/modules/packages/packages.controller.ts

@@ -19,9 +19,8 @@ export class PackagesController {
   }
 
   @Get('all')
-  @UseGuards(JwtGuard)
-  @ApiBearerAuth('JWT-auth')
-  @ApiOperation({ summary: 'List all packages (admin)' })
+  @IsPublic()
+  @ApiOperation({ summary: 'List all packages' })
   listAll(@Query('page') page?: string, @Query('pageSize') pageSize?: string) {
     return this.service.listAll(page ? +page : 1, pageSize ? +pageSize : 20);
   }
@@ -64,6 +63,14 @@ export class PackagesController {
     return this.service.update(id, dto);
   }
 
+  @Delete(':id')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Delete package (admin)' })
+  remove(@Param('id') id: string) {
+    return this.service.remove(id);
+  }
+
   @Patch(':id/activate')
   @UseGuards(JwtGuard)
   @ApiBearerAuth('JWT-auth')

apps/edr-passenger-api/src/modules/packages/packages.service.ts

@@ -117,6 +117,28 @@ export class PackagesService {
     return this.prisma.packagePriceTier.delete({ where: { id: tierId } });
   }
 
+  async remove(id: string) {
+    const pkg = await this.prisma.travelPackage.findUnique({
+      where: { id },
+      include: { bookings: { select: { id: true, status: true } } },
+    });
+    if (!pkg) throw new NotFoundException('Package not found');
+    const hasActive = pkg.bookings.some((b) => b.status === 'PENDING_PAYMENT' || b.status === 'CONFIRMED');
+    if (hasActive) throw new BadRequestException('Cannot delete a package with active bookings');
+
+    await this.prisma.$transaction(async (tx) => {
+      const bookingIds = pkg.bookings.map((b) => b.id);
+      if (bookingIds.length > 0) {
+        await tx.packageBookingPassenger.deleteMany({ where: { bookingId: { in: bookingIds } } });
+        await tx.packagePaymentIntent.deleteMany({ where: { packageBookingId: { in: bookingIds } } });
+        await tx.packageBooking.deleteMany({ where: { packageId: id } });
+      }
+      await tx.packagePriceTier.deleteMany({ where: { packageId: id } });
+      await tx.travelPackage.delete({ where: { id } });
+    });
+    return { deleted: true };
+  }
+
   async activate(id: string) {
     const pkg = await this.prisma.travelPackage.findUnique({ where: { id } });
     if (!pkg) throw new NotFoundException('Package not found');
@@ -228,7 +250,11 @@ export class PackagesService {
       this.prisma.travelPackage.findMany({
         skip,
         take: pageSize,
-        include: { priceTiers: true },
+        include: {
+          priceTiers: true,
+          outboundSchedule: { include: { originStation: true, destinationStation: true } },
+          returnSchedule: { include: { originStation: true, destinationStation: true } },
+        },
         orderBy: { createdAt: 'desc' },
       }),
       this.prisma.travelPackage.count(),