feat: استيراد كود سيرو إلى تريبز (سيرو @ecfe7568) — بلا تعديل
قرار المالك 2026-07-27: باك إند سيرو PHP هو المعتمد، وتطبيقاته المجرّبة ميدانياً تحل محل إعادة البناء المؤرشفة. سيرو نفسه لم يُمسّ. الخريطة: backend · payment_server · loction_server · ride_server · passenger_server · docker · dashboard · stress_test → الجذر siro_rider → apps/rider siro_driver → apps/driver siro_admin → dashboards/admin siro_service → dashboards/service android_bot → apps/android_bot socialBot → apps/socialBot نُسخ المتعقَّب في git سيرو فقط عبر `git archive` (3,198 ملفاً / ~169 م.ب) لا `cp -r` — فاستُثنيت مخلفات البناء تلقائياً. بلا أي تعديل محتوى عمداً: كل ما يلي يصير فرقاً مقروءاً مقابل المصدر. لم يُستورد وسببه: siromove.com (الموقع التسويقي يبقى marketing/ في تريبز، سيرو فيه 8 ملفات) · docs و planning (تريبز له docs/ الخاص) · deploy.sh (ليس نشراً على سيرفر بل `git add . && git push origin --all` — فخّ في مستودع آخر) · transit_dashboard (بانتظار قرار مصير backend-transit و dashboards/transit-web). ⚠️ لا يبني بعد — ثلاثة نواقص متوقعة ومقصودة: 1. `.env` و `lib/env/env.g.dart` غير متعقَّبين في سيرو (أسرار لكل مستأجر): كل تطبيق فلاتر يحتاج .env خاصاً ثم توليد env.g.dart بـ build_runner. 2. إعدادات Firebase (9 ملفات google-services.json و GoogleService-Info.plist) يستبعدها .gitignore تريبز — ولكل مستأجر مشروع Firebase خاص أصلاً. 3. apps/driver في سيرو يشير إلى `../../Intaleq/packages/get` خارج المستودع → يجب ضمّ الحزم داخله أسوة بـ apps/rider. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
9909d9b4c1
commit
4d8414c96b
@@ -0,0 +1,56 @@
|
||||
<?php
|
||||
// transit/route/add.php — إضافة خط جديد (مسودة)
|
||||
|
||||
require_once __DIR__ . '/../../transit/connect_admin.php';
|
||||
|
||||
$nameAr = filterRequest('name_ar');
|
||||
if (!$nameAr) jsonError('name_ar is required');
|
||||
|
||||
$direction = filterRequest('direction') ?: 'outbound';
|
||||
if (!in_array($direction, ['outbound','inbound','circular'])) $direction = 'outbound';
|
||||
|
||||
$stops = json_decode(filterRequest('stops') ?? '[]', true) ?: [];
|
||||
|
||||
$transit_con->beginTransaction();
|
||||
try {
|
||||
$transit_con->prepare(
|
||||
"INSERT INTO transit_routes
|
||||
(org_id,name_ar,name_en,direction,polyline,distance_km,duration_min,status,created_by)
|
||||
VALUES (?,?,?,?,?,?,?,'draft',?)"
|
||||
)->execute([
|
||||
$transit_org_id, $nameAr,
|
||||
filterRequest('name_en'),
|
||||
$direction,
|
||||
filterRequest('polyline'),
|
||||
filterRequest('distance_km','float'),
|
||||
filterRequest('duration_min','int'),
|
||||
$transit_admin_id,
|
||||
]);
|
||||
|
||||
$routeId = (int)$transit_con->lastInsertId();
|
||||
|
||||
$insertStop = $transit_con->prepare(
|
||||
"INSERT INTO transit_stops
|
||||
(route_id,org_id,sequence,name_ar,name_en,latitude,longitude,geofence_radius,eta_offset_min,is_major)
|
||||
VALUES (?,?,?,?,?,?,?,?,?,?)"
|
||||
);
|
||||
foreach ($stops as $i => $s) {
|
||||
if (empty($s['lat']) || empty($s['lng']) || empty($s['name_ar'])) continue;
|
||||
$insertStop->execute([
|
||||
$routeId, $transit_org_id, $i + 1,
|
||||
$s['name_ar'], $s['name_en'] ?? null,
|
||||
(float)$s['lat'], (float)$s['lng'],
|
||||
(int)($s['radius'] ?? 150),
|
||||
isset($s['eta_offset_min']) ? (int)$s['eta_offset_min'] : null,
|
||||
(int)($s['is_major'] ?? 0),
|
||||
]);
|
||||
}
|
||||
|
||||
$transit_con->commit();
|
||||
} catch (Throwable $e) {
|
||||
$transit_con->rollBack();
|
||||
appLog('[TRANSIT][ROUTE] ' . $e->getMessage(), 'ERROR');
|
||||
jsonError('Failed to save route', 500);
|
||||
}
|
||||
|
||||
jsonSuccess(['route_id' => $routeId, 'stops_added' => count($stops)], 'Route saved as draft');
|
||||
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
// transit/route/for_org.php — الراكب يستعرض خطوط مؤسسته (يشترط عضوية نشطة)
|
||||
// POST: org_id
|
||||
|
||||
require_once __DIR__ . '/../../transit/connect_app.php';
|
||||
|
||||
if ($transit_user_role !== 'passenger') jsonError('Only passengers can browse routes', 403);
|
||||
|
||||
$orgId = filterRequest('org_id', 'int');
|
||||
if (!$orgId) jsonError('org_id is required', 400);
|
||||
|
||||
$chk = $transit_con->prepare(
|
||||
"SELECT id FROM transit_enrollments WHERE org_id=? AND passenger_id=? AND status='active' LIMIT 1"
|
||||
);
|
||||
$chk->execute([$orgId, $transit_user_id]);
|
||||
if (!$chk->fetch()) jsonError('Active enrollment required to view routes', 403);
|
||||
|
||||
$st = $transit_con->prepare(
|
||||
"SELECT id, name_ar, name_en, direction, distance_km, duration_min, status
|
||||
FROM transit_routes WHERE org_id=? AND status='active' ORDER BY name_ar ASC"
|
||||
);
|
||||
$st->execute([$orgId]);
|
||||
$routes = $st->fetchAll();
|
||||
|
||||
if ($routes) {
|
||||
$ids = implode(',', array_map('intval', array_column($routes, 'id')));
|
||||
$counts = $transit_con->query(
|
||||
"SELECT route_id, COUNT(*) c FROM transit_stops WHERE route_id IN ($ids) GROUP BY route_id"
|
||||
)->fetchAll(PDO::FETCH_KEY_PAIR);
|
||||
foreach ($routes as &$r) $r['stop_count'] = (int)($counts[$r['id']] ?? 0);
|
||||
unset($r);
|
||||
}
|
||||
|
||||
jsonSuccess(['routes' => $routes]);
|
||||
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
// transit/route/get.php — تفاصيل خط + محطاته + جداوله
|
||||
|
||||
require_once __DIR__ . '/../../transit/connect_admin.php';
|
||||
|
||||
$routeId = filterRequest('route_id', 'int');
|
||||
if (!$routeId) jsonError('route_id is required');
|
||||
|
||||
$st = $transit_con->prepare("SELECT * FROM transit_routes WHERE id=? AND org_id=? LIMIT 1");
|
||||
$st->execute([$routeId, $transit_org_id]);
|
||||
$route = $st->fetch();
|
||||
if (!$route) jsonError('Route not found', 404);
|
||||
|
||||
$stStops = $transit_con->prepare(
|
||||
"SELECT id,sequence,name_ar,name_en,latitude,longitude,geofence_radius,eta_offset_min,is_major
|
||||
FROM transit_stops WHERE route_id=? ORDER BY sequence ASC"
|
||||
);
|
||||
$stStops->execute([$routeId]);
|
||||
$route['stops'] = $stStops->fetchAll();
|
||||
|
||||
$stSch = $transit_con->prepare(
|
||||
"SELECT s.id, s.departure_time, s.days_mask, s.valid_from, s.valid_until, s.is_active,
|
||||
d.name AS driver_name, v.plate AS vehicle_plate
|
||||
FROM transit_schedules s
|
||||
LEFT JOIN transit_drivers d ON d.id=s.driver_id
|
||||
LEFT JOIN transit_vehicles v ON v.id=s.vehicle_id
|
||||
WHERE s.route_id=? AND s.org_id=? ORDER BY s.departure_time ASC"
|
||||
);
|
||||
$stSch->execute([$routeId, $transit_org_id]);
|
||||
$route['schedules'] = $stSch->fetchAll();
|
||||
|
||||
jsonSuccess(['route' => $route]);
|
||||
@@ -0,0 +1,28 @@
|
||||
<?php
|
||||
// transit/route/list.php
|
||||
|
||||
require_once __DIR__ . '/../../transit/connect_admin.php';
|
||||
|
||||
$status = filterRequest('status') ?: 'active';
|
||||
if (!in_array($status, ['all','draft','active','suspended','rejected'])) $status = 'active';
|
||||
|
||||
$sql = "SELECT id, name_ar, name_en, direction, distance_km, duration_min, status, created_at FROM transit_routes WHERE org_id=?";
|
||||
$params = [$transit_org_id];
|
||||
if ($status !== 'all') { $sql .= " AND status=?"; $params[] = $status; }
|
||||
$sql .= " ORDER BY name_ar ASC";
|
||||
|
||||
$st = $transit_con->prepare($sql);
|
||||
$st->execute($params);
|
||||
$routes = $st->fetchAll();
|
||||
|
||||
if ($routes) {
|
||||
$ids = implode(',', array_map('intval', array_column($routes, 'id')));
|
||||
$cntSt = $transit_con->query(
|
||||
"SELECT route_id, COUNT(*) cnt FROM transit_stops WHERE route_id IN ($ids) GROUP BY route_id"
|
||||
);
|
||||
$counts = $cntSt ? array_column($cntSt->fetchAll(), 'cnt', 'route_id') : [];
|
||||
foreach ($routes as &$r) $r['stop_count'] = (int)($counts[$r['id']] ?? 0);
|
||||
unset($r);
|
||||
}
|
||||
|
||||
jsonSuccess(['routes' => $routes]);
|
||||
@@ -0,0 +1,80 @@
|
||||
<?php
|
||||
// transit/route/update.php — تعديل خط قائم (اسم/اتجاه/مسار/محطات)
|
||||
// POST: route_id, name_ar, [name_en, direction, polyline, distance_km, duration_min], stops (JSON)
|
||||
//
|
||||
// أي تعديل على خط كان active أو suspended يُعيده إلى draft — يتطلب اعتماداً
|
||||
// جديداً من فريق سيرو (نفس مسار Admin/transit/route/approve.php)
|
||||
|
||||
require_once __DIR__ . '/../../transit/connect_admin.php';
|
||||
|
||||
$routeId = filterRequest('route_id', 'int');
|
||||
if (!$routeId) jsonError('route_id is required', 400);
|
||||
|
||||
$nameAr = filterRequest('name_ar');
|
||||
if (!$nameAr) jsonError('name_ar is required', 400);
|
||||
|
||||
$direction = filterRequest('direction') ?: 'outbound';
|
||||
if (!in_array($direction, ['outbound','inbound','circular'])) $direction = 'outbound';
|
||||
|
||||
$stops = json_decode(filterRequest('stops') ?? '[]', true) ?: [];
|
||||
|
||||
$chk = $transit_con->prepare("SELECT id, status FROM transit_routes WHERE id=? AND org_id=? LIMIT 1");
|
||||
$chk->execute([$routeId, $transit_org_id]);
|
||||
$route = $chk->fetch();
|
||||
if (!$route) jsonError('Route not found or access denied', 404);
|
||||
|
||||
// إن كان معتمداً أو موقوفاً، التعديل يعيده لمسودة بانتظار اعتماد جديد
|
||||
$newStatus = in_array($route['status'], ['active', 'suspended']) ? 'draft' : $route['status'];
|
||||
|
||||
$transit_con->beginTransaction();
|
||||
try {
|
||||
$transit_con->prepare(
|
||||
"UPDATE transit_routes
|
||||
SET name_ar=?, name_en=?, direction=?, polyline=?, distance_km=?, duration_min=?,
|
||||
status=?, approved_by=NULL, approved_at=NULL, updated_at=NOW()
|
||||
WHERE id=?"
|
||||
)->execute([
|
||||
$nameAr,
|
||||
filterRequest('name_en'),
|
||||
$direction,
|
||||
filterRequest('polyline'),
|
||||
filterRequest('distance_km', 'float'),
|
||||
filterRequest('duration_min', 'int'),
|
||||
$newStatus,
|
||||
$routeId,
|
||||
]);
|
||||
|
||||
// استبدال كامل لمحطات الخط
|
||||
$transit_con->prepare("DELETE FROM transit_stops WHERE route_id=?")->execute([$routeId]);
|
||||
|
||||
$insertStop = $transit_con->prepare(
|
||||
"INSERT INTO transit_stops
|
||||
(route_id,org_id,sequence,name_ar,name_en,latitude,longitude,geofence_radius,eta_offset_min,is_major)
|
||||
VALUES (?,?,?,?,?,?,?,?,?,?)"
|
||||
);
|
||||
foreach ($stops as $i => $s) {
|
||||
if (empty($s['lat']) || empty($s['lng']) || empty($s['name_ar'])) continue;
|
||||
$insertStop->execute([
|
||||
$routeId, $transit_org_id, $i + 1,
|
||||
$s['name_ar'], $s['name_en'] ?? null,
|
||||
(float)$s['lat'], (float)$s['lng'],
|
||||
(int)($s['radius'] ?? 150),
|
||||
isset($s['eta_offset_min']) ? (int)$s['eta_offset_min'] : null,
|
||||
(int)($s['is_major'] ?? 0),
|
||||
]);
|
||||
}
|
||||
|
||||
$transit_con->commit();
|
||||
} catch (Throwable $e) {
|
||||
$transit_con->rollBack();
|
||||
appLog('[TRANSIT][ROUTE][update] ' . $e->getMessage(), 'ERROR');
|
||||
jsonError('Failed to update route', 500);
|
||||
}
|
||||
|
||||
appLog("[TRANSIT][ROUTE][update] route #{$routeId} org#{$transit_org_id} updated, status={$newStatus}");
|
||||
|
||||
jsonSuccess([
|
||||
'route_id' => $routeId,
|
||||
'status' => $newStatus,
|
||||
'stops_count'=> count($stops),
|
||||
], $newStatus === 'draft' ? 'Route updated — pending re-approval' : 'Route updated');
|
||||
Reference in New Issue
Block a user