added the display order to send the itinerary activities in actual order

This commit is contained in:
2026-04-08 19:15:47 +05:30
parent 5239e04621
commit fcdb813fb7
2 changed files with 9 additions and 3 deletions

View File

@@ -1719,6 +1719,7 @@ model ItineraryActivities {
id Int @id @default(autoincrement())
itineraryHeaderXid Int @map("itinerary_header_xid")
itineraryHeader ItineraryHeader @relation(fields: [itineraryHeaderXid], references: [id], onDelete: Cascade)
displayOrder Int @default(0) @map("display_order")
itineraryType String @map("itinerary_type") @db.VarChar(30)
activityXid Int? @map("activity_xid")
activity Activities? @relation(fields: [activityXid], references: [id], onDelete: Restrict)

View File

@@ -582,7 +582,7 @@ export class ItineraryService {
});
const createdActivities = await Promise.all(
payload.activities.map(async (activityItem) => {
payload.activities.map(async (activityItem, activityIndex) => {
const itineraryType =
activityItem.itineraryType?.trim().toUpperCase() || 'ACTIVITY';
const isCustomItineraryType =
@@ -642,6 +642,7 @@ export class ItineraryService {
itineraryHeader: {
connect: { id: itineraryHeader.id },
},
displayOrder: activityIndex,
itineraryType,
occurenceDate: startOfDay(customStartDateTime),
startTime: activityItem.selectedStartTime,
@@ -665,6 +666,7 @@ export class ItineraryService {
data: customActivityData,
select: {
id: true,
displayOrder: true,
itineraryType: true,
activityXid: true,
scheduledHeaderXid: true,
@@ -934,6 +936,7 @@ export class ItineraryService {
itineraryHeader: {
connect: { id: itineraryHeader.id },
},
displayOrder: activityIndex,
itineraryType,
activity: {
connect: { id: activityItem.activityXid },
@@ -973,6 +976,7 @@ export class ItineraryService {
data: activityData,
select: {
id: true,
displayOrder: true,
activityXid: true,
scheduledHeaderXid: true,
venueXid: true,
@@ -1106,12 +1110,12 @@ export class ItineraryService {
deletedAt: null,
},
orderBy: [
{ occurenceDate: 'asc' },
{ startTime: 'asc' },
{ displayOrder: 'asc' },
{ createdAt: 'asc' },
],
select: {
id: true,
displayOrder: true,
itineraryType: true,
activityXid: true,
scheduledHeaderXid: true,
@@ -1388,6 +1392,7 @@ export class ItineraryService {
return {
id: item.id,
displayOrder: item.displayOrder,
itineraryType: item.itineraryType,
activityXid: item.activityXid,
scheduledHeaderXid: item.scheduledHeaderXid,