diff --git a/src/modules/user/services/itinerary.service.ts b/src/modules/user/services/itinerary.service.ts index 3ca6af7..b008fdc 100644 --- a/src/modules/user/services/itinerary.service.ts +++ b/src/modules/user/services/itinerary.service.ts @@ -1212,6 +1212,21 @@ export class ItineraryService { checkInAddress: true, checkInLat: true, checkInLong: true, + checkInCity: { + select: { + id: true, + cityName: true, + }, + }, + checkOutAddress: true, + checkOutLat: true, + checkOutLong: true, + checkOutCity: { + select: { + id: true, + cityName: true, + }, + }, foodAvailable: true, foodIsChargeable: true, trainerAvailable: true, @@ -1410,6 +1425,7 @@ export class ItineraryService { paxCount: item.paxCount, totalAmount: item.totalAmount, bookingStatus: item.bookingStatus, + activityPrice: item.totalAmount, activity: item.activity ? { id: item.activity.id, @@ -1419,6 +1435,28 @@ export class ItineraryService { checkInAddress: item.activity.checkInAddress, checkInLat: item.activity.checkInLat, checkInLong: item.activity.checkInLong, + checkInCityName: item.activity.checkInCity?.cityName ?? null, + checkOutAddress: item.activity.checkOutAddress, + checkOutLat: item.activity.checkOutLat, + checkOutLong: item.activity.checkOutLong, + checkOutCityName: + item.activity.checkOutCity?.cityName ?? null, + pickUpLocation: item.activity.pickUpDropAvailable + ? { + address: item.activity.checkInAddress, + cityName: item.activity.checkInCity?.cityName ?? null, + lat: item.activity.checkInLat, + long: item.activity.checkInLong, + } + : null, + dropLocation: item.activity.pickUpDropAvailable + ? { + address: item.activity.checkOutAddress, + cityName: item.activity.checkOutCity?.cityName ?? null, + lat: item.activity.checkOutLat, + long: item.activity.checkOutLong, + } + : null, coverImage: coverImage?.mediaFileName ?? null, coverImagePresignedUrl: await attachPresignedUrl( coverImage?.mediaFileName, @@ -1487,6 +1525,9 @@ export class ItineraryService { locationLat: pickUpDetail.locationLat, locationLong: pickUpDetail.locationLong, locationAddress: pickUpDetail.locationAddress, + cityName: pickUpDetail.isPickUp + ? item.activity.checkInCity?.cityName ?? null + : item.activity.checkOutCity?.cityName ?? null, transportBasePrice: pickUpDetail.transportBasePrice, transportTotalPrice: pickUpDetail.transportTotalPrice, }),