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

Merge pull request #1256 from Tria-plc/alpha

Browse Source 
Overall report and segment tariff override updates
This commit is contained in:
Stephanos A.
2026-08-12 13:23:00 +03:00
committed by GitHub
parent b485e56a3e 9d19801535
commit ec2b381870
2 changed files with 88 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
apps/edr-passenger-api/src/modules/fare-engine/fare-engine.service.ts
View File

@@ -88,20 +88,48 @@ export class FareEngineService {
where: {
routeId: route.id,
seatClassId: dto.seatClassId,
originStopSequence: originStop.sequence,
destinationStopSequence: destStop.sequence,
AND: [
{
OR: [
{
originStopSequence: originStop.sequence,
destinationStopSequence: destStop.sequence,
},
{
originStopSequence: destStop.sequence,
destinationStopSequence: originStop.sequence,
},
],
},
{
OR: [{ validUntil: null }, { validUntil: { gte: now } }],
},
],
validFrom: { lte: now },
OR: [{ validUntil: null }, { validUntil: { gte: now } }],
nationality: dto.nationality ?? null,
},
}) ?? await this.prisma.segmentFareRule.findFirst({
where: {
routeId: route.id,
seatClassId: dto.seatClassId,
originStopSequence: originStop.sequence,
destinationStopSequence: destStop.sequence,
AND: [
{
OR: [
{
originStopSequence: originStop.sequence,
destinationStopSequence: destStop.sequence,
},
{
originStopSequence: destStop.sequence,
destinationStopSequence: originStop.sequence,
},
],
},
{
OR: [{ validUntil: null }, { validUntil: { gte: now } }],
},
],
validFrom: { lte: now },
OR: [{ validUntil: null }, { validUntil: { gte: now } }],
nationality: null,
},
});