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

Update: 2026-07-02 15:35:12

Browse Source
This commit is contained in:
Hamza-Ayed
2026-07-02 15:35:12 +03:00
parent 2adf195b36
commit 75e6fc42d7
17 changed files with 389 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/ride/gamification/getGamificationDashboard.php
+65 -9
View File
@@ -8,10 +8,30 @@ if (!$driver_id) {
}
try {
// 1. Get Country and Currency Info
$stmtKazan = $con->prepare("SELECT country, currency FROM kazan LIMIT 1");
$stmtKazan->execute();
$kazan = $stmtKazan->fetch(PDO::FETCH_ASSOC) ?: ["country" => "Jordan", "currency" => "JOD"];
global $redis;
$redisKey = "gamification_dashboard:{$driver_id}";
// 1. Try to read from Redis first
if (isset($redis)) {
try {
$cached = $redis->get($redisKey);
if ($cached) {
$data = json_decode($cached, true);
if ($data) {
jsonSuccess($data);
exit;
}
}
} catch (Exception $e) {
error_log("Redis read error in getGamificationDashboard: " . $e->getMessage());
}
}
// 2. Fallback to Database & External API
// Get Country and Currency Info from Environment Variables (to avoid querying kazan table)
$country = getenv('APP_COUNTRY') ?: getenv('COUNTRY') ?: "Jordan";
$currency = getenv('APP_CURRENCY') ?: getenv('CURRENCY') ?: "JOD";
$kazan = ["country" => $country, "currency" => $currency];
// 2. Get Total Completed Trips
$stmtTrips = $con->prepare("SELECT COUNT(*) as count FROM `ride` WHERE driver_id = :driver_id AND status = 'Finished'");
@@ -94,10 +114,33 @@ try {
}
// 8. Calculate Normalized Points
// 10 pts per finished trip, 100 pts per referral invite, 2 pts per behavior score point + claimed challenge points
$normalizedPoints = ($totalTrips * 10) + ($totalReferrals * 100) + ((int)$behavior['avg_score'] * 2) + $challengePoints;
jsonSuccess([
// 9. Fetch Available Challenges
$stmtCh = $con->prepare("SELECT * FROM gamification_challenges WHERE is_active = 1 AND country = :country ORDER BY target_count ASC");
$stmtCh->execute([':country' => $kazan['country']]);
$challengesRaw = $stmtCh->fetchAll(PDO::FETCH_ASSOC);
$challenges = [];
$tier = 'Bronze'; // Placeholder logic
foreach ($challengesRaw as $chRaw) {
$isCompleted = false;
$isClaimed = false;
$challenges[] = [
'id' => (int)$chRaw['id'],
'title' => $chRaw['title'],
'description' => $chRaw['description'],
'type' => $chRaw['challenge_type'],
'target' => (int)$chRaw['target_count'],
'reward_amount' => (float)$chRaw['reward_amount'],
'reward_type' => $chRaw['reward_type'],
'is_completed' => $isCompleted,
'is_claimed' => $isClaimed
];
}
$responseData = [
"country" => $kazan["country"],
"currency" => $kazan["currency"],
"totalTrips" => $totalTrips,
@@ -110,10 +153,23 @@ try {
"maxSpeed" => (float)$behavior["max_speed"],
"todayTrips" => $todayTrips,
"todayEarnings" => $todayEarnings,
"totalPoints" => $normalizedPoints
]);
"totalPoints" => $normalizedPoints,
"tier" => $tier,
"challenges" => $challenges
];
} catch (PDOException $e) {
// 10. Save the compiled data into Redis
if (isset($redis)) {
try {
$redis->setex($redisKey, 900, json_encode($responseData));
} catch (Exception $e) {
error_log("Redis write error in getGamificationDashboard: " . $e->getMessage());
}
}
jsonSuccess($responseData);
} catch (Exception $e) {
error_log("getGamificationDashboard Error: " . $e->getMessage());
jsonError("An internal error occurred. Please try again later.");
}
backend/ride/gamification/getLeaderboard.php
+34 -2
View File
@@ -4,6 +4,26 @@ require_once __DIR__ . '/../../connect.php';
$type = isset($_POST['type']) ? filterRequest("type") : 'trips';
try {
global $redis;
$redisKey = "gamification_leaderboard:{$type}";
// 1. Try to read from Redis first
if (isset($redis)) {
try {
$cached = $redis->get($redisKey);
if ($cached) {
$data = json_decode($cached, true);
if ($data !== null) {
jsonSuccess($data);
exit;
}
}
} catch (Exception $e) {
error_log("Redis read error in getLeaderboard: " . $e->getMessage());
}
}
// 2. Fallback to Database
if ($type === 'earnings') {
$sql = "
SELECT
@@ -53,8 +73,20 @@ if ($stmt->rowCount() > 0) {
$row['rank'] = $rank++;
}
jsonSuccess($rows);
$responseData = $rows;
} else {
jsonSuccess([]);
$responseData = [];
}
// 3. Save the DB result into Redis for future reads
if (isset($redis)) {
try {
// Cache leaderboard for 1 hour (3600 seconds)
$redis->setex($redisKey, 3600, json_encode($responseData));
} catch (Exception $e) {
error_log("Redis write error in getLeaderboard: " . $e->getMessage());
}
}
jsonSuccess($responseData);
?>
backend/ride/gamification/get_streak.php
+69
View File
@@ -0,0 +1,69 @@
<?php
require_once __DIR__ . '/../../connect.php';
$driver_id = filterRequest("driver_id");
if (empty($driver_id)) {
jsonError("Missing driver_id");
exit;
}
global $redis;
$redisKey = "driver_streak:{$driver_id}";
// 1. Try to read from Redis first (Cache-Aside pattern)
if (isset($redis)) {
try {
$cached = $redis->get($redisKey);
if ($cached) {
$data = json_decode($cached, true);
if ($data) {
// Return immediately if found in cache!
jsonSuccess($data);
exit;
}
}
} catch (Exception $e) {
error_log("Redis read error in get_streak: " . $e->getMessage());
}
}
// 2. Fallback to Database if not found in Redis
$stmt = $con->prepare("SELECT current_streak, zero_commission_until FROM driver_streaks WHERE driver_id = ?");
$stmt->execute([$driver_id]);
$streak = $stmt->fetch(PDO::FETCH_ASSOC);
if ($streak) {
$now = new DateTime();
$until = new DateTime($streak['zero_commission_until']);
$isActive = false;
if ($streak['zero_commission_until'] !== '2000-01-01 00:00:00' && $now < $until) {
$isActive = true;
}
$responseData = [
'streak_count' => intval($streak['current_streak']),
'is_zero_commission_active' => $isActive,
'zero_commission_until' => $streak['zero_commission_until']
];
} else {
// Default if no record yet
$responseData = [
'streak_count' => 0,
'is_zero_commission_active' => false,
'zero_commission_until' => '2000-01-01 00:00:00'
];
}
// 3. Save the DB result into Redis for future reads
if (isset($redis)) {
try {
// Cache it for 2 hours (7200 seconds)
$redis->setex($redisKey, 7200, json_encode($responseData));
} catch (Exception $e) {
error_log("Redis write error in get_streak: " . $e->getMessage());
}
}
jsonSuccess($responseData);
?>
backend/ride/notificationCaptain/get.php
+3 -3
View File
@@ -4,10 +4,10 @@ require_once __DIR__ . '/../../connect.php';
$driverID = filterRequest("driverID");
$sql = "SELECT * FROM `notificationCaptain`
WHERE `driverID` = :driverID
AND `dateCreated` > DATE_SUB(NOW(), INTERVAL 2 DAY)
WHERE (`driverID` = :driverID OR `driverID` = 'all')
AND `dateCreated` > DATE_SUB(NOW(), INTERVAL 7 DAY)
ORDER BY `dateCreated` DESC
LIMIT 10";
LIMIT 50";
$stmt = $con->prepare($sql);
$stmt->bindParam(':driverID', $driverID, PDO::PARAM_STR);
backend/ride/rides/cancelRideFromDriver.php
+9
View File
@@ -3,6 +3,7 @@
// تأكد أن هذا الملف يحتوي على دوال الإشعارات (notifyPassengerOnRideServer)
require_once __DIR__ . '/../../connect.php';
require_once __DIR__ . '/streak_helper.php';
// 🚀 تسجيل بداية العملية
error_log("🚀 [cancelRide.php] Request Started to Cancel Ride From Driver.");
@@ -55,6 +56,14 @@ try {
// تحديث جدول driver_orders أيضاً لتوحيد الحالة (اختياري ولكنه مفضل)
$stmtDriverOrder = $con->prepare("UPDATE driver_orders SET status = ? WHERE order_id = ?");
$stmtDriverOrder->execute([$newStatus, $id]);
// 🆕 تصفير التتابع لأن السائق ألغى الرحلة
$stmtGetDriver = $con->prepare("SELECT driver_id FROM ride WHERE id = ?");
$stmtGetDriver->execute([$id]);
$driver_id_to_reset = $stmtGetDriver->fetchColumn() ?: $user_id;
if ($driver_id_to_reset) {
handleDriverStreak($con, $driver_id_to_reset, 'reset');
}
$con->commit();
} catch (Exception $eLocal) {
backend/ride/rides/cancel_ride_by_driver.php
+5
View File
@@ -8,6 +8,8 @@ try {
error_log("[cancel_ride_by_driver] Failed to connect to Ride Database: " . $e->getMessage());
}
require_once __DIR__ . '/streak_helper.php';
$rideId = filterRequest("ride_id");
$driverId = filterRequest("driver_id");
$reason = filterRequest("reason");
@@ -74,6 +76,9 @@ try {
if (isset($con_ride)) {
$con_ride->prepare($sqlRide)->execute([$statusText, $rideId]);
}
// 🆕 تصفير التتابع لأن السائق ألغى الرحلة
handleDriverStreak($con, $driverId, 'reset');
// ---------------------------------------------------------
// 4. إشعار الراكب
backend/ride/rides/finish_ride_updates.php
+36 -1
View File
@@ -7,6 +7,8 @@ try {
error_log("[finish_ride_updates] Failed to connect to Ride Database: " . $e->getMessage());
}
require_once __DIR__ . '/streak_helper.php';
// ============================================================
// finish_ride_updates.php — Atomic Server-to-Server
// ============================================================
@@ -133,6 +135,16 @@ try {
$durationMin = intval(preg_replace('/[^0-9]/', '', $actualDuration));
$calculated = ($distanceKm * $perKmRate) + ($durationMin * $perMinRate);
// 🆕 تطبيق خصم التتابع (إعفاء من العمولة) - نحدد المتغير فقط لكن لا نغير السعر على الراكب
$is_zero_commission = false;
if (hasZeroCommission($con, $driver_id)) {
$is_zero_commission = true;
error_log("[finish_ride_updates] Driver $driver_id has active 0% commission streak!");
}
// السعر النهائي يجب أن يتضمن العمولة دائماً لكي يدفعها الراكب،
// لكن إذا كانت العمولة صفر للسائق، يتم إعطاؤها للسائق بدلاً من الشركة عبر السيرفر المالي.
$calculated *= (1 + ($kazanPercent / 100));
$finalPrice = max($quotedPrice, round($calculated, 2));
@@ -198,6 +210,8 @@ try {
'authToken' => $driver_token,
'currency' => $currency, // 🆕 إرسال العملة لمخدم الدفع
'country_code' => $countryCode, // 🆕 إرسال الدولة لمخدم الدفع
'is_zero_commission' => isset($is_zero_commission) && $is_zero_commission ? 'true' : 'false', // 🆕 إرسال إعفاء العمولة
'kazanPercent' => $kazanPercent, // 🆕 إرسال نسبة العمولة متغيرة حسب الدولة
];
$ch = curl_init(WALLET_PAYMENT_URL);
@@ -244,6 +258,9 @@ try {
// ✅ Payment succeeded — COMMIT
$con->commit();
// 🆕 Update Driver Streak (Increment because ride is finished successfully)
handleDriverStreak($con, $driver_id, 'increment');
// ============================================================
// 5. Notifications (After successful commit)
@@ -287,11 +304,29 @@ try {
"المبلغ المطلوب: " . $finalPrice . " " . $currency,
$fcmData,
'Driver Finish Trip',
false
$passengerId
);
}
}
// 🆕 c) Driver notification for Zero Commission
if (isset($is_zero_commission) && $is_zero_commission && !empty($driver_token)) {
$fcmDriverData = [
'ride_id' => (string)$rideId,
'status' => 'streak_reward'
];
sendAndSaveDriverNotification(
$con,
$driver_id,
$driver_token,
"🔥 مكافأة التتابع",
"أنت بطل! لم يتم خصم عمولة لهذه الرحلة لأنك حافظت على تتابع قبول الرحلات.",
$fcmDriverData,
'Zero Commission Reward'
);
}
// ============================================================
// 6. Return Success with server-calculated price + currency
// ============================================================
backend/ride/rides/streak_helper.php
+76
View File
@@ -0,0 +1,76 @@
<?php
// backend/ride/rides/streak_helper.php
function handleDriverStreak($con, $driver_id, $action) {
try {
if ($action === 'reset') {
$stmt = $con->prepare("
INSERT INTO driver_streaks (driver_id, current_streak, zero_commission_until)
VALUES (?, 0, NULL)
ON DUPLICATE KEY UPDATE current_streak = 0
");
$stmt->execute([$driver_id]);
} elseif ($action === 'increment') {
$stmt = $con->prepare("SELECT current_streak FROM driver_streaks WHERE driver_id = ?");
$stmt->execute([$driver_id]);
$row = $stmt->fetch(PDO::FETCH_ASSOC);
$current = $row ? intval($row['current_streak']) + 1 : 1;
$zero_until = NULL;
if ($current >= 5) {
// Reward unlocked! 0% commission until end of today
$zero_until = date('Y-m-d 23:59:59');
$current = 0; // reset for next streak
}
$stmt2 = $con->prepare("
INSERT INTO driver_streaks (driver_id, current_streak, best_streak, zero_commission_until)
VALUES (?, ?, ?, ?)
ON DUPLICATE KEY UPDATE
current_streak = ?,
best_streak = GREATEST(best_streak, ?),
zero_commission_until = COALESCE(?, zero_commission_until)
");
$stmt2->execute([
$driver_id,
$current,
$current,
$zero_until,
$current,
$current,
$zero_until
]);
}
// 🆕 Invalidate Redis Cache (Cache-Aside pattern)
global $redis;
if (isset($redis)) {
try {
$redis->del("driver_streak:{$driver_id}");
$redis->del("gamification_dashboard:{$driver_id}");
} catch (Exception $e) {
error_log("[streak_helper] Redis Cache Invalidation Error: " . $e->getMessage());
}
}
} catch (Exception $e) {
error_log("[streak_helper] Error: " . $e->getMessage());
}
}
function hasZeroCommission($con, $driver_id) {
try {
$stmt = $con->prepare("SELECT zero_commission_until FROM driver_streaks WHERE driver_id = ?");
$stmt->execute([$driver_id]);
$row = $stmt->fetch(PDO::FETCH_ASSOC);
if ($row && !empty($row['zero_commission_until'])) {
return (strtotime($row['zero_commission_until']) > time());
}
} catch (Exception $e) {
error_log("[streak_helper] Error checking commission: " . $e->getMessage());
}
return false;
}
?>