Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha

Browse Source
This commit is contained in:
Stephanos A
2026-07-21 15:50:35 +03:00
parent 281969c94b 34563e078e
commit 3c46f9b3ec
119 changed files with 4102 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/edr-passenger-api/Dockerfile
View File

@@ -57,4 +57,7 @@ RUN addgroup --system --gid 1001 nodejs \
COPY --from=deployer --chown=nestjs:nodejs /deploy .
USER nestjs
EXPOSE 4000
CMD ["node", "dist/main.js"]
# --enable-source-maps: translate stack-trace frames from dist/*.js back to
# src/*.ts using the .js.map files nest build emits (tsconfig sourceMap:true).
# Without it Node reports compiled JS line numbers, not TypeScript source.
CMD ["node", "--enable-source-maps", "dist/main.js"]

2
apps/edr-passenger-api/prisma/schema.prisma
View File

@@ -580,7 +580,7 @@ model BookingSeat {
bookingId String
seatId String
leg Int @default(1) // 1=outbound/leg-1, 2=return/leg-2
scheduleId String // which schedule this seat belongs to
scheduleId String? // which schedule this seat belongs to
passengerName String
dateOfBirth DateTime?
passengerCategory PassengerCategory @default(ADULT)

16
apps/edr-passenger-api/src/modules/payments/payments.service.ts
View File

@@ -826,6 +826,19 @@ export class PaymentsService {
});
if (!intent) throw new NotFoundException("PaymentIntent not found");
if (intent.status === PaymentIntentStatus.SUCCEEDED) {
// Idempotency guard — but still repair missing tickets. They can be absent
// when the first finalization threw from generate() after the transaction
// committed: the caller got a 500, retried, and now hits this early-return.
const ticketCount = await this.prisma.ticket.count({ where: { bookingId: intent.bookingId } });
if (ticketCount === 0) {
try {
await this.ticketsService.generate(intent.bookingId);
} catch (err) {
this.logger.error(
`Error generating ticket on idempotency retry for booking ${intent.bookingId}: ${err instanceof Error ? err.message : String(err)}`,
);
}
}
return { alreadyFinalized: true };
}
if (intent.status === PaymentIntentStatus.CANCELLED) {
@@ -877,9 +890,8 @@ export class PaymentsService {
await this.ticketsService.generate(booking.id);
} catch (err) {
this.logger.error(
`Error generating ticket: ${err instanceof Error ? err.message : String(err)}`,
`Error generating ticket for booking ${booking.id}: ${err instanceof Error ? err.message : String(err)}`,
);
throw err;
}
try {