Hamza/tripz-llc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: rebuild pricing on Siro's live kazan table + close two fare leaks

Browse Source 
## الأرقام صارت من جدول `kazan` الحيّ لا من تقدير
العمولة 11٪/12٪/14٪ مطابقة حرفياً. وثلاثة تصحيحات على الخام:
- **محورا الأردن مقلوبان**: أعمدة الفئات تحمل سعر الدقيقة (0.043) وأعمدة
  النوافذ سعر الكيلومتر (0.184) — عكس مصر وسوريا. قراءتها كما هي تجعل
  رحلة 27 كم بأقلّ من دينارين.
- **نِسَب الفئات في مصر وسوريا معطوبة**: الكهربائي 0.23 والفان 0.25–0.40 من
  الاقتصادي، أي فان أرخص من اقتصادي. نِسَب الأردن وحدها متماسكة فاعتُمدت.
- سعر الكيلو في مصر 4 جنيهات لا 3.5 (قرار المالك).

## البنية صارت مطابقة لسيرو — وهي ما سيكتب فيه بوت استخبارات الأسعار
سعر الكيلو يتغيّر بالفئة فقط (رقم يعرفه السوق)، وسعر الدقيقة بالنافذة فقط.
**لا فتحة عدّاد** (`startPrice = 0` في كل صفوف سيرو): الحدّ الأدنى أرضية لا
رسم يُضاف — «ما في رحلة أقل من 20 جنيهاً». `fuelPrice` محفوظ كمدخل للبوت.

## تسريبان أغلقهما الاختبار الحيّ (بموافقة المالك)
1. **فئة مجهولة = رحلة مجانية**: `service_class` يأتي من الطلب بلا تحقّق،
   والاستثناء كان يُبتلع فتُنشأ رحلة بـ`quoted_fare = null` ثم تُسوّى بصفر.
   صار الطلب يُرفض بـ400 — الفشل الصريح أأمن من الصامت.
2. **`fixed` لا تُزرع**: سعر ثابت بلا جدول خطوط يعني رقماً واحداً لكل
   الوجهات — أظهر الاختبار رحلة 55.8 كم بـ2.5 ديناراً مقابل 23.2 للاقتصادي.

300 اختبار خضر.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hamza-Ayed
2026-07-19 01:38:20 +03:00
co-authored by Claude Opus 4.8
parent f58f2e2e2c
commit e9beeb90b4
9 changed files with 250 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/common/seed/seed.service.ts
+2 -2
View File
@@ -5,7 +5,7 @@ import { RideTypesService } from '../../modules/ride-types/ride-types.service';
import { import {
buildDefinition, buildDefinition,
countryTariff, countryTariff,
SERVICE_CLASSES, SEEDED_CLASSES,
} from '../../modules/tariff/default-tariffs'; } from '../../modules/tariff/default-tariffs';
/** /**
@@ -54,7 +54,7 @@ export class SeedService implements OnModuleInit {
const country = countryTariff(tenant.countryPack); const country = countryTariff(tenant.countryPack);
let created = 0; let created = 0;
let skipped = 0; let skipped = 0;
for (const serviceClass of Object.values(SERVICE_CLASSES)) { for (const serviceClass of SEEDED_CLASSES) {
const existing = await this.tariff.getActive(tenant.id, 'default', serviceClass); const existing = await this.tariff.getActive(tenant.id, 'default', serviceClass);
if (existing) { if (existing) {
skipped++; skipped++;
backend/src/database/seeds/generate-tariff-sql.ts
+2 -2
View File
@@ -3,7 +3,7 @@ import { join } from 'path';
import { import {
buildDefinition, buildDefinition,
COUNTRY_TARIFFS, COUNTRY_TARIFFS,
SERVICE_CLASSES, SEEDED_CLASSES,
} from '../../modules/tariff/default-tariffs'; } from '../../modules/tariff/default-tariffs';
/** /**
@@ -30,7 +30,7 @@ function generateSql(): string {
for (const country of COUNTRY_TARIFFS) { for (const country of COUNTRY_TARIFFS) {
sql += `-- ============ ${country.countryPack.toUpperCase()} (${country.currency}) ============\n`; sql += `-- ============ ${country.countryPack.toUpperCase()} (${country.currency}) ============\n`;
for (const serviceClass of Object.values(SERVICE_CLASSES)) { for (const serviceClass of SEEDED_CLASSES) {
const definition = buildDefinition(country, serviceClass); const definition = buildDefinition(country, serviceClass);
const defJson = JSON.stringify(definition).replace(/'/g, "''"); const defJson = JSON.stringify(definition).replace(/'/g, "''");
backend/src/database/seeds/tariffs.sql
+24 -60
View File
@@ -15,7 +15,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'economy',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'economy'), 0) + 1, AND x.service_class = 'economy'), 0) + 1,
true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0.488,"per_km":0.35,"per_min":0.075,"per_min_waiting":0.6},{"name":"normal_day","from":"09:30","to":"16:00","flag":0.39,"per_km":0.28,"per_min":0.06,"per_min_waiting":0.48},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0.488,"per_km":0.35,"per_min":0.075,"per_min_waiting":0.6},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0.39,"per_km":0.28,"per_min":0.06,"per_min_waiting":0.48},{"name":"late_night","from":"23:00","to":"07:00","flag":0.448,"per_km":0.322,"per_min":0.069,"per_min_waiting":0.552}],"booking_fee":0.25,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":0.184,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":0.184,"per_min":0.043,"per_min_waiting":0.065},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":0.184,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":0.184,"per_min":0.043,"per_min_waiting":0.065},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":0.184,"per_min":0.043,"per_min_waiting":0.065}],"booking_fee":0,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'jo'; FROM tripz_tenants t WHERE t.country_pack = 'jo';
-- comfort -- comfort
@@ -27,7 +27,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'comfort',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'comfort'), 0) + 1, AND x.service_class = 'comfort'), 0) + 1,
true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0.609,"per_km":0.438,"per_min":0.094,"per_min_waiting":0.6},{"name":"normal_day","from":"09:30","to":"16:00","flag":0.488,"per_km":0.35,"per_min":0.075,"per_min_waiting":0.48},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0.609,"per_km":0.438,"per_min":0.094,"per_min_waiting":0.6},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0.488,"per_km":0.35,"per_min":0.075,"per_min_waiting":0.48},{"name":"late_night","from":"23:00","to":"07:00","flag":0.561,"per_km":0.403,"per_min":0.086,"per_min_waiting":0.552}],"booking_fee":0.25,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":0.239,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":0.239,"per_min":0.043,"per_min_waiting":0.065},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":0.239,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":0.239,"per_min":0.043,"per_min_waiting":0.065},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":0.239,"per_min":0.043,"per_min_waiting":0.065}],"booking_fee":0,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'jo'; FROM tripz_tenants t WHERE t.country_pack = 'jo';
-- lady -- lady
@@ -39,7 +39,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'lady',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'lady'), 0) + 1, AND x.service_class = 'lady'), 0) + 1,
true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0.536,"per_km":0.385,"per_min":0.083,"per_min_waiting":0.6},{"name":"normal_day","from":"09:30","to":"16:00","flag":0.429,"per_km":0.308,"per_min":0.066,"per_min_waiting":0.48},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0.536,"per_km":0.385,"per_min":0.083,"per_min_waiting":0.6},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0.429,"per_km":0.308,"per_min":0.066,"per_min_waiting":0.48},{"name":"late_night","from":"23:00","to":"07:00","flag":0.493,"per_km":0.354,"per_min":0.076,"per_min_waiting":0.552}],"booking_fee":0.25,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":0.201,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":0.201,"per_min":0.043,"per_min_waiting":0.065},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":0.201,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":0.201,"per_min":0.043,"per_min_waiting":0.065},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":0.201,"per_min":0.043,"per_min_waiting":0.065}],"booking_fee":0,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'jo'; FROM tripz_tenants t WHERE t.country_pack = 'jo';
-- electric -- electric
@@ -51,7 +51,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'electric',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'electric'), 0) + 1, AND x.service_class = 'electric'), 0) + 1,
true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0.512,"per_km":0.368,"per_min":0.079,"per_min_waiting":0.6},{"name":"normal_day","from":"09:30","to":"16:00","flag":0.41,"per_km":0.294,"per_min":0.063,"per_min_waiting":0.48},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0.512,"per_km":0.368,"per_min":0.079,"per_min_waiting":0.6},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0.41,"per_km":0.294,"per_min":0.063,"per_min_waiting":0.48},{"name":"late_night","from":"23:00","to":"07:00","flag":0.471,"per_km":0.338,"per_min":0.072,"per_min_waiting":0.552}],"booking_fee":0.25,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":0.223,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":0.223,"per_min":0.043,"per_min_waiting":0.065},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":0.223,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":0.223,"per_min":0.043,"per_min_waiting":0.065},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":0.223,"per_min":0.043,"per_min_waiting":0.065}],"booking_fee":0,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'jo'; FROM tripz_tenants t WHERE t.country_pack = 'jo';
-- van -- van
@@ -63,7 +63,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'van',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'van'), 0) + 1, AND x.service_class = 'van'), 0) + 1,
true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0.707,"per_km":0.508,"per_min":0.109,"per_min_waiting":0.6},{"name":"normal_day","from":"09:30","to":"16:00","flag":0.566,"per_km":0.406,"per_min":0.087,"per_min_waiting":0.48},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0.707,"per_km":0.508,"per_min":0.109,"per_min_waiting":0.6},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0.566,"per_km":0.406,"per_min":0.087,"per_min_waiting":0.48},{"name":"late_night","from":"23:00","to":"07:00","flag":0.65,"per_km":0.467,"per_min":0.1,"per_min_waiting":0.552}],"booking_fee":0.25,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":0.278,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":0.278,"per_min":0.043,"per_min_waiting":0.065},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":0.278,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":0.278,"per_min":0.043,"per_min_waiting":0.065},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":0.278,"per_min":0.043,"per_min_waiting":0.065}],"booking_fee":0,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'jo'; FROM tripz_tenants t WHERE t.country_pack = 'jo';
-- delivery -- delivery
@@ -75,7 +75,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'delivery',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'delivery'), 0) + 1, AND x.service_class = 'delivery'), 0) + 1,
true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0.439,"per_km":0.315,"per_min":0.068,"per_min_waiting":0.6},{"name":"normal_day","from":"09:30","to":"16:00","flag":0.351,"per_km":0.252,"per_min":0.054,"per_min_waiting":0.48},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0.439,"per_km":0.315,"per_min":0.068,"per_min_waiting":0.6},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0.351,"per_km":0.252,"per_min":0.054,"per_min_waiting":0.48},{"name":"late_night","from":"23:00","to":"07:00","flag":0.404,"per_km":0.29,"per_min":0.062,"per_min_waiting":0.552}],"booking_fee":0.25,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":0.167,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":0.167,"per_min":0.043,"per_min_waiting":0.065},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":0.167,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":0.167,"per_min":0.043,"per_min_waiting":0.065},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":0.167,"per_min":0.043,"per_min_waiting":0.065}],"booking_fee":0,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'jo'; FROM tripz_tenants t WHERE t.country_pack = 'jo';
-- vip -- vip
@@ -87,19 +87,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'vip',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'vip'), 0) + 1, AND x.service_class = 'vip'), 0) + 1,
true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0.853,"per_km":0.613,"per_min":0.131,"per_min_waiting":0.6},{"name":"normal_day","from":"09:30","to":"16:00","flag":0.682,"per_km":0.49,"per_min":0.105,"per_min_waiting":0.48},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0.853,"per_km":0.613,"per_min":0.131,"per_min_waiting":0.6},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0.682,"per_km":0.49,"per_min":0.105,"per_min_waiting":0.48},{"name":"late_night","from":"23:00","to":"07:00","flag":0.785,"per_km":0.564,"per_min":0.121,"per_min_waiting":0.552}],"booking_fee":0.25,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":0.258,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":0.258,"per_min":0.043,"per_min_waiting":0.065},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":0.258,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":0.258,"per_min":0.043,"per_min_waiting":0.065},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":0.258,"per_min":0.043,"per_min_waiting":0.065}],"booking_fee":0,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'jo';
-- fixed
UPDATE tripz_tariffs SET active = false
WHERE city = 'default' AND service_class = 'fixed' AND active = true
AND tenant_id IN (SELECT id FROM tripz_tenants WHERE country_pack = 'jo');
INSERT INTO tripz_tariffs (id, tenant_id, city, service_class, version, active, definition)
SELECT uuid_generate_v4(), t.id, 'default', 'fixed',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'fixed'), 0) + 1,
true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"fixed_quote","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0.488,"per_km":0.35,"per_min":0.075,"per_min_waiting":0.6},{"name":"normal_day","from":"09:30","to":"16:00","flag":0.39,"per_km":0.28,"per_min":0.06,"per_min_waiting":0.48},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0.488,"per_km":0.35,"per_min":0.075,"per_min_waiting":0.6},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0.39,"per_km":0.28,"per_min":0.06,"per_min_waiting":0.48},{"name":"late_night","from":"23:00","to":"07:00","flag":0.448,"per_km":0.322,"per_min":0.069,"per_min_waiting":0.552}],"booking_fee":0,"min_fare":0,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14},"fixed_fare":2.5}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'jo'; FROM tripz_tenants t WHERE t.country_pack = 'jo';
-- saver -- saver
@@ -111,7 +99,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'saver',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'saver'), 0) + 1, AND x.service_class = 'saver'), 0) + 1,
true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0.414,"per_km":0.298,"per_min":0.064,"per_min_waiting":0.6},{"name":"normal_day","from":"09:30","to":"16:00","flag":0.332,"per_km":0.238,"per_min":0.051,"per_min_waiting":0.48},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0.414,"per_km":0.298,"per_min":0.064,"per_min_waiting":0.6},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0.332,"per_km":0.238,"per_min":0.051,"per_min_waiting":0.48},{"name":"late_night","from":"23:00","to":"07:00","flag":0.381,"per_km":0.274,"per_min":0.059,"per_min_waiting":0.552}],"booking_fee":0.25,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb true, '{"currency":"JOD","timezone":"Asia/Amman","mode":"time_and_distance","rounding":{"increment":0.05,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":0.158,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":0.158,"per_min":0.043,"per_min_waiting":0.065},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":0.158,"per_min":0.05,"per_min_waiting":0.074},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":0.158,"per_min":0.043,"per_min_waiting":0.065},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":0.158,"per_min":0.043,"per_min_waiting":0.065}],"booking_fee":0,"min_fare":1.1,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":14}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'jo'; FROM tripz_tenants t WHERE t.country_pack = 'jo';
-- ============ EG (EGP) ============ -- ============ EG (EGP) ============
@@ -124,7 +112,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'economy',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'economy'), 0) + 1, AND x.service_class = 'economy'), 0) + 1,
true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":8.86,"per_km":6.36,"per_min":1.36,"per_min_waiting":10.91},{"name":"normal_day","from":"09:30","to":"16:00","flag":7.09,"per_km":5.09,"per_min":1.09,"per_min_waiting":8.73},{"name":"evening_peak","from":"16:00","to":"19:30","flag":8.86,"per_km":6.36,"per_min":1.36,"per_min_waiting":10.91},{"name":"normal_evening","from":"19:30","to":"23:00","flag":7.09,"per_km":5.09,"per_min":1.09,"per_min_waiting":8.73},{"name":"late_night","from":"23:00","to":"07:00","flag":8.15,"per_km":5.85,"per_min":1.25,"per_min_waiting":10.04}],"booking_fee":4.55,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":4,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":4,"per_min":0.8,"per_min_waiting":1.2},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":4,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":4,"per_min":0.8,"per_min_waiting":1.2},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":4,"per_min":1.5,"per_min_waiting":2.25}],"booking_fee":0,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'eg'; FROM tripz_tenants t WHERE t.country_pack = 'eg';
-- comfort -- comfort
@@ -136,7 +124,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'comfort',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'comfort'), 0) + 1, AND x.service_class = 'comfort'), 0) + 1,
true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":11.08,"per_km":7.95,"per_min":1.7,"per_min_waiting":10.91},{"name":"normal_day","from":"09:30","to":"16:00","flag":8.86,"per_km":6.36,"per_min":1.36,"per_min_waiting":8.73},{"name":"evening_peak","from":"16:00","to":"19:30","flag":11.08,"per_km":7.95,"per_min":1.7,"per_min_waiting":10.91},{"name":"normal_evening","from":"19:30","to":"23:00","flag":8.86,"per_km":6.36,"per_min":1.36,"per_min_waiting":8.73},{"name":"late_night","from":"23:00","to":"07:00","flag":10.19,"per_km":7.32,"per_min":1.57,"per_min_waiting":10.04}],"booking_fee":4.55,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":5.2,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":5.2,"per_min":0.8,"per_min_waiting":1.2},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":5.2,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":5.2,"per_min":0.8,"per_min_waiting":1.2},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":5.2,"per_min":1.5,"per_min_waiting":2.25}],"booking_fee":0,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'eg'; FROM tripz_tenants t WHERE t.country_pack = 'eg';
-- lady -- lady
@@ -148,7 +136,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'lady',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'lady'), 0) + 1, AND x.service_class = 'lady'), 0) + 1,
true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":9.75,"per_km":7,"per_min":1.5,"per_min_waiting":10.91},{"name":"normal_day","from":"09:30","to":"16:00","flag":7.8,"per_km":5.6,"per_min":1.2,"per_min_waiting":8.73},{"name":"evening_peak","from":"16:00","to":"19:30","flag":9.75,"per_km":7,"per_min":1.5,"per_min_waiting":10.91},{"name":"normal_evening","from":"19:30","to":"23:00","flag":7.8,"per_km":5.6,"per_min":1.2,"per_min_waiting":8.73},{"name":"late_night","from":"23:00","to":"07:00","flag":8.97,"per_km":6.44,"per_min":1.38,"per_min_waiting":10.04}],"booking_fee":4.55,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":4.36,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":4.36,"per_min":0.8,"per_min_waiting":1.2},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":4.36,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":4.36,"per_min":0.8,"per_min_waiting":1.2},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":4.36,"per_min":1.5,"per_min_waiting":2.25}],"booking_fee":0,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'eg'; FROM tripz_tenants t WHERE t.country_pack = 'eg';
-- electric -- electric
@@ -160,7 +148,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'electric',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'electric'), 0) + 1, AND x.service_class = 'electric'), 0) + 1,
true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":9.31,"per_km":6.68,"per_min":1.43,"per_min_waiting":10.91},{"name":"normal_day","from":"09:30","to":"16:00","flag":7.45,"per_km":5.35,"per_min":1.15,"per_min_waiting":8.73},{"name":"evening_peak","from":"16:00","to":"19:30","flag":9.31,"per_km":6.68,"per_min":1.43,"per_min_waiting":10.91},{"name":"normal_evening","from":"19:30","to":"23:00","flag":7.45,"per_km":5.35,"per_min":1.15,"per_min_waiting":8.73},{"name":"late_night","from":"23:00","to":"07:00","flag":8.56,"per_km":6.15,"per_min":1.32,"per_min_waiting":10.04}],"booking_fee":4.55,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":4.84,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":4.84,"per_min":0.8,"per_min_waiting":1.2},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":4.84,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":4.84,"per_min":0.8,"per_min_waiting":1.2},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":4.84,"per_min":1.5,"per_min_waiting":2.25}],"booking_fee":0,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'eg'; FROM tripz_tenants t WHERE t.country_pack = 'eg';
-- van -- van
@@ -172,7 +160,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'van',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'van'), 0) + 1, AND x.service_class = 'van'), 0) + 1,
true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":12.85,"per_km":9.23,"per_min":1.98,"per_min_waiting":10.91},{"name":"normal_day","from":"09:30","to":"16:00","flag":10.28,"per_km":7.38,"per_min":1.58,"per_min_waiting":8.73},{"name":"evening_peak","from":"16:00","to":"19:30","flag":12.85,"per_km":9.23,"per_min":1.98,"per_min_waiting":10.91},{"name":"normal_evening","from":"19:30","to":"23:00","flag":10.28,"per_km":7.38,"per_min":1.58,"per_min_waiting":8.73},{"name":"late_night","from":"23:00","to":"07:00","flag":11.82,"per_km":8.49,"per_min":1.82,"per_min_waiting":10.04}],"booking_fee":4.55,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":6.04,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":6.04,"per_min":0.8,"per_min_waiting":1.2},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":6.04,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":6.04,"per_min":0.8,"per_min_waiting":1.2},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":6.04,"per_min":1.5,"per_min_waiting":2.25}],"booking_fee":0,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'eg'; FROM tripz_tenants t WHERE t.country_pack = 'eg';
-- delivery -- delivery
@@ -184,7 +172,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'delivery',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'delivery'), 0) + 1, AND x.service_class = 'delivery'), 0) + 1,
true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":7.98,"per_km":5.73,"per_min":1.23,"per_min_waiting":10.91},{"name":"normal_day","from":"09:30","to":"16:00","flag":6.38,"per_km":4.58,"per_min":0.98,"per_min_waiting":8.73},{"name":"evening_peak","from":"16:00","to":"19:30","flag":7.98,"per_km":5.73,"per_min":1.23,"per_min_waiting":10.91},{"name":"normal_evening","from":"19:30","to":"23:00","flag":6.38,"per_km":4.58,"per_min":0.98,"per_min_waiting":8.73},{"name":"late_night","from":"23:00","to":"07:00","flag":7.34,"per_km":5.27,"per_min":1.13,"per_min_waiting":10.04}],"booking_fee":4.55,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":3.64,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":3.64,"per_min":0.8,"per_min_waiting":1.2},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":3.64,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":3.64,"per_min":0.8,"per_min_waiting":1.2},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":3.64,"per_min":1.5,"per_min_waiting":2.25}],"booking_fee":0,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'eg'; FROM tripz_tenants t WHERE t.country_pack = 'eg';
-- vip -- vip
@@ -196,19 +184,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'vip',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'vip'), 0) + 1, AND x.service_class = 'vip'), 0) + 1,
true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":15.51,"per_km":11.14,"per_min":2.39,"per_min_waiting":10.91},{"name":"normal_day","from":"09:30","to":"16:00","flag":12.41,"per_km":8.91,"per_min":1.91,"per_min_waiting":8.73},{"name":"evening_peak","from":"16:00","to":"19:30","flag":15.51,"per_km":11.14,"per_min":2.39,"per_min_waiting":10.91},{"name":"normal_evening","from":"19:30","to":"23:00","flag":12.41,"per_km":8.91,"per_min":1.91,"per_min_waiting":8.73},{"name":"late_night","from":"23:00","to":"07:00","flag":14.27,"per_km":10.25,"per_min":2.2,"per_min_waiting":10.04}],"booking_fee":4.55,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":5.6,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":5.6,"per_min":0.8,"per_min_waiting":1.2},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":5.6,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":5.6,"per_min":0.8,"per_min_waiting":1.2},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":5.6,"per_min":1.5,"per_min_waiting":2.25}],"booking_fee":0,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'eg';
-- fixed
UPDATE tripz_tariffs SET active = false
WHERE city = 'default' AND service_class = 'fixed' AND active = true
AND tenant_id IN (SELECT id FROM tripz_tenants WHERE country_pack = 'eg');
INSERT INTO tripz_tariffs (id, tenant_id, city, service_class, version, active, definition)
SELECT uuid_generate_v4(), t.id, 'default', 'fixed',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'fixed'), 0) + 1,
true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"fixed_quote","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":8.86,"per_km":6.36,"per_min":1.36,"per_min_waiting":10.91},{"name":"normal_day","from":"09:30","to":"16:00","flag":7.09,"per_km":5.09,"per_min":1.09,"per_min_waiting":8.73},{"name":"evening_peak","from":"16:00","to":"19:30","flag":8.86,"per_km":6.36,"per_min":1.36,"per_min_waiting":10.91},{"name":"normal_evening","from":"19:30","to":"23:00","flag":7.09,"per_km":5.09,"per_min":1.09,"per_min_waiting":8.73},{"name":"late_night","from":"23:00","to":"07:00","flag":8.15,"per_km":5.85,"per_min":1.25,"per_min_waiting":10.04}],"booking_fee":0,"min_fare":0,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12},"fixed_fare":45}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'eg'; FROM tripz_tenants t WHERE t.country_pack = 'eg';
-- saver -- saver
@@ -220,7 +196,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'saver',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'saver'), 0) + 1, AND x.service_class = 'saver'), 0) + 1,
true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":7.53,"per_km":5.41,"per_min":1.16,"per_min_waiting":10.91},{"name":"normal_day","from":"09:30","to":"16:00","flag":6.03,"per_km":4.33,"per_min":0.93,"per_min_waiting":8.73},{"name":"evening_peak","from":"16:00","to":"19:30","flag":7.53,"per_km":5.41,"per_min":1.16,"per_min_waiting":10.91},{"name":"normal_evening","from":"19:30","to":"23:00","flag":6.03,"per_km":4.33,"per_min":0.93,"per_min_waiting":8.73},{"name":"late_night","from":"23:00","to":"07:00","flag":6.93,"per_km":4.98,"per_min":1.07,"per_min_waiting":10.04}],"booking_fee":4.55,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb true, '{"currency":"EGP","timezone":"Africa/Cairo","mode":"time_and_distance","rounding":{"increment":1,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":3.44,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":3.44,"per_min":0.8,"per_min_waiting":1.2},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":3.44,"per_min":1.4,"per_min_waiting":2.1},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":3.44,"per_min":0.8,"per_min_waiting":1.2},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":3.44,"per_min":1.5,"per_min_waiting":2.25}],"booking_fee":0,"min_fare":20,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":12}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'eg'; FROM tripz_tenants t WHERE t.country_pack = 'eg';
-- ============ SY (SYP) ============ -- ============ SY (SYP) ============
@@ -233,7 +209,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'economy',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'economy'), 0) + 1, AND x.service_class = 'economy'), 0) + 1,
true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":66,"per_km":48,"per_min":10,"per_min_waiting":82},{"name":"normal_day","from":"09:30","to":"16:00","flag":53,"per_km":38,"per_min":8,"per_min_waiting":65},{"name":"evening_peak","from":"16:00","to":"19:30","flag":66,"per_km":48,"per_min":10,"per_min_waiting":82},{"name":"normal_evening","from":"19:30","to":"23:00","flag":53,"per_km":38,"per_min":8,"per_min_waiting":65},{"name":"late_night","from":"23:00","to":"07:00","flag":61,"per_km":44,"per_min":9,"per_min_waiting":75}],"booking_fee":34,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":40,"per_min":10,"per_min_waiting":15},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":40,"per_min":9,"per_min_waiting":14},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":40,"per_min":10,"per_min_waiting":15},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":40,"per_min":9,"per_min_waiting":14},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":40,"per_min":11,"per_min_waiting":17}],"booking_fee":0,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'sy'; FROM tripz_tenants t WHERE t.country_pack = 'sy';
-- comfort -- comfort
@@ -245,7 +221,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'comfort',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'comfort'), 0) + 1, AND x.service_class = 'comfort'), 0) + 1,
true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":83,"per_km":60,"per_min":13,"per_min_waiting":82},{"name":"normal_day","from":"09:30","to":"16:00","flag":66,"per_km":48,"per_min":10,"per_min_waiting":65},{"name":"evening_peak","from":"16:00","to":"19:30","flag":83,"per_km":60,"per_min":13,"per_min_waiting":82},{"name":"normal_evening","from":"19:30","to":"23:00","flag":66,"per_km":48,"per_min":10,"per_min_waiting":65},{"name":"late_night","from":"23:00","to":"07:00","flag":76,"per_km":55,"per_min":12,"per_min_waiting":75}],"booking_fee":34,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":52,"per_min":10,"per_min_waiting":15},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":52,"per_min":9,"per_min_waiting":14},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":52,"per_min":10,"per_min_waiting":15},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":52,"per_min":9,"per_min_waiting":14},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":52,"per_min":11,"per_min_waiting":17}],"booking_fee":0,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'sy'; FROM tripz_tenants t WHERE t.country_pack = 'sy';
-- lady -- lady
@@ -257,7 +233,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'lady',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'lady'), 0) + 1, AND x.service_class = 'lady'), 0) + 1,
true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":73,"per_km":53,"per_min":11,"per_min_waiting":82},{"name":"normal_day","from":"09:30","to":"16:00","flag":59,"per_km":42,"per_min":9,"per_min_waiting":65},{"name":"evening_peak","from":"16:00","to":"19:30","flag":73,"per_km":53,"per_min":11,"per_min_waiting":82},{"name":"normal_evening","from":"19:30","to":"23:00","flag":59,"per_km":42,"per_min":9,"per_min_waiting":65},{"name":"late_night","from":"23:00","to":"07:00","flag":67,"per_km":48,"per_min":10,"per_min_waiting":75}],"booking_fee":34,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":44,"per_min":10,"per_min_waiting":15},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":44,"per_min":9,"per_min_waiting":14},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":44,"per_min":10,"per_min_waiting":15},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":44,"per_min":9,"per_min_waiting":14},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":44,"per_min":11,"per_min_waiting":17}],"booking_fee":0,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'sy'; FROM tripz_tenants t WHERE t.country_pack = 'sy';
-- electric -- electric
@@ -269,7 +245,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'electric',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'electric'), 0) + 1, AND x.service_class = 'electric'), 0) + 1,
true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":70,"per_km":50,"per_min":11,"per_min_waiting":82},{"name":"normal_day","from":"09:30","to":"16:00","flag":56,"per_km":40,"per_min":9,"per_min_waiting":65},{"name":"evening_peak","from":"16:00","to":"19:30","flag":70,"per_km":50,"per_min":11,"per_min_waiting":82},{"name":"normal_evening","from":"19:30","to":"23:00","flag":56,"per_km":40,"per_min":9,"per_min_waiting":65},{"name":"late_night","from":"23:00","to":"07:00","flag":64,"per_km":46,"per_min":10,"per_min_waiting":75}],"booking_fee":34,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":48,"per_min":10,"per_min_waiting":15},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":48,"per_min":9,"per_min_waiting":14},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":48,"per_min":10,"per_min_waiting":15},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":48,"per_min":9,"per_min_waiting":14},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":48,"per_min":11,"per_min_waiting":17}],"booking_fee":0,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'sy'; FROM tripz_tenants t WHERE t.country_pack = 'sy';
-- van -- van
@@ -281,7 +257,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'van',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'van'), 0) + 1, AND x.service_class = 'van'), 0) + 1,
true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":96,"per_km":69,"per_min":15,"per_min_waiting":82},{"name":"normal_day","from":"09:30","to":"16:00","flag":77,"per_km":55,"per_min":12,"per_min_waiting":65},{"name":"evening_peak","from":"16:00","to":"19:30","flag":96,"per_km":69,"per_min":15,"per_min_waiting":82},{"name":"normal_evening","from":"19:30","to":"23:00","flag":77,"per_km":55,"per_min":12,"per_min_waiting":65},{"name":"late_night","from":"23:00","to":"07:00","flag":89,"per_km":64,"per_min":14,"per_min_waiting":75}],"booking_fee":34,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":60,"per_min":10,"per_min_waiting":15},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":60,"per_min":9,"per_min_waiting":14},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":60,"per_min":10,"per_min_waiting":15},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":60,"per_min":9,"per_min_waiting":14},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":60,"per_min":11,"per_min_waiting":17}],"booking_fee":0,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'sy'; FROM tripz_tenants t WHERE t.country_pack = 'sy';
-- delivery -- delivery
@@ -293,7 +269,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'delivery',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'delivery'), 0) + 1, AND x.service_class = 'delivery'), 0) + 1,
true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":60,"per_km":43,"per_min":9,"per_min_waiting":82},{"name":"normal_day","from":"09:30","to":"16:00","flag":48,"per_km":34,"per_min":7,"per_min_waiting":65},{"name":"evening_peak","from":"16:00","to":"19:30","flag":60,"per_km":43,"per_min":9,"per_min_waiting":82},{"name":"normal_evening","from":"19:30","to":"23:00","flag":48,"per_km":34,"per_min":7,"per_min_waiting":65},{"name":"late_night","from":"23:00","to":"07:00","flag":55,"per_km":40,"per_min":8,"per_min_waiting":75}],"booking_fee":34,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":36,"per_min":10,"per_min_waiting":15},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":36,"per_min":9,"per_min_waiting":14},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":36,"per_min":10,"per_min_waiting":15},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":36,"per_min":9,"per_min_waiting":14},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":36,"per_min":11,"per_min_waiting":17}],"booking_fee":0,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'sy'; FROM tripz_tenants t WHERE t.country_pack = 'sy';
-- vip -- vip
@@ -305,19 +281,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'vip',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'vip'), 0) + 1, AND x.service_class = 'vip'), 0) + 1,
true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":116,"per_km":84,"per_min":18,"per_min_waiting":82},{"name":"normal_day","from":"09:30","to":"16:00","flag":93,"per_km":67,"per_min":14,"per_min_waiting":65},{"name":"evening_peak","from":"16:00","to":"19:30","flag":116,"per_km":84,"per_min":18,"per_min_waiting":82},{"name":"normal_evening","from":"19:30","to":"23:00","flag":93,"per_km":67,"per_min":14,"per_min_waiting":65},{"name":"late_night","from":"23:00","to":"07:00","flag":107,"per_km":77,"per_min":16,"per_min_waiting":75}],"booking_fee":34,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":56,"per_min":10,"per_min_waiting":15},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":56,"per_min":9,"per_min_waiting":14},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":56,"per_min":10,"per_min_waiting":15},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":56,"per_min":9,"per_min_waiting":14},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":56,"per_min":11,"per_min_waiting":17}],"booking_fee":0,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'sy';
-- fixed
UPDATE tripz_tariffs SET active = false
WHERE city = 'default' AND service_class = 'fixed' AND active = true
AND tenant_id IN (SELECT id FROM tripz_tenants WHERE country_pack = 'sy');
INSERT INTO tripz_tariffs (id, tenant_id, city, service_class, version, active, definition)
SELECT uuid_generate_v4(), t.id, 'default', 'fixed',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'fixed'), 0) + 1,
true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"fixed_quote","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":66,"per_km":48,"per_min":10,"per_min_waiting":82},{"name":"normal_day","from":"09:30","to":"16:00","flag":53,"per_km":38,"per_min":8,"per_min_waiting":65},{"name":"evening_peak","from":"16:00","to":"19:30","flag":66,"per_km":48,"per_min":10,"per_min_waiting":82},{"name":"normal_evening","from":"19:30","to":"23:00","flag":53,"per_km":38,"per_min":8,"per_min_waiting":65},{"name":"late_night","from":"23:00","to":"07:00","flag":61,"per_km":44,"per_min":9,"per_min_waiting":75}],"booking_fee":0,"min_fare":0,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11},"fixed_fare":350}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'sy'; FROM tripz_tenants t WHERE t.country_pack = 'sy';
-- saver -- saver
@@ -329,7 +293,7 @@ SELECT uuid_generate_v4(), t.id, 'default', 'saver',
COALESCE((SELECT MAX(version) FROM tripz_tariffs x COALESCE((SELECT MAX(version) FROM tripz_tariffs x
WHERE x.tenant_id = t.id AND x.city = 'default' WHERE x.tenant_id = t.id AND x.city = 'default'
AND x.service_class = 'saver'), 0) + 1, AND x.service_class = 'saver'), 0) + 1,
true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":57,"per_km":41,"per_min":9,"per_min_waiting":82},{"name":"normal_day","from":"09:30","to":"16:00","flag":45,"per_km":32,"per_min":7,"per_min_waiting":65},{"name":"evening_peak","from":"16:00","to":"19:30","flag":57,"per_km":41,"per_min":9,"per_min_waiting":82},{"name":"normal_evening","from":"19:30","to":"23:00","flag":45,"per_km":32,"per_min":7,"per_min_waiting":65},{"name":"late_night","from":"23:00","to":"07:00","flag":52,"per_km":37,"per_min":8,"per_min_waiting":75}],"booking_fee":34,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb true, '{"currency":"SYP","timezone":"Asia/Damascus","mode":"time_and_distance","rounding":{"increment":5,"mode":"nearest"},"windows":[{"name":"morning_peak","from":"07:00","to":"09:30","flag":0,"per_km":34,"per_min":10,"per_min_waiting":15},{"name":"normal_day","from":"09:30","to":"16:00","flag":0,"per_km":34,"per_min":9,"per_min_waiting":14},{"name":"evening_peak","from":"16:00","to":"19:30","flag":0,"per_km":34,"per_min":10,"per_min_waiting":15},{"name":"normal_evening","from":"19:30","to":"23:00","flag":0,"per_km":34,"per_min":9,"per_min_waiting":14},{"name":"late_night","from":"23:00","to":"07:00","flag":0,"per_km":34,"per_min":11,"per_min_waiting":17}],"booking_fee":0,"min_fare":150,"free_waiting_min":5,"surge":{"enabled":false},"commission":{"percent":11}}'::jsonb
FROM tripz_tenants t WHERE t.country_pack = 'sy'; FROM tripz_tenants t WHERE t.country_pack = 'sy';
COMMIT; COMMIT;
backend/src/modules/tariff/default-tariffs.ts
+106 -81
View File
@@ -3,33 +3,41 @@ import { TariffDefinition } from './entities/tariff.entity';
/** /**
* تعرفة الانطلاق الافتراضية لكل بلد — **مصدر الحقيقة الوحيد**. * تعرفة الانطلاق الافتراضية لكل بلد — **مصدر الحقيقة الوحيد**.
* *
* يستهلكها اثنان: `SeedService` (فيأخذها كل مستأجر جديد تلقائياً) ومولّد * يستهلكها ثلاثة: `TenantsService.provision` و`SeedService` (فيأخذها كل
* الـSQL (`scripts/generate-tariff-sql.ts`) لقواعد قائمة. نسختان من هذه * مستأجر جديد تلقائياً) ومولّد الـSQL للقواعد القائمة. نسختان من هذه
* الأرقام كانتا ستتباعدان بصمت، والتسعير أسوأ مكان يقع فيه هذا. * الأرقام كانتا ستتباعدان بصمت، والتسعير أسوأ مكان يقع فيه ذلك.
* *
* هذه تعرفة **بداية** فقط؛ يُفترض أن يحدّثها كرون استخبارات الأسعار بنسخة * تعرفة **بداية** فقط؛ يُفترض أن يحدّثها بوت استخبارات الأسعار بنسخة أعلى
* أعلى (`version + 1`) لا أن يكتب فوقها. * (`version + 1`) لا أن يكتب فوقها.
* *
* قرارات تحكم الملف (وسبب كلٍّ منها): * ## الأرقام من جدول `kazan` الحيّ في سيرو (2026-07-19)
* *
* 1. **`city = 'default'`** لا اسم البلد — كل الكود يبحث بهذه القيمة * لا من تقدير: العمولة 11٪ سوريا · 12٪ مصر · 14٪ الأردن مطابقة حرفياً.
* (`trips.service`: `dto.city ?? 'default'`). النسخة السابقة كتبت * وثلاثة تصحيحات على البيانات الخام، كلٌّ بسببه:
* `'jordan'/'egypt'/'syria'` فما طابقت شيئاً: لا تعرفة ← الراكب بلا
* سعر ← `settleFare` تأخذ `quoted_fare ?? 0` ← **رحلة مجانية وعمولة
* صفر**، بسطر تحذير واحد في اللوج. البلد من `country_pack` للمستأجر.
* *
* 2. **النوافذ بالتوقيت المحلي** عبر `timezone` — المحرّك كان يقرأ بـUTC، * 1. **محورا الأردن مقلوبان.** أعمدة الفئات عنده تحمل سعر **الدقيقة**
* فذروة 16:00–20:00 تشتغل 19:00–23:00 في عمّان. * (0.043) وأعمدة النوافذ تحمل سعر **الكيلومتر** (0.184) — عكس مصر
* وسوريا. قُرئت بالاتجاه الصحيح هنا؛ قراءتها كما هي تجعل الكيلومتر
* بـ0.043 ديناراً والدقيقة بـ0.184.
* *
* 3. **فتحة العدّاد (`flag`) حقيقية** لا صفر — الفتحة تغطي تكلفة بدء * 2. **نِسَب الفئات في مصر وسوريا معطوبة**: الكهربائي 0.23 والفان 0.25–0.40
* الرحلة، وإسقاطها يجعل الرحلة القصيرة خاسرة على السائق. * من سعر الاقتصادي — أي أن الفان **أرخص من الاقتصادي**، فيصير الخيار
* العقلاني لكل راكب هو أغلى فئة على المشغّل. نِسَب الأردن وحدها متماسكة
* (0.86 → 1.51 متصاعدة)، فاعتُمدت للبلدان الثلاثة.
* *
* 4. **الحدّ الأدنى بقرار المالك**: 1.10 دينار · 20 جنيهاً · 150 ليرة. * 3. **سعر الكيلو في مصر 4 جنيهات** لا 3.5 (قرار المالك: هذا المتعارف عليه).
* النسخة السابقة اشتقّته `perKm × 2` فأنتجت 0.368 ديناراً — ثلث الحقيقي.
* *
* 5. **الفئات مشتقّة بمعاملات** لا أرقاماً مستقلّة — الأرقام الخام السابقة * ## البنية (مطابقة لسيرو — وهي ما سيكتب فيه بوت استخبارات الأسعار)
* جعلت الفان أرخص من الاقتصادي في مصر وسوريا (22 مقابل 29.5 جنيهاً)، *
* أي أن كل راكب عاقل يطلب أغلى فئة على المشغّل. * - **سعر الكيلومتر يتغيّر بالفئة فقط**: رقم ثابت يعرفه السوق («الكيلو
* بأربعة جنيه»)، فلا يصحّ أن يتذبذب بالساعة.
* - **سعر الدقيقة يتغيّر بالنافذة فقط**: الوقت هو ما يزدحم لا المسافة.
* - **لا فتحة عدّاد**: `startPrice = 0` في كل صفوف سيرو، وقرار المالك أن
* **الحدّ الأدنى هو الآلية** («ما في رحلة أقل من 20 جنيهاً») لا رسمٌ
* يُضاف فوق كل أجرة.
*
* `city = 'default'` لا اسم البلد: كل الكود يبحث بهذه القيمة
* (`trips.service`: `dto.city ?? 'default'`)، والبلد من `country_pack`.
*/ */
export const SERVICE_CLASSES = { export const SERVICE_CLASSES = {
@@ -47,60 +55,82 @@ export const SERVICE_CLASSES = {
export type ServiceClass = (typeof SERVICE_CLASSES)[keyof typeof SERVICE_CLASSES]; export type ServiceClass = (typeof SERVICE_CLASSES)[keyof typeof SERVICE_CLASSES];
/** /**
* معاملات الفئات نسبةً إلى الاقتصادي. الترتيب هنا **هو** منطق المنتج: * الفئات التي تُزرع تلقائياً لمستأجر جديد.
* أوفر < اقتصادي < كهربائي < ليدي < مريح < فان < VIP. *
* **`fixed` مستثناة عمداً.** السعر الثابت بلا جدول خطوط (أصل → وجهة → سعر)
* يعني رقماً واحداً يغطّي كل الوجهات: أظهر الاختبار الحيّ أن رحلة 55.8 كم
* تُسعَّر 2.5 ديناراً مقابل 23.2 للاقتصادي — أي أن أي راكب يكتب
* `service_class: "fixed"` يأخذ رحلة المطار بعُشر ثمنها. تُفعَّل حين يُبنى
* جدول الخطوط، لا قبله.
*/ */
export const CLASS_MULTIPLIERS: Record<string, number> = { export const SEEDED_CLASSES: string[] = Object.values(SERVICE_CLASSES).filter(
[SERVICE_CLASSES.SAVER]: 0.85, (c) => c !== SERVICE_CLASSES.FIXED,
[SERVICE_CLASSES.DELIVERY]: 0.9, );
[SERVICE_CLASSES.ECONOMY]: 1.0,
[SERVICE_CLASSES.FIXED]: 1.0,
[SERVICE_CLASSES.ELECTRIC]: 1.05,
[SERVICE_CLASSES.LADY]: 1.1,
[SERVICE_CLASSES.COMFORT]: 1.25,
[SERVICE_CLASSES.VAN]: 1.45,
[SERVICE_CLASSES.VIP]: 1.75,
};
/** /**
* الأساس الاقتصادي بالدينار — مأخوذ من التعرفة العاملة في `SeedService` * نِسَب الفئات إلى الاقتصادي — من صفّ الأردن في `kazan` (المجموعة الوحيدة
* لا من أرقام النظام القديم. * المتماسكة). الترتيب هنا **هو** منطق المنتج، وأي رقم يكسره يقلب اختيار
* الراكب رأساً على عقب.
*
* **الفان أغلى من VIP** (1.51 مقابل 1.40): هذا ما تقوله بيانات المالك،
* ومنطقيّ — مركبة بسبعة مقاعد أعلى كلفة من سيارة أفخم.
*/ */
const JOD_BASE = { export const CLASS_MULTIPLIERS: Record<string, number> = {
flag: 0.39, [SERVICE_CLASSES.SAVER]: 0.86,
perKm: 0.28, [SERVICE_CLASSES.DELIVERY]: 0.91,
perMin: 0.06, [SERVICE_CLASSES.ECONOMY]: 1.0,
waitingPerMin: 0.48, [SERVICE_CLASSES.FIXED]: 1.0,
bookingFee: 0.25, [SERVICE_CLASSES.LADY]: 1.09,
[SERVICE_CLASSES.ELECTRIC]: 1.21,
[SERVICE_CLASSES.COMFORT]: 1.3,
[SERVICE_CLASSES.VIP]: 1.4,
[SERVICE_CLASSES.VAN]: 1.51,
}; };
/** النوافذ الزمنية — بالتوقيت المحلي، وتغطي اليوم كاملاً بلا ثغرة. */
export const WINDOWS = [
{ name: 'morning_peak', from: '07:00', to: '09:30', rate: 'peak' as const },
{ name: 'normal_day', from: '09:30', to: '16:00', rate: 'normal' as const },
{ name: 'evening_peak', from: '16:00', to: '19:30', rate: 'peak' as const },
{ name: 'normal_evening', from: '19:30', to: '23:00', rate: 'normal' as const },
{ name: 'late_night', from: '23:00', to: '07:00', rate: 'late' as const },
];
export interface CountryTariff { export interface CountryTariff {
countryPack: string; countryPack: string;
currency: string; currency: string;
timezone: string; timezone: string;
/** أرضية الأجرة — «ما في رحلة أقل من هذا» (قرار المالك). */
minFare: number; minFare: number;
/** معامل التحويل من الدينار — مشتقّ من الحدّ الأدنى لا من سعر صرف يومي. */ /** سعر الكيلومتر للفئة الاقتصادية؛ باقي الفئات مشتقّة بالنِّسَب. */
scale: number; perKm: number;
/** سعر الدقيقة لكل نافذة — من أعمدة `normal/peak/lateMinPrice`. */
perMin: { normal: number; peak: number; late: number };
commissionPercent: number; commissionPercent: number;
rounding: { increment: number; mode: 'nearest' | 'up' | 'down' }; rounding: { increment: number; mode: 'nearest' | 'up' | 'down' };
/** سعر الخط الثابت الافتراضي (فئة `fixed`) — يضبطه المشغّل لكل خط. */ /**
* سعر الوقود من `kazan.fuelPrice`. لا يدخل الحساب اليوم — يُحفظ لأنه
* **مدخل بوت استخبارات الأسعار**: مقارنة السوق بلا كلفة التشغيل مقارنة
* ناقصة، وهو الرقم الذي يتحرّك بين المراجعات.
*/
fuelPrice: number;
/** سعر الخط الثابت — معرَّف ولا يُزرع (انظر `SEEDED_CLASSES`). */
fixedFare: number; fixedFare: number;
} }
/**
* `scale` مشتقّ من الحدّ الأدنى الذي أقرّه المالك (20 ÷ 1.10 لمصر،
* 150 ÷ 1.10 لسوريا): مرساة واحدة تعني أن كل الأرقام تتحرك معاً حين
* يتغير الحدّ الأدنى، بدل جدولين ينحرف أحدهما عن الآخر.
*/
export const COUNTRY_TARIFFS: CountryTariff[] = [ export const COUNTRY_TARIFFS: CountryTariff[] = [
{ {
countryPack: 'jo', countryPack: 'jo',
currency: 'JOD', currency: 'JOD',
timezone: 'Asia/Amman', timezone: 'Asia/Amman',
minFare: 1.1, minFare: 1.1,
scale: 1, perKm: 0.184, // من `normalMinPrice` — عمود الكيلومتر عند الأردن
commissionPercent: 14.0, // نسبة ذروة الأردن من محوره الأصلي (0.212 ÷ 0.184 = 1.152)، مطبَّقة على
// الدقيقة توحيداً مع مصر وسوريا.
perMin: { normal: 0.043, peak: 0.0495, late: 0.043 },
commissionPercent: 14,
rounding: { increment: 0.05, mode: 'nearest' }, rounding: { increment: 0.05, mode: 'nearest' },
fuelPrice: 1,
fixedFare: 2.5, fixedFare: 2.5,
}, },
{ {
@@ -108,9 +138,11 @@ export const COUNTRY_TARIFFS: CountryTariff[] = [
currency: 'EGP', currency: 'EGP',
timezone: 'Africa/Cairo', timezone: 'Africa/Cairo',
minFare: 20, minFare: 20,
scale: 20 / 1.1, perKm: 4.0, // قرار المالك — `kazan` يقول 3.5
commissionPercent: 12.0, perMin: { normal: 0.8, peak: 1.4, late: 1.5 },
commissionPercent: 12,
rounding: { increment: 1, mode: 'nearest' }, rounding: { increment: 1, mode: 'nearest' },
fuelPrice: 13,
fixedFare: 45, fixedFare: 45,
}, },
{ {
@@ -118,22 +150,15 @@ export const COUNTRY_TARIFFS: CountryTariff[] = [
currency: 'SYP', currency: 'SYP',
timezone: 'Asia/Damascus', timezone: 'Asia/Damascus',
minFare: 150, minFare: 150,
scale: 150 / 1.1, perKm: 40,
commissionPercent: 11.0, perMin: { normal: 9, peak: 10, late: 11 },
commissionPercent: 11,
rounding: { increment: 5, mode: 'nearest' }, rounding: { increment: 5, mode: 'nearest' },
fuelPrice: 110,
fixedFare: 350, fixedFare: 350,
}, },
]; ];
/** النوافذ الزمنية — بالتوقيت المحلي، وتغطي اليوم كاملاً بلا ثغرة. */
export const WINDOWS = [
{ name: 'morning_peak', from: '07:00', to: '09:30', multiplier: 1.25 },
{ name: 'normal_day', from: '09:30', to: '16:00', multiplier: 1.0 },
{ name: 'evening_peak', from: '16:00', to: '19:30', multiplier: 1.25 },
{ name: 'normal_evening', from: '19:30', to: '23:00', multiplier: 1.0 },
{ name: 'late_night', from: '23:00', to: '07:00', multiplier: 1.15 },
];
/** تدوير لخانة معقولة بحجم العملة — 3 كسور بالدينار، صحيح بالليرة. */ /** تدوير لخانة معقولة بحجم العملة — 3 كسور بالدينار، صحيح بالليرة. */
function money(value: number, currency: string): number { function money(value: number, currency: string): number {
const decimals = currency === 'JOD' ? 3 : currency === 'EGP' ? 2 : 0; const decimals = currency === 'JOD' ? 3 : currency === 'EGP' ? 2 : 0;
@@ -153,14 +178,15 @@ export function buildDefinition(
serviceClass: string, serviceClass: string,
): TariffDefinition { ): TariffDefinition {
const classMultiplier = CLASS_MULTIPLIERS[serviceClass] ?? 1; const classMultiplier = CLASS_MULTIPLIERS[serviceClass] ?? 1;
const rate = (base: number, windowMultiplier: number) =>
money(base * country.scale * classMultiplier * windowMultiplier, country.currency);
const isFixed = serviceClass === SERVICE_CLASSES.FIXED; const isFixed = serviceClass === SERVICE_CLASSES.FIXED;
// سعر الكيلومتر ثابت عبر النوافذ — الفئة وحدها تحرّكه.
const perKm = money(country.perKm * classMultiplier, country.currency);
const definition: TariffDefinition = { const definition: TariffDefinition = {
currency: country.currency, currency: country.currency,
// المنطقة الزمنية شرط صحة النوافذ — بدونها يقرأ المحرّك بـUTC. // المنطقة الزمنية شرط صحة النوافذ — بدونها يقرأ المحرّك بـUTC، فتقع
// ذروة 16:00 فعلياً عند 19:00 في عمّان.
timezone: country.timezone, timezone: country.timezone,
mode: isFixed ? 'fixed_quote' : 'time_and_distance', mode: isFixed ? 'fixed_quote' : 'time_and_distance',
rounding: country.rounding, rounding: country.rounding,
@@ -168,17 +194,18 @@ export function buildDefinition(
name: w.name, name: w.name,
from: w.from, from: w.from,
to: w.to, to: w.to,
flag: rate(JOD_BASE.flag, w.multiplier), // لا فتحة عدّاد: `startPrice = 0` في كل صفوف سيرو، والحدّ الأدنى هو
per_km: rate(JOD_BASE.perKm, w.multiplier), // الآلية بدلاً منها (قرار المالك).
per_min: rate(JOD_BASE.perMin, w.multiplier), flag: 0,
// الانتظار لا يتبع معامل الفئة: دقيقة انتظار السائق واحدة مهما كانت per_km: perKm,
// فئة السيارة — الفرق في السيارة لا في الوقت. per_min: money(country.perMin[w.rate], country.currency),
per_min_waiting: money( // دقيقة انتظار السائق واحدة مهما كانت فئة المركبة — الفرق في السيارة
JOD_BASE.waitingPerMin * country.scale * w.multiplier, // لا في الوقت. الضِّعف ونصف لأن الانتظار تعطيل كامل لا سير.
country.currency, per_min_waiting: money(country.perMin[w.rate] * 1.5, country.currency),
),
})), })),
booking_fee: money(JOD_BASE.bookingFee * country.scale, country.currency), // الحدّ الأدنى **أرضية** لا رسم يُضاف: رحلة تحته تُرفع إليه، وما فوقه
// يُحاسَب بالعدّاد وحده.
booking_fee: 0,
min_fare: country.minFare, min_fare: country.minFare,
free_waiting_min: 5, free_waiting_min: 5,
surge: { enabled: false }, surge: { enabled: false },
@@ -187,10 +214,8 @@ export function buildDefinition(
if (isFixed) { if (isFixed) {
definition.fixed_fare = country.fixedFare; definition.fixed_fare = country.fixedFare;
// السعر الثابت لا حدّ أدنى له ولا رسم حجز: المعلَن هو المتفَق عليه، // السعر المعلَن هو المتفَق عليه؛ رفعه بحدّ أدنى يعني إعلان سعر وتحصيل غيره.
// ورفعه بحدّ أدنى يعني إعلان سعر وتحصيل غيره.
definition.min_fare = 0; definition.min_fare = 0;
definition.booking_fee = 0;
} }
return definition; return definition;
backend/src/modules/tariff/tariff-seed.spec.ts
+85 -9
View File
@@ -6,6 +6,8 @@ import {
buildDefinition, buildDefinition,
COUNTRY_TARIFFS as countries, COUNTRY_TARIFFS as countries,
SERVICE_CLASSES as ServiceClasses, SERVICE_CLASSES as ServiceClasses,
SEEDED_CLASSES,
CLASS_MULTIPLIERS,
WINDOWS, WINDOWS,
countryTariff as byPack, countryTariff as byPack,
} from './default-tariffs'; } from './default-tariffs';
@@ -34,27 +36,39 @@ describe('تعرفة الانطلاق — الحدود الدنيا بقرار
} }
}); });
it('فتحة العدّاد موجودة في كل نافذة ولكل بلد — لا صفر', () => { it('**لا فتحة عدّاد ولا رسم حجز** — الأرضية هي الآلية', () => {
// `startPrice = 0` في كل صفوف `kazan`، وقرار المالك أن «ما في رحلة أقل
// من 20 جنيهاً» تُنفَّذ كأرضية لا كرسم يُضاف فوق كل أجرة.
for (const country of countries) { for (const country of countries) {
for (const w of def(country.countryPack, ServiceClasses.ECONOMY).windows) { const d = def(country.countryPack, ServiceClasses.ECONOMY);
// الفتحة صفراً كانت تجعل الرحلة القصيرة خاسرة على السائق. expect(d.booking_fee).toBe(0);
expect(w.flag).toBeGreaterThan(0); for (const w of d.windows) expect(w.flag).toBe(0);
}
} }
}); });
it('الأرضية ترفع الرحلة القصيرة فقط — الطويلة تُحاسَب بالعدّاد', () => {
const d = def('eg', ServiceClasses.ECONOMY);
const short = TariffEngine.quote(d, { distanceKm: 1, durationMin: 3, at: NOON_AMMAN });
const long = TariffEngine.quote(d, { distanceKm: 30, durationMin: 40, at: NOON_AMMAN });
expect(short.total).toBe(20); // الأرضية
expect(long.total).toBeGreaterThan(100); // العدّاد وحده
});
}); });
describe('تعرفة الانطلاق — ترتيب الفئات', () => { describe('تعرفة الانطلاق — ترتيب الفئات', () => {
// الخلل الذي كسر النسخة السابقة: الفان أرخص من الاقتصادي في مصر وسوريا، // الخلل الذي كسر النسخة السابقة: الفان أرخص من الاقتصادي في مصر وسوريا،
// فيصير الخيار العقلاني لكل راكب هو أغلى فئة على المشغّل. // فيصير الخيار العقلاني لكل راكب هو أغلى فئة على المشغّل.
// الترتيب من نِسَب `kazan` (صفّ الأردن): الفان **أغلى من VIP** — مركبة
// بسبعة مقاعد أعلى كلفة من سيارة أفخم.
const ordered = [ const ordered = [
ServiceClasses.SAVER, ServiceClasses.SAVER,
ServiceClasses.DELIVERY,
ServiceClasses.ECONOMY, ServiceClasses.ECONOMY,
ServiceClasses.ELECTRIC,
ServiceClasses.LADY, ServiceClasses.LADY,
ServiceClasses.ELECTRIC,
ServiceClasses.COMFORT, ServiceClasses.COMFORT,
ServiceClasses.VAN,
ServiceClasses.VIP, ServiceClasses.VIP,
ServiceClasses.VAN,
]; ];
for (const country of countries) { for (const country of countries) {
@@ -62,8 +76,8 @@ describe('تعرفة الانطلاق — ترتيب الفئات', () => {
const fares = ordered.map( const fares = ordered.map(
(cls) => (cls) =>
TariffEngine.quote(def(country.countryPack, cls), { TariffEngine.quote(def(country.countryPack, cls), {
distanceKm: 5, distanceKm: 40, // مسافة كبيرة تتجاوز الأرضية في كل الفئات
durationMin: 15, durationMin: 50,
at: NOON_AMMAN, at: NOON_AMMAN,
}).total, }).total,
); );
@@ -171,3 +185,65 @@ describe('العمولة', () => {
expect(c.amount).toBeCloseTo(q.total * 0.14, 2); expect(c.amount).toBeCloseTo(q.total * 0.14, 2);
}); });
}); });
describe('مطابقة جدول kazan (بيانات سيرو الحيّة)', () => {
it('العمولة مطابقة حرفياً: 11٪ سوريا · 12٪ مصر · 14٪ الأردن', () => {
expect(byPack('sy').commissionPercent).toBe(11);
expect(byPack('eg').commissionPercent).toBe(12);
expect(byPack('jo').commissionPercent).toBe(14);
});
it('**محورا الأردن مقروءان بالاتجاه الصحيح** — الكيلو أغلى من الدقيقة', () => {
// في `kazan` كان صفّ الأردن مقلوباً: أعمدة الفئات تحمل سعر الدقيقة
// (0.043) وأعمدة النوافذ سعر الكيلومتر (0.184). قراءته كما هو تجعل
// الكيلومتر بـ0.043 ديناراً — أي رحلة 27 كم بأقلّ من دينارين.
const w = def('jo', ServiceClasses.ECONOMY).windows[1]; // normal_day
expect(w.per_km).toBe(0.184);
expect(w.per_min).toBe(0.043);
expect(w.per_km).toBeGreaterThan(w.per_min);
});
it('سعر الكيلو في مصر 4 جنيهات (قرار المالك) لا 3.5', () => {
expect(byPack('eg').perKm).toBe(4.0);
});
it('**سعر الكيلو ثابت عبر النوافذ** — الوقت يحرّك الدقيقة لا المسافة', () => {
// «الكيلو بأربعة جنيه» رقم يعرفه السوق، فلا يصحّ أن يتذبذب بالساعة.
for (const country of countries) {
const d = def(country.countryPack, ServiceClasses.ECONOMY);
const kms = new Set(d.windows.map((w) => w.per_km));
expect(kms.size).toBe(1);
// بينما الدقيقة تتغيّر فعلاً بين النوافذ (حيث تختلف أرقام البلد).
const mins = new Set(d.windows.map((w) => w.per_min));
expect(mins.size).toBeGreaterThan(1);
}
});
it('نِسَب الفئات معطوبة في kazan لمصر وسوريا — نِسَب الأردن هي المعتمدة', () => {
// الخام: الكهربائي 0.23 والفان 0.25–0.40 من الاقتصادي، أي فان أرخص من
// اقتصادي. المعتمد هنا متصاعد ولا ينعكس.
expect(CLASS_MULTIPLIERS.van).toBeGreaterThan(CLASS_MULTIPLIERS.economy);
expect(CLASS_MULTIPLIERS.electric).toBeGreaterThan(CLASS_MULTIPLIERS.economy);
expect(CLASS_MULTIPLIERS.delivery).toBeLessThan(CLASS_MULTIPLIERS.economy);
});
it('سعر الوقود محفوظ لبوت استخبارات الأسعار', () => {
expect(byPack('sy').fuelPrice).toBe(110);
expect(byPack('eg').fuelPrice).toBe(13);
expect(byPack('jo').fuelPrice).toBe(1);
});
});
describe('فئة fixed لا تُزرع', () => {
it('**مستثناة من الزرع** — سعر ثابت بلا جدول خطوط تسريب', () => {
// أثبت الاختبار الحيّ: رحلة 55.8 كم بـ2.5 ديناراً مقابل 23.2 للاقتصادي.
expect(SEEDED_CLASSES).not.toContain(ServiceClasses.FIXED);
expect(SEEDED_CLASSES).toHaveLength(8);
});
it('تبقى معرَّفة في الكتالوج — تُفعَّل حين يُبنى جدول الخطوط', () => {
expect(Object.values(ServiceClasses)).toContain(ServiceClasses.FIXED);
expect(def('jo', ServiceClasses.FIXED).mode).toBe('fixed_quote');
});
});
backend/src/modules/tenants/provision-tariffs.spec.ts
+10 -3
View File
@@ -1,5 +1,5 @@
import { TenantsService } from './tenants.service'; import { TenantsService } from './tenants.service';
import { SERVICE_CLASSES } from '../tariff/default-tariffs'; import { SEEDED_CLASSES, SERVICE_CLASSES } from '../tariff/default-tariffs';
/** /**
* حارس ثغرة كُشفت على السيرفر (2026-07-19): `SeedService` كان يزرع التعرفة * حارس ثغرة كُشفت على السيرفر (2026-07-19): `SeedService` كان يزرع التعرفة
@@ -35,12 +35,19 @@ describe('TenantsService.provision — تعرفة الانطلاق', () => {
return { svc, savedTariffs, tariffRepo }; return { svc, savedTariffs, tariffRepo };
} }
it('**كل فئة خدمة تُزرع** لمستأجر جديد — لا الاقتصادي وحده', async () => { it('**كل فئة قابلة للزرع تُزرع** لمستأجر جديد — لا الاقتصادي وحده', async () => {
const { svc, savedTariffs } = build(); const { svc, savedTariffs } = build();
await svc.provision({ name: 'Test', slug: 'test-jo', countryPack: 'jo' }); await svc.provision({ name: 'Test', slug: 'test-jo', countryPack: 'jo' });
const classes = savedTariffs.map((t) => t.service_class).sort(); const classes = savedTariffs.map((t) => t.service_class).sort();
expect(classes).toEqual(Object.values(SERVICE_CLASSES).sort()); expect(classes).toEqual([...SEEDED_CLASSES].sort());
});
it('**`fixed` لا تُزرع** — سعر ثابت بلا جدول خطوط تسريب', async () => {
const { svc, savedTariffs } = build();
await svc.provision({ name: 'Test2', slug: 'test-jo-2', countryPack: 'jo' });
// الاختبار الحيّ: 55.8 كم بـ2.5 ديناراً مقابل 23.2 للاقتصادي.
expect(savedTariffs.map((t) => t.service_class)).not.toContain(SERVICE_CLASSES.FIXED);
}); });
it('يزرع بعملة البلد ومنطقته الزمنية — لا افتراض الأردن للجميع', async () => { it('يزرع بعملة البلد ومنطقته الزمنية — لا افتراض الأردن للجميع', async () => {
backend/src/modules/tenants/tenants.service.ts
+2 -2
View File
@@ -7,7 +7,7 @@ import { Tariff } from '../tariff/entities/tariff.entity';
import { import {
buildDefinition, buildDefinition,
countryTariff, countryTariff,
SERVICE_CLASSES, SEEDED_CLASSES,
} from '../tariff/default-tariffs'; } from '../tariff/default-tariffs';
import { TenantRevenueEntry } from '../tenant-wallet/entities/tenant-ledger.entity'; import { TenantRevenueEntry } from '../tenant-wallet/entities/tenant-ledger.entity';
import { CacheService, CacheKeys, TTL } from '../../common/cache/cache.service'; import { CacheService, CacheKeys, TTL } from '../../common/cache/cache.service';
@@ -150,7 +150,7 @@ export class TenantsService {
private async seedTariffs(tenant: Tenant): Promise<void> { private async seedTariffs(tenant: Tenant): Promise<void> {
try { try {
const country = countryTariff(tenant.countryPack); const country = countryTariff(tenant.countryPack);
const rows = Object.values(SERVICE_CLASSES).map((serviceClass) => const rows = SEEDED_CLASSES.map((serviceClass) =>
this.tariffs.create({ this.tariffs.create({
tenant_id: tenant.id, tenant_id: tenant.id,
city: 'default', city: 'default',
backend/src/modules/trips/settle-fare.spec.ts
+5 -4
View File
@@ -102,8 +102,9 @@ describe('settleFare — تسعير النهاية', () => {
expect(out.billed_distance_km).toBe(12); expect(out.billed_distance_km).toBe(12);
expect(out.actual_distance_km).toBe(12); expect(out.actual_distance_km).toBe(12);
expect(out.distance_ratio).toBe(1.2); expect(out.distance_ratio).toBe(1.2);
// 0.39 فتحة + 12×0.28 مسافة + 20×0.06 زمن + 0.25 رسم حجز = 5.20 // 12×0.184 مسافة + 20×0.043 زمن = 3.068 → تدوير 0.05 → 3.05
expect(out.final_fare).toBeCloseTo(5.2, 2); // (بلا فتحة ولا رسم حجز — أرقام `kazan`، والأرضية 1.10 لم تُبلَغ)
expect(out.final_fare).toBeCloseTo(3.05, 2);
// السعر المقفول وقت الطلب (4.0) لم يعد هو الحاكم. // السعر المقفول وقت الطلب (4.0) لم يعد هو الحاكم.
expect(out.final_fare).not.toBe(4.0); expect(out.final_fare).not.toBe(4.0);
}); });
@@ -141,8 +142,8 @@ describe('settleFare — تسعير النهاية', () => {
it('الانتظار يُضاف فوق الأجرة المعاد تسعيرها', async () => { it('الانتظار يُضاف فوق الأجرة المعاد تسعيرها', async () => {
const { svc } = build({ row: { ...baseRow, waiting_charge: 1.2 } }); const { svc } = build({ row: { ...baseRow, waiting_charge: 1.2 } });
const out = await settle(svc, snapshot); const out = await settle(svc, snapshot);
// 0.39 + 10×0.28 + 20×0.06 = 4.39 → +1.2 انتظار = 5.59 → تدوير // 10×0.184 + 20×0.043 = 2.70، والانتظار 1.2 يُضاف فوقها.
expect(out.final_fare).toBeGreaterThan(5.5); expect(out.final_fare).toBeCloseTo(3.9, 2);
}); });
}); });
backend/src/modules/trips/trips.service.ts
+14 -2
View File
@@ -204,8 +204,20 @@ export class TripsService {
commissionAmount = c.amount; commissionAmount = c.amount;
commissionRate = c.rate; commissionRate = c.rate;
} }
} catch { } catch (e: any) {
this.logger.warn(`no tariff for ${city}/${serviceClass} — trip without quote`); // **رحلة بلا سعر تُرفض ولا تُنشأ** (قرار المالك 2026-07-19).
//
// كان الاستثناء يُبتلع فتُنشأ رحلة بـ`quoted_fare = null`، ثم تأخذ
// `settleFare` القيمة `quoted_fare ?? 0` — أي **رحلة مجانية وعمولة
// صفر**، بسطر تحذير واحد في اللوج. و`service_class` يأتي من الطلب بلا
// تحقّق، فكانت كلمة عشوائية (`"foo"`) تكفي للحصول على رحلة بلا أجرة.
//
// الفشل الصريح هنا أأمن من الصامت: الراكب يرى «الفئة غير متاحة» بدل
// أن يكتشف المشغّل بعد شهر أن رحلاتٍ مرّت بلا تحصيل.
this.logger.error(`no active tariff for ${city}/${serviceClass}: ${e?.message}`);
throw new BadRequestException(
`No pricing available for service class "${serviceClass}" in "${city}"`,
);
} }
// الكوبون يُقيَّم الآن ليعرف الراكب سعره قبل التأكيد، لكنه **لا يُستهلك** // الكوبون يُقيَّم الآن ليعرف الراكب سعره قبل التأكيد، لكنه **لا يُستهلك**