Hamza/Siro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 2026-07-12 05:40:28

Browse Source
This commit is contained in:
Hamza-Ayed
2026-07-12 05:40:28 +03:00
parent 1fa517acc9
commit 24fb56f08f
75 changed files with 5051 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/transit/trip/delay.php
+33
View File
@@ -0,0 +1,33 @@
<?php
// transit/trip/delay.php — السائق يبلغ عن تأخير
require_once __DIR__ . '/../../transit/connect_app.php';
requireTransitFields(['trip_id', 'driver_transit_id', 'delay_minutes']);
$tripId = filterRequest('trip_id', 'int');
$driverId = filterRequest('driver_transit_id', 'int');
$delay = min((int)filterRequest('delay_minutes'), 120);
$reason = filterRequest('reason');
$st = $transit_con->prepare(
"SELECT t.id, t.route_id, r.name_ar AS route_name
FROM transit_trips t JOIN transit_routes r ON r.id=t.route_id
WHERE t.id=? AND t.driver_id=? AND t.status='started' LIMIT 1"
);
$st->execute([$tripId, $driverId]);
$trip = $st->fetch();
if (!$trip) jsonError('Active trip not found', 404);
$transit_con->prepare(
"UPDATE transit_trips SET delay_minutes=?, delay_reason=?, updated_at=NOW() WHERE id=?"
)->execute([$delay, $reason, $tripId]);
transitSendTopicNotification(
transitRouteTopic((int)$trip['route_id']),
'تأخير في الباص',
'خط ' . $trip['route_name'] . ' متأخر ' . $delay . ' دقيقة' . ($reason ? " — $reason" : ''),
['type' => 'transit_delay', 'trip_id' => (string)$tripId, 'delay' => (string)$delay]
);
jsonSuccess(['delay_minutes' => $delay], 'Delay reported and passengers notified');
backend/transit/trip/end.php
+32
View File
@@ -0,0 +1,32 @@
<?php
// transit/trip/end.php — السائق ينهي الرحلة
require_once __DIR__ . '/../../transit/connect_app.php';
requireTransitFields(['trip_id', 'driver_transit_id']);
$tripId = filterRequest('trip_id', 'int');
$driverId = filterRequest('driver_transit_id', 'int');
$st = $transit_con->prepare(
"SELECT id, route_id, status FROM transit_trips WHERE id=? AND driver_id=? LIMIT 1"
);
$st->execute([$tripId, $driverId]);
$trip = $st->fetch();
if (!$trip) jsonError('Trip not found', 404);
if ($trip['status'] !== 'started') jsonError('Trip is not in started state', 409);
$transit_con->prepare(
"UPDATE transit_trips SET status='completed', completed_at=NOW(), updated_at=NOW() WHERE id=?"
)->execute([$tripId]);
global $redis;
if ($redis) $redis->del("transit:trip:{$tripId}:status");
// موقع الباص + ملكية الرحلة على Redis سيرفر الموقع
transitClearTripOwner($tripId);
global $redisLocation;
if ($redisLocation) $redisLocation->del("transit:trip:{$tripId}:pos");
jsonSuccess(['trip_id' => $tripId, 'status' => 'completed'], 'Trip completed');
backend/transit/trip/live.php
+53
View File
@@ -0,0 +1,53 @@
<?php
// transit/trip/live.php — الراكب يسأل عن موقع الباص الحي
require_once __DIR__ . '/../../transit/connect_app.php';
$tripId = filterRequest('trip_id', 'int');
$routeId = filterRequest('route_id', 'int');
if (!$tripId && $routeId) {
$st = $transit_con->prepare(
"SELECT id FROM transit_trips WHERE route_id=? AND trip_date=? AND status='started' LIMIT 1"
);
$st->execute([$routeId, date('Y-m-d')]);
$row = $st->fetch();
$tripId = $row ? (int)$row['id'] : 0;
}
if (!$tripId) jsonError('No active trip found', 404);
$st = $transit_con->prepare(
"SELECT t.id, t.org_id, t.status, t.delay_minutes, t.current_stop_seq, t.started_at,
r.name_ar AS route_name, sc.departure_time, d.name AS driver_name
FROM transit_trips t
JOIN transit_routes r ON r.id = t.route_id
JOIN transit_schedules sc ON sc.id = t.schedule_id
JOIN transit_drivers d ON d.id = t.driver_id
WHERE t.id=? LIMIT 1"
);
$st->execute([$tripId]);
$trip = $st->fetch();
if (!$trip) jsonError('Trip not found', 404);
// الراكب يحتاج عضوية نشطة في مؤسسة هذا الخط قبل رؤية موقع الباص
$chk = $transit_con->prepare(
"SELECT id FROM transit_enrollments WHERE org_id=? AND passenger_id=? AND status='active' LIMIT 1"
);
$chk->execute([$trip['org_id'], $transit_user_id]);
if (!$chk->fetch()) jsonError('Active enrollment required', 403);
$stStops = $transit_con->prepare(
"SELECT s.id, s.sequence, s.name_ar, s.latitude, s.longitude,
s.geofence_radius, s.eta_offset_min, s.is_major
FROM transit_stops s
JOIN transit_trips t ON t.route_id = s.route_id
WHERE t.id=? ORDER BY s.sequence ASC"
);
$stStops->execute([$tripId]);
jsonSuccess([
'trip' => $trip,
'bus_position' => transitGetBusPosition($tripId),
'stops' => $stStops->fetchAll(),
]);
backend/transit/trip/start.php
+51
View File
@@ -0,0 +1,51 @@
<?php
// transit/trip/start.php — السائق يبدأ الرحلة
require_once __DIR__ . '/../../transit/connect_app.php';
requireTransitFields(['trip_id', 'driver_transit_id', 'lat', 'lng']);
$tripId = filterRequest('trip_id', 'int');
$driverId = filterRequest('driver_transit_id', 'int');
$lat = (float)filterRequest('lat');
$lng = (float)filterRequest('lng');
$st = $transit_con->prepare(
"SELECT t.id, t.route_id, t.status, r.name_ar AS route_name, d.main_driver_id
FROM transit_trips t
JOIN transit_routes r ON r.id = t.route_id
JOIN transit_drivers d ON d.id = t.driver_id
WHERE t.id=? AND t.driver_id=? LIMIT 1"
);
$st->execute([$tripId, $driverId]);
$trip = $st->fetch();
if (!$trip) jsonError('Trip not found', 404);
if ($trip['status'] === 'started') jsonError('Trip already started', 409);
if ($trip['status'] === 'completed') jsonError('Trip already completed', 409);
if ($trip['status'] === 'cancelled') jsonError('Trip was cancelled', 409);
if (!$trip['main_driver_id']) jsonError('Driver has no linked main account — cannot start live tracking', 422);
$transit_con->prepare(
"UPDATE transit_trips SET status='started', started_at=NOW(), current_stop_seq=1 WHERE id=?"
)->execute([$tripId]);
transitUpdateBusPosition($tripId, $lat, $lng);
// تخزين ملكية الرحلة — يتحقق منها driver_socket قبل أي بثّ حي للراكبين
transitSetTripOwner($tripId, (string)$trip['main_driver_id'], (int)$trip['route_id']);
global $redis;
if ($redis) {
$redis->set("transit:trip:{$tripId}:status", 'started');
$redis->expire("transit:trip:{$tripId}:status", 86400);
}
transitSendTopicNotification(
transitRouteTopic((int)$trip['route_id']),
'الباص انطلق الآن',
'خط ' . $trip['route_name'] . ' بدأ رحلته',
['type' => 'transit_started', 'trip_id' => (string)$tripId]
);
jsonSuccess(['trip_id' => $tripId, 'status' => 'started', 'started_at' => date('Y-m-d H:i:s')], 'Trip started');
backend/transit/trip/today.php
+70
View File
@@ -0,0 +1,70 @@
<?php
// transit/trip/today.php — السائق يجلب رحلاته اليوم (تُنشأ تلقائياً من الجداول)
require_once __DIR__ . '/../../transit/connect_app.php';
$driverTransitId = filterRequest('driver_transit_id', 'int');
if (!$driverTransitId) jsonError('driver_transit_id is required', 400);
$chk = $transit_con->prepare(
"SELECT id, org_id FROM transit_drivers WHERE id=? AND status='active' LIMIT 1"
);
$chk->execute([$driverTransitId]);
$driver = $chk->fetch();
if (!$driver) jsonError('Driver not found or not active', 403);
$today = date('Y-m-d');
// أنشئ رحلات اليوم من الجداول النشطة إن لم تُنشأ بعد
$stScheds = $transit_con->prepare(
"SELECT id AS schedule_id, route_id, vehicle_id, days_mask
FROM transit_schedules
WHERE driver_id=? AND org_id=? AND is_active=1
AND valid_from <= ? AND (valid_until IS NULL OR valid_until >= ?)"
);
$stScheds->execute([$driverTransitId, $driver['org_id'], $today, $today]);
foreach ($stScheds->fetchAll() as $sch) {
if (!transitDayActive((int)$sch['days_mask'])) continue;
$ex = $transit_con->prepare("SELECT id FROM transit_trips WHERE schedule_id=? AND trip_date=? LIMIT 1");
$ex->execute([$sch['schedule_id'], $today]);
if (!$ex->fetch()) {
$transit_con->prepare(
"INSERT INTO transit_trips
(schedule_id, route_id, org_id, driver_id, vehicle_id, trip_date, status)
VALUES (?,?,?,?,?,?,'scheduled')"
)->execute([
$sch['schedule_id'], $sch['route_id'], $driver['org_id'],
$driverTransitId, $sch['vehicle_id'], $today,
]);
}
}
// اجلب رحلات اليوم مع التفاصيل
$stTrips = $transit_con->prepare(
"SELECT t.id, t.route_id, t.status, t.delay_minutes, t.current_stop_seq,
t.started_at, t.completed_at,
r.name_ar AS route_name, r.polyline,
sc.departure_time,
v.plate AS vehicle_plate, v.capacity
FROM transit_trips t
JOIN transit_routes r ON r.id = t.route_id
JOIN transit_schedules sc ON sc.id = t.schedule_id
LEFT JOIN transit_vehicles v ON v.id = t.vehicle_id
WHERE t.driver_id=? AND t.trip_date=?
ORDER BY sc.departure_time ASC"
);
$stTrips->execute([$driverTransitId, $today]);
$trips = $stTrips->fetchAll();
$stStops = $transit_con->prepare(
"SELECT sequence, name_ar, latitude, longitude, geofence_radius, eta_offset_min
FROM transit_stops WHERE route_id=? ORDER BY sequence ASC"
);
foreach ($trips as &$trip) {
$stStops->execute([$trip['route_id']]);
$trip['stops'] = $stStops->fetchAll();
}
unset($trip);
jsonSuccess(['date' => $today, 'trips' => $trips]);
backend/transit/trip/update_position.php
+38
View File
@@ -0,0 +1,38 @@
<?php
// transit/trip/update_position.php
// ⚠️ مهجور (fallback فقط): المسار الأساسي لموقع الباص هو WebSocket:
// سائق الباص يبعث socket.emit('update_bus_location', {...}) إلى driver_socket:2020
// الذي يخزّن الموقع ويبثّه حياً لكل ركاب الخط عبر passenger_socket.
// هذا الـ endpoint يكتب الموقع في Redis فقط ولا يبثّه للركاب — لا تستخدمه
// إلا كخطة بديلة عند تعذّر السوكت. الموقع يُخزَّن على Redis سيرفر الموقع.
require_once __DIR__ . '/../../core/bootstrap.php';
require_once __DIR__ . '/../functions.php';
try { $transit_con = Database::get('transit'); }
catch (Exception $e) { http_response_code(503); exit; }
$tripId = filterRequest('trip_id', 'int');
$driverId = filterRequest('driver_transit_id', 'int');
$lat = (float)filterRequest('lat');
$lng = (float)filterRequest('lng');
$stopSeq = filterRequest('current_stop_seq', 'int');
if (!$tripId || !$driverId || !$lat || !$lng) {
jsonError('Missing required fields', 400);
}
transitUpdateBusPosition($tripId, $lat, $lng);
if ($stopSeq !== null) {
$transit_con->prepare(
"UPDATE transit_trips SET current_stop_seq=?, updated_at=NOW() WHERE id=? AND driver_id=?"
)->execute([$stopSeq, $tripId, $driverId]);
global $redis;
if ($redis) {
$redis->publish("transit:trip:{$tripId}:stop", json_encode(['seq' => $stopSeq, 'ts' => time()]));
}
}
jsonSuccess(['ok' => true]);