mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-08-27 08:32:54 +00:00
Merge pull request #520 from Tria-plc/alpha
Set nationality required on booking widget
This commit is contained in:
Stephanos A.
@@ -30,13 +30,10 @@ export class FareEngineService {
|
||||
if (!seatClass) throw new NotFoundException('Seat class not found');
|
||||
if (!seatClass.isActive) throw new BadRequestException('Seat class is not active');
|
||||
|
||||
// Resolve nationality type: Ethiopian and Djiboutian are LOCAL, everyone else INTERNATIONAL
|
||||
const nationalityUpper = (dto.nationality ?? '').toUpperCase();
|
||||
const nationalityType = (nationalityUpper === 'ETHIOPIAN' || nationalityUpper === 'DJIBOUTIAN')
|
||||
? 'LOCAL' : 'INTERNATIONAL';
|
||||
|
||||
// Find the nationality-specific seat class for the same coach type and bed position.
|
||||
// Falls back to the requested seatClass if no nationality-specific one exists.
|
||||
const nationalitySeatClass = await this.prisma.seatClass.findFirst({
|
||||
where: {
|
||||
coachTypeId: seatClass.coachTypeId,
|
||||
@@ -46,13 +43,10 @@ export class FareEngineService {
|
||||
},
|
||||
}) ?? seatClass;
|
||||
|
||||
// Calculate distance: distanceKm represents cumulative distance from route origin
|
||||
// For a segment, distance = destination.distanceKm - origin.distanceKm
|
||||
const totalDistanceKm = destStop.distanceKm! - originStop.distanceKm!;
|
||||
if (totalDistanceKm < 0 || isNaN(totalDistanceKm))
|
||||
throw new BadRequestException('Invalid distance calculation - check route stop distances');
|
||||
|
||||
// Resolve fare: FareRule (schedule-scoped → route-scoped) takes precedence over distance×rate
|
||||
const now = new Date();
|
||||
const [originStation, destStation] = await Promise.all([
|
||||
this.prisma.station.findUnique({ where: { id: dto.originStationId } }),
|
||||
@@ -81,8 +75,12 @@ export class FareEngineService {
|
||||
let baseFarePerPassengerMinor: number;
|
||||
let ratePerKmMinor: number;
|
||||
let fareSource: string;
|
||||
let insuranceFactor = 1;
|
||||
let usdToEtbRate = 1;
|
||||
// When insuranceFeeMinor is used as a multiplier in the formula it must not
|
||||
// be added again as a flat fee. This flag tracks that.
|
||||
let insuranceAlreadyInBase = false;
|
||||
|
||||
// 1. Segment override: exact origin→destination stop pair on this route
|
||||
const segmentOverride = await this.prisma.segmentFareRule.findFirst({
|
||||
where: {
|
||||
routeId: route.id,
|
||||
@@ -106,39 +104,46 @@ export class FareEngineService {
|
||||
});
|
||||
|
||||
if (segmentOverride) {
|
||||
// Flat override for this exact segment — baseFareMinor is the total base, not a per-km rate
|
||||
baseFarePerPassengerMinor = segmentOverride.baseFareMinor;
|
||||
ratePerKmMinor = totalDistanceKm > 0 ? Math.round(baseFarePerPassengerMinor / totalDistanceKm) : 0;
|
||||
fareSource = 'SEGMENT_FARE_RULE';
|
||||
} else if (fareRule?.tripId) {
|
||||
// Schedule-scoped flat override
|
||||
baseFarePerPassengerMinor = fareRule.baseFareMinor;
|
||||
ratePerKmMinor = totalDistanceKm > 0 ? Math.round(baseFarePerPassengerMinor / totalDistanceKm) : 0;
|
||||
fareSource = 'SCHEDULE_FARE_RULE';
|
||||
} else {
|
||||
// Default: distance-based using tariff formula: km × rate × 1.02
|
||||
// baseFareMinor stores the per-km rate (tariff decimal × 100000)
|
||||
// Distance-based formula:
|
||||
// baseFare (minor) = distanceKm × (baseFareMinor / 100) × insuranceFactor × usdToEtbRate
|
||||
// baseFareMinor stored as integer (e.g. 300 = 3.00 ETB/km), divided by 100 to get ETB/km.
|
||||
// insuranceFeeMinor stored as integer (e.g. 102 = 1.02 multiplier), divided by 100; defaults to 1 if unset.
|
||||
// usdToEtbRate fetched live from CurrencyExchangeRate table.
|
||||
// Insurance is already baked into baseFarePerPassengerMinor — do NOT add it again as a flat fee.
|
||||
const ratePerKmEtb = nationalitySeatClass.baseFareMinor / 100;
|
||||
insuranceFactor = nationalitySeatClass.insuranceFeeMinor > 0
|
||||
? nationalitySeatClass.insuranceFeeMinor / 100
|
||||
: 1;
|
||||
usdToEtbRate = await this.currencyService.getExchangeRate(Currency.USD, Currency.ETB);
|
||||
ratePerKmMinor = nationalitySeatClass.baseFareMinor;
|
||||
baseFarePerPassengerMinor = Math.round(ratePerKmMinor * totalDistanceKm * 1.02);
|
||||
baseFarePerPassengerMinor = Math.round(
|
||||
totalDistanceKm * ratePerKmEtb * insuranceFactor * usdToEtbRate,
|
||||
);
|
||||
fareSource = 'SEAT_CLASS_BASE_FARE';
|
||||
insuranceAlreadyInBase = true;
|
||||
}
|
||||
|
||||
// Premium and insurance fees applied per passenger
|
||||
const premiumPerPassenger = seatClass.premiumMinor ?? 0;
|
||||
const insurancePerPassenger = seatClass.insuranceFeeMinor ?? 0;
|
||||
const farePerPassengerMinor = baseFarePerPassengerMinor + premiumPerPassenger + insurancePerPassenger;
|
||||
const premiumPerPassenger = seatClass.premiumMinor ?? 0;
|
||||
const insurancePerPassenger = insuranceAlreadyInBase ? 0 : (seatClass.insuranceFeeMinor ?? 0);
|
||||
const farePerPassengerMinor = baseFarePerPassengerMinor + premiumPerPassenger + insurancePerPassenger;
|
||||
|
||||
const adultCount = dto.adultCount ?? 1;
|
||||
const childCount = dto.childCount ?? 0;
|
||||
const freeChildrenCount = Math.min(childCount, adultCount);
|
||||
const paidChildrenCount = Math.max(0, childCount - freeChildrenCount);
|
||||
|
||||
// Subtotal includes: (distance-based fare + premium + insurance) × passengers
|
||||
// First child is free, but pays premium and insurance
|
||||
const adultSubtotal = farePerPassengerMinor * adultCount;
|
||||
const adultSubtotal = farePerPassengerMinor * adultCount;
|
||||
const freeChildSubtotal = (premiumPerPassenger + insurancePerPassenger) * freeChildrenCount;
|
||||
const paidChildSubtotal = farePerPassengerMinor * paidChildrenCount;
|
||||
const subtotalMinor = adultSubtotal + freeChildSubtotal + paidChildSubtotal;
|
||||
const subtotalMinor = adultSubtotal + freeChildSubtotal + paidChildSubtotal;
|
||||
|
||||
let discountMinor = 0;
|
||||
let promoLabel = 'none';
|
||||
@@ -152,8 +157,7 @@ export class FareEngineService {
|
||||
}
|
||||
}
|
||||
|
||||
const afterDiscountMinor = subtotalMinor - discountMinor;
|
||||
const totalEtbMinor = afterDiscountMinor;
|
||||
const totalEtbMinor = subtotalMinor - discountMinor;
|
||||
|
||||
const billingCurrency = resolveCurrencyFromNationality(dto.nationality);
|
||||
const exchangeRate = await this.currencyService.getExchangeRate(Currency.ETB, billingCurrency);
|
||||
@@ -162,8 +166,10 @@ export class FareEngineService {
|
||||
const calculation = [
|
||||
`Distance: ${totalDistanceKm} km (${originStation?.name} → ${destStation?.name})`,
|
||||
`Nationality: ${dto.nationality ?? 'unspecified'} → ${nationalityType} → ${nationalitySeatClass.name}`,
|
||||
`Rate per km: ${ratePerKmMinor} ETB minor (${nationalitySeatClass.name})`,
|
||||
`Base fare/pax: ${totalDistanceKm} km × ${ratePerKmMinor} × 1.02 = ${baseFarePerPassengerMinor} ETB minor`,
|
||||
`Rate per km: ${nationalitySeatClass.baseFareMinor} minor → ${nationalitySeatClass.baseFareMinor / 100} ETB/km`,
|
||||
`Insurance: ${nationalitySeatClass.insuranceFeeMinor} minor → factor ${insuranceFactor}${insuranceAlreadyInBase ? ' (baked into base fare)' : ''}`,
|
||||
`USD→ETB rate: ${usdToEtbRate}`,
|
||||
`Base fare/pax: ${totalDistanceKm} km × (${nationalitySeatClass.baseFareMinor} / 100) × ${insuranceFactor} × ${usdToEtbRate} = ${baseFarePerPassengerMinor} ETB minor`,
|
||||
`Premium/pax: ${premiumPerPassenger} ETB minor`,
|
||||
`Insurance/pax: ${insurancePerPassenger} ETB minor`,
|
||||
`Total fare/pax: ${farePerPassengerMinor} ETB minor`,
|
||||
@@ -191,6 +197,8 @@ export class FareEngineService {
|
||||
seatClassName: nationalitySeatClass.name,
|
||||
totalDistanceKm,
|
||||
ratePerKmMinor,
|
||||
insuranceFactor,
|
||||
usdToEtbRate,
|
||||
baseFarePerPassengerMinor,
|
||||
premiumPerPassenger,
|
||||
insurancePerPassenger,
|
||||
@@ -323,19 +331,16 @@ export class FareEngineService {
|
||||
if (fareRules.length > 0) {
|
||||
const billingCurrency = resolveCurrencyFromNationality(nationality);
|
||||
const exchangeRate = await this.currencyService.getExchangeRate(Currency.ETB, billingCurrency);
|
||||
return fareRules.map(rule => {
|
||||
const seatClassId = rule.seatClassId;
|
||||
return {
|
||||
seatClassId,
|
||||
seatClassName: 'Unknown',
|
||||
baseFareMinor: rule.baseFareMinor,
|
||||
totalMinor: rule.baseFareMinor,
|
||||
billingCurrency,
|
||||
totalInBillingCurrency: Math.round(rule.baseFareMinor * exchangeRate),
|
||||
exchangeRate,
|
||||
source: 'FARE_RULE',
|
||||
};
|
||||
});
|
||||
return fareRules.map(rule => ({
|
||||
seatClassId: rule.seatClassId,
|
||||
seatClassName: 'Unknown',
|
||||
baseFareMinor: rule.baseFareMinor,
|
||||
totalMinor: rule.baseFareMinor,
|
||||
billingCurrency,
|
||||
totalInBillingCurrency: Math.round(rule.baseFareMinor * exchangeRate),
|
||||
exchangeRate,
|
||||
source: 'FARE_RULE',
|
||||
}));
|
||||
}
|
||||
|
||||
throw new BadRequestException(
|
||||
|
||||
@@ -72,9 +72,8 @@ describe('TicketsService - Offline Validation', () => {
|
||||
|
||||
const result = await service.validateOfflineBatch(validations);
|
||||
|
||||
expect(result.success).toBe(1);
|
||||
expect(result.successful).toBe(1);
|
||||
expect(result.failed).toBe(0);
|
||||
expect(result.duplicate).toBe(0);
|
||||
});
|
||||
|
||||
it('should detect duplicate validations', async () => {
|
||||
@@ -98,8 +97,8 @@ describe('TicketsService - Offline Validation', () => {
|
||||
|
||||
const result = await service.validateOfflineBatch(validations);
|
||||
|
||||
expect(result.success).toBe(1);
|
||||
expect(result.duplicate).toBe(1);
|
||||
expect(result.successful).toBe(1);
|
||||
expect(result.failed).toBe(1);
|
||||
});
|
||||
|
||||
it('should handle already validated tickets', async () => {
|
||||
@@ -119,8 +118,8 @@ describe('TicketsService - Offline Validation', () => {
|
||||
|
||||
const result = await service.validateOfflineBatch(validations);
|
||||
|
||||
expect(result.duplicate).toBe(1);
|
||||
expect(result.success).toBe(0);
|
||||
expect(result.successful).toBe(0);
|
||||
expect(result.failed).toBe(1);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -42,7 +42,7 @@ export default function SupportPage() {
|
||||
const { data, isLoading } = useConversations(
|
||||
status === 'ALL' ? { search } : { status, search },
|
||||
);
|
||||
const items = data?.items ?? [];
|
||||
const items = useMemo(() => data?.items ?? [], [data?.items]);
|
||||
|
||||
useSupportSocket(true);
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -37,7 +37,9 @@ const searchSchema = z
|
||||
returnDate: z.string().optional(),
|
||||
adultCount: z.number().min(1).max(9),
|
||||
childCount: z.number().min(0).max(9),
|
||||
nationality: z.enum(["ETHIOPIAN", "DJIBOUTIAN", "OTHER"]),
|
||||
nationality: z.enum(["ETHIOPIAN", "DJIBOUTIAN", "OTHER"], {
|
||||
errorMap: () => ({ message: "Please select your nationality" }),
|
||||
}),
|
||||
promoCode: z.string().optional(),
|
||||
})
|
||||
.refine(
|
||||
@@ -226,6 +228,7 @@ function PassengerModal({
|
||||
onChangeChild,
|
||||
onChangeNationality,
|
||||
onClose,
|
||||
nationalityError,
|
||||
}: {
|
||||
adultCount: number;
|
||||
childCount: number;
|
||||
@@ -234,6 +237,7 @@ function PassengerModal({
|
||||
onChangeChild: (n: number) => void;
|
||||
onChangeNationality: (v: string) => void;
|
||||
onClose: () => void;
|
||||
nationalityError?: string;
|
||||
}) {
|
||||
const rows = [
|
||||
{
|
||||
@@ -323,10 +327,13 @@ function PassengerModal({
|
||||
</div>
|
||||
))}
|
||||
<div className="border-t border-gray-100 dark:border-gray-800 -mx-5 pt-5 px-5">
|
||||
<p className="text-sm font-semibold text-gray-900 dark:text-white mb-3">
|
||||
<p className="text-sm font-semibold text-gray-900 dark:text-white mb-1">
|
||||
Nationality
|
||||
</p>
|
||||
<div className="grid grid-cols-3 gap-2">
|
||||
{nationalityError && (
|
||||
<p className="text-xs text-red-500 mb-2">{nationalityError}</p>
|
||||
)}
|
||||
<div className={`grid grid-cols-3 gap-2 ${nationalityError ? "mt-1" : "mt-2"}`}>
|
||||
{natOptions.map((opt) => (
|
||||
<button
|
||||
key={opt.value}
|
||||
@@ -335,7 +342,9 @@ function PassengerModal({
|
||||
className={`py-2.5 px-2 rounded-xl border-2 text-xs font-semibold transition-all ${
|
||||
nationality === opt.value
|
||||
? "border-primary bg-primary/5 text-primary"
|
||||
: "border-gray-200 dark:border-gray-700 text-gray-600 dark:text-gray-400 hover:border-gray-300"
|
||||
: nationalityError
|
||||
? "border-red-300 dark:border-red-800 text-gray-600 dark:text-gray-400 hover:border-gray-300"
|
||||
: "border-gray-200 dark:border-gray-700 text-gray-600 dark:text-gray-400 hover:border-gray-300"
|
||||
}`}
|
||||
>
|
||||
{opt.label}
|
||||
@@ -586,7 +595,10 @@ export default function SearchPage() {
|
||||
tripType: "ONE_WAY",
|
||||
adultCount: 1,
|
||||
childCount: 0,
|
||||
nationality: "ETHIOPIAN",
|
||||
// No default nationality — the user must explicitly pick one. Left blank (not a valid
|
||||
// enum member) so the zod schema's errorMap flags it if they try to search without
|
||||
// selecting it.
|
||||
nationality: "" as any,
|
||||
departureDate: "",
|
||||
promoCode: "",
|
||||
},
|
||||
@@ -716,10 +728,34 @@ export default function SearchPage() {
|
||||
router.push(`/booking/results?${params}`);
|
||||
};
|
||||
|
||||
// Validate the rest of the form first — only once every other field is already valid do
|
||||
// we surface the nationality error (opening the modal directly rather than leaving an
|
||||
// inline error to hunt for). Otherwise nationality's error would show at the same time as
|
||||
// origin/destination/date errors, which is noisier than fixing things one step at a time.
|
||||
const onInvalid = (formErrors: typeof errors) => {
|
||||
setHasInteracted(true);
|
||||
const hasOtherErrors = Object.keys(formErrors).some((k) => k !== "nationality");
|
||||
if (formErrors.nationality && !hasOtherErrors) {
|
||||
setPassengerModalOpen(true);
|
||||
}
|
||||
};
|
||||
|
||||
const getStationById = (id: string) => stations.find((s) => s.id === id);
|
||||
const originStation = getStationById(originId);
|
||||
const destStation = getStationById(destId);
|
||||
|
||||
// Mirrors onInvalid's ordering: don't flag nationality (border/message/modal) while other
|
||||
// fields still have errors of their own to fix first.
|
||||
const showNationalityError =
|
||||
hasInteracted &&
|
||||
!!errors.nationality &&
|
||||
!Object.keys(errors).some((k) => k !== "nationality");
|
||||
|
||||
// No default nationality anymore — only render a flag once one is actually picked, rather
|
||||
// than falling through to the "Other" 🌍 flag and implying a selection that hasn't happened.
|
||||
const nationalityFlag = (nat?: string) =>
|
||||
nat === "ETHIOPIAN" ? "🇪🇹" : nat === "DJIBOUTIAN" ? "🇩🇯" : nat === "OTHER" ? "🌍" : null;
|
||||
|
||||
return (
|
||||
<div className="bg-gray-50 dark:bg-gray-950">
|
||||
{/* Passenger modal (mobile) */}
|
||||
@@ -730,8 +766,12 @@ export default function SearchPage() {
|
||||
nationality={watch("nationality")}
|
||||
onChangeAdult={(n) => setValue("adultCount", n)}
|
||||
onChangeChild={(n) => setValue("childCount", n)}
|
||||
onChangeNationality={(v) => setValue("nationality", v as any)}
|
||||
onChangeNationality={(v) => {
|
||||
setValue("nationality", v as any);
|
||||
clearErrors("nationality");
|
||||
}}
|
||||
onClose={() => setPassengerModalOpen(false)}
|
||||
nationalityError={showNationalityError ? errors.nationality?.message : undefined}
|
||||
/>
|
||||
)}
|
||||
|
||||
@@ -818,7 +858,7 @@ export default function SearchPage() {
|
||||
ref={widgetRef}
|
||||
>
|
||||
<div className="max-w-6xl mx-auto">
|
||||
<form onSubmit={handleSubmit(onSubmit)}>
|
||||
<form onSubmit={handleSubmit(onSubmit, onInvalid)}>
|
||||
<div className="bg-white dark:bg-gray-900 rounded-2xl shadow-2xl border border-white/20 overflow-visible">
|
||||
{error && (
|
||||
<div className="flex items-center gap-2 px-5 py-3 bg-red-50 text-red-600 text-sm border-b border-red-100 rounded-t-2xl">
|
||||
@@ -1002,19 +1042,22 @@ export default function SearchPage() {
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setPassengerModalOpen(true)}
|
||||
className="w-full flex items-center justify-between px-3.5 py-3 border-2 border-gray-200 rounded-xl bg-white"
|
||||
className={`w-full flex items-center justify-between px-3.5 py-3 border-2 rounded-xl bg-white ${
|
||||
showNationalityError ? "border-red-400" : "border-gray-200"
|
||||
}`}
|
||||
>
|
||||
<span className="flex items-center gap-2 text-sm font-medium text-gray-900">
|
||||
<Users className="w-4 h-4 text-primary" />
|
||||
{totalPassengers} Pax ·{" "}
|
||||
{watch("nationality") === "ETHIOPIAN"
|
||||
? "🇪🇹"
|
||||
: watch("nationality") === "DJIBOUTIAN"
|
||||
? "🇩🇯"
|
||||
: "🌍"}
|
||||
{totalPassengers} Pax
|
||||
{nationalityFlag(watch("nationality"))
|
||||
? ` · ${nationalityFlag(watch("nationality"))}`
|
||||
: " · Select nationality"}
|
||||
</span>
|
||||
<ChevronDown className="w-4 h-4 text-primary" />
|
||||
</button>
|
||||
{showNationalityError && (
|
||||
<p className="text-xs text-red-500">{errors.nationality?.message}</p>
|
||||
)}
|
||||
<button
|
||||
type="submit"
|
||||
disabled={isLoading}
|
||||
@@ -1141,19 +1184,22 @@ export default function SearchPage() {
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setPassengerModalOpen(true)}
|
||||
className="w-full flex items-center justify-between px-3 py-3.5 border-2 border-gray-200 rounded-xl bg-white hover:border-gray-300 transition-all"
|
||||
className={`w-full flex items-center justify-between px-3 py-3.5 border-2 rounded-xl bg-white hover:border-gray-300 transition-all ${
|
||||
showNationalityError ? "border-red-400" : "border-gray-200"
|
||||
}`}
|
||||
>
|
||||
<span className="flex items-center gap-1.5 text-sm font-medium text-gray-900 truncate">
|
||||
<Users className="w-4 h-4 text-primary flex-shrink-0" />
|
||||
{totalPassengers} Pax ·{" "}
|
||||
{watch("nationality") === "ETHIOPIAN"
|
||||
? "🇪🇹"
|
||||
: watch("nationality") === "DJIBOUTIAN"
|
||||
? "🇩🇯"
|
||||
: "🌍"}
|
||||
{totalPassengers} Pax
|
||||
{nationalityFlag(watch("nationality"))
|
||||
? ` · ${nationalityFlag(watch("nationality"))}`
|
||||
: " · Select nationality"}
|
||||
</span>
|
||||
<ChevronDown className="w-4 h-4 text-primary flex-shrink-0" />
|
||||
</button>
|
||||
{showNationalityError && (
|
||||
<p className="text-xs text-red-500">{errors.nationality?.message}</p>
|
||||
)}
|
||||
</div>
|
||||
{/* Search */}
|
||||
<button
|
||||
@@ -1395,19 +1441,24 @@ export default function SearchPage() {
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setPassengerModalOpen(true)}
|
||||
className="w-full flex items-center justify-between px-3 py-3.5 border-2 border-gray-200 dark:border-gray-700 rounded-xl bg-white dark:bg-gray-800 hover:border-gray-300 dark:hover:border-gray-600 transition-all"
|
||||
className={`w-full flex items-center justify-between px-3 py-3.5 border-2 rounded-xl bg-white dark:bg-gray-800 hover:border-gray-300 dark:hover:border-gray-600 transition-all ${
|
||||
showNationalityError
|
||||
? "border-red-400"
|
||||
: "border-gray-200 dark:border-gray-700"
|
||||
}`}
|
||||
>
|
||||
<span className="flex items-center gap-1.5 text-sm font-medium text-gray-900 dark:text-white truncate">
|
||||
<Users className="w-4 h-4 text-primary flex-shrink-0" />
|
||||
{totalPassengers} Pax ·{" "}
|
||||
{watch("nationality") === "ETHIOPIAN"
|
||||
? "🇪🇹"
|
||||
: watch("nationality") === "DJIBOUTIAN"
|
||||
? "🇩🇯"
|
||||
: "🌍"}
|
||||
{totalPassengers} Pax
|
||||
{nationalityFlag(watch("nationality"))
|
||||
? ` · ${nationalityFlag(watch("nationality"))}`
|
||||
: " · Select nationality"}
|
||||
</span>
|
||||
<ChevronDown className="w-4 h-4 text-primary flex-shrink-0" />
|
||||
</button>
|
||||
{showNationalityError && (
|
||||
<p className="text-xs text-red-500">{errors.nationality?.message}</p>
|
||||
)}
|
||||
</div>
|
||||
{/* Search Button */}
|
||||
<div className="flex-shrink-0 space-y-1">
|
||||
|
||||
Reference in New Issue
Block a user