refactor: migrate amount fields to decimal and implement location service restriction for unsupported regions
This commit is contained in:
@@ -327,7 +327,7 @@ function notifyPassengerOnRideServer($passenger_id, $payload) {
|
||||
$postData = [
|
||||
'action' => 'update_ride_status',
|
||||
'passenger_id' => $passenger_id,
|
||||
'payload' => $payload
|
||||
'payload' => is_array($payload) ? json_encode($payload) : $payload
|
||||
];
|
||||
|
||||
$ch = curl_init();
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
-- 2026_07_24_fix_seferWallet_amount_varchar.sql
|
||||
-- Siro audit S5 (docs/21 في Tripz): seferWallet.amount في قاعدتي backend و ride_server
|
||||
-- كان varchar(10) — نفس عيب driverWallet/siroWallet في payment_server، لكن أخطر هنا:
|
||||
-- backend/ride/seferWallet/add.php:28 يُدخله بلا أي تحقّق رقمي (bindParam PARAM_STR
|
||||
-- على $amount = filterRequest("amount") مباشرة). يوسّعه إلى DECIMAL(12,3) NOT NULL.
|
||||
--
|
||||
-- ⚠️ توسيع العمود وحده لا يمنع إدخال قيمة نصية غير رقمية مستقبلاً — سيفشل الإدراج
|
||||
-- بخطأ SQL بدل التسرّب الصامت (تحسين، لكن add.php يحتاج فحص is_numeric($amount)
|
||||
-- قبل التنفيذ. هذا خارج نطاق S4/S5 الأصليين ولم يُصلَح هنا — سجّله كبند منفصل.
|
||||
--
|
||||
-- التطبيق: على قاعدتي backend و ride_server كلتيهما (الجدول مكرَّر بينهما).
|
||||
-- mysql <db_primary> < 2026_07_24_fix_seferWallet_amount_varchar.sql
|
||||
-- mysql <db_ride> < 2026_07_24_fix_seferWallet_amount_varchar.sql
|
||||
|
||||
START TRANSACTION;
|
||||
|
||||
ALTER TABLE `seferWallet`
|
||||
MODIFY COLUMN `amount` DECIMAL(12,3) NOT NULL;
|
||||
|
||||
COMMIT;
|
||||
|
||||
-- ── تراجع (لا يُنفَّذ تلقائياً) ─────────────────────────────────────
|
||||
-- ALTER TABLE `seferWallet` MODIFY COLUMN `amount` VARCHAR(10) NOT NULL;
|
||||
@@ -147,12 +147,23 @@ try {
|
||||
if ($driverRaw) {
|
||||
$encryptedFields = ['first_name', 'last_name', 'gender', 'phone', 'car_plate', 'token'];
|
||||
foreach ($driverRaw as $key => $value) {
|
||||
$driverInfo[$key] = (in_array($key, $encryptedFields) && !empty($value))
|
||||
? $encryptionHelper->decryptData($value)
|
||||
: $value;
|
||||
if (in_array($key, $encryptedFields, true) && !empty($value)) {
|
||||
$decrypted = false;
|
||||
try {
|
||||
$decrypted = $encryptionHelper->decryptData($value);
|
||||
} catch (\Throwable $e) {
|
||||
$decrypted = false;
|
||||
}
|
||||
$driverInfo[$key] = ($decrypted !== false && $decrypted !== null && $decrypted !== '') ? $decrypted : $value;
|
||||
} else {
|
||||
$driverInfo[$key] = $value;
|
||||
}
|
||||
}
|
||||
$driverInfo['driverName'] = trim(($driverInfo['first_name'] ?? '') . ' ' . ($driverInfo['last_name'] ?? ''));
|
||||
$driverInfo['ratingDriver'] = $driverInfo['ratingDriver'] ?: "5.0";
|
||||
if (empty($driverInfo['driverName']) && !empty($driverInfo['phone'])) {
|
||||
$driverInfo['driverName'] = $driverInfo['phone'];
|
||||
}
|
||||
$driverInfo['ratingDriver'] = !empty($driverInfo['ratingDriver']) ? (string)$driverInfo['ratingDriver'] : "5.0";
|
||||
$ratingValue = (float) $driverInfo['ratingDriver'];
|
||||
$ratingCount = (int) ($driverInfo['ratingCount'] ?? 0);
|
||||
$completedRides = (int) ($driverInfo['completedRides'] ?? 0);
|
||||
@@ -163,6 +174,19 @@ try {
|
||||
} else {
|
||||
$driverInfo['driverTier'] = 'Verified driver';
|
||||
}
|
||||
|
||||
if (isset($redisLocation) && $redisLocation) {
|
||||
try {
|
||||
$driverLoc = $redisLocation->hGetAll("driver:location:$driverId");
|
||||
if (!empty($driverLoc)) {
|
||||
$driverInfo['lat'] = (float)($driverLoc['lat'] ?? 0);
|
||||
$driverInfo['lng'] = (float)($driverLoc['lng'] ?? 0);
|
||||
$driverInfo['heading'] = (float)($driverLoc['heading'] ?? 0);
|
||||
}
|
||||
} catch (Exception $eLoc) {
|
||||
// Ignore location fetch error
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
@@ -1483,7 +1483,7 @@ CREATE TABLE `seferWallet` (
|
||||
`id` int NOT NULL AUTO_INCREMENT,
|
||||
`driverId` varchar(100) NOT NULL,
|
||||
`passengerId` varchar(100) NOT NULL,
|
||||
`amount` varchar(10) NOT NULL,
|
||||
`amount` decimal(12,3) NOT NULL,
|
||||
`paymentMethod` varchar(50) NOT NULL,
|
||||
`token` varchar(100) NOT NULL,
|
||||
`createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
|
||||
@@ -1385,7 +1385,7 @@ CREATE TABLE `seferWallet` (
|
||||
`id` int NOT NULL AUTO_INCREMENT,
|
||||
`driverId` varchar(100) NOT NULL,
|
||||
`passengerId` varchar(100) NOT NULL,
|
||||
`amount` varchar(10) NOT NULL,
|
||||
`amount` decimal(12,3) NOT NULL,
|
||||
`paymentMethod` varchar(50) NOT NULL,
|
||||
`token` varchar(100) NOT NULL,
|
||||
`createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
|
||||
Reference in New Issue
Block a user