From a0a02b473d9ea8e186e156a6d46ceef254d3f72b Mon Sep 17 00:00:00 2001 From: Abubeker Yasin Date: Thu, 25 Jun 2026 14:20:17 +0300 Subject: [PATCH] fix: ( my booking ) add get passenger id from the iamuserid --- .../src/modules/bookings/bookings.controller.ts | 16 ++++++++-------- .../src/modules/bookings/bookings.service.ts | 5 +++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/apps/edr-passenger-api/src/modules/bookings/bookings.controller.ts b/apps/edr-passenger-api/src/modules/bookings/bookings.controller.ts index ad4a7cd20..4c4d399ee 100644 --- a/apps/edr-passenger-api/src/modules/bookings/bookings.controller.ts +++ b/apps/edr-passenger-api/src/modules/bookings/bookings.controller.ts @@ -1,4 +1,4 @@ -import { Body, Controller, Delete, Get, Param, Post, Patch, UseGuards, Query, Req, BadRequestException } from '@nestjs/common'; +import { Body, Controller, Delete, Get, Param, Post, Patch, UseGuards, Query, Req, BadRequestException, UnauthorizedException } from '@nestjs/common'; import { ApiTags, ApiOperation, ApiBearerAuth, ApiResponse, ApiQuery, ApiBody } from '@nestjs/swagger'; import { IsPublic } from '@tria-plc/api-common/modules/auth/decorators/public.decorator'; import { Throttle } from '@nestjs/throttler'; @@ -36,13 +36,13 @@ export class BookingsController { @Query('page') page?: string, @Query('pageSize') pageSize?: string, ) { - const passengerId = req.user?.passengerId; - if (!passengerId) throw new Error('Passenger ID not found in token'); - return this.service.findByPassengerId(passengerId, { - search, - status, - page: page ? parseInt(page) : 1, - pageSize: pageSize ? parseInt(pageSize) : 20 + const iamUserId = req.user?.id; + if (!iamUserId) throw new UnauthorizedException(); + return this.service.findByIamUserId(iamUserId, { + search, + status, + page: page ? parseInt(page) : 1, + pageSize: pageSize ? parseInt(pageSize) : 20 }); } diff --git a/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts b/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts index 21532fa44..be965d778 100644 --- a/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts +++ b/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts @@ -44,6 +44,11 @@ export class BookingsService { private readonly fareEngine: FareEngineService, ) {} + async findByIamUserId(iamUserId: string, filters: BookingFilters = {}) { + const passenger = await this.prisma.passenger.findUniqueOrThrow({ where: { iamUserId }, select: { id: true } }); + return this.findByPassengerId(passenger.id, filters); + } + async findByPassengerId(passengerId: string, filters: BookingFilters = {}) { const { search, status, page = 1, pageSize = 20 } = filters; const skip = (page - 1) * pageSize;