Update: 2026-06-21 02:07:00

backend/ride/rides/finish_ride_updates.php

@@ -173,17 +173,16 @@ try {
         throw new Exception("Ride already finished or not found in local DB.");
     }
 
-    // 4b. Update driver_orders
-    $checkStmt = $con->prepare("SELECT order_id FROM driver_orders WHERE order_id = ?");
-    $checkStmt->execute([$rideId]);
-
-    if ($checkStmt->rowCount() > 0) {
-        $con->prepare("UPDATE driver_orders SET driver_id = ?, status = ?, created_at = NOW() WHERE order_id = ?")
-            ->execute([$driver_id, $newStatus, $rideId]);
-    } else {
-        $con->prepare("INSERT INTO driver_orders (driver_id, order_id, created_at, status) VALUES (?, ?, NOW(), ?)")
-            ->execute([$driver_id, $rideId, $newStatus]);
-    }
+    // 4b. Update driver_orders (Optimized atomic query)
+    $stmtOrders = $con->prepare("
+        INSERT INTO `driver_orders` (`driver_id`, `order_id`, `status`, `created_at`)
+        VALUES (?, ?, ?, NOW())
+        ON DUPLICATE KEY UPDATE
+            `driver_id`  = VALUES(`driver_id`),
+            `status`     = VALUES(`status`),
+            `created_at` = NOW()
+    ");
+    $stmtOrders->execute([$driver_id, $rideId, $newStatus]);
 
     // ============================================================
     // 4c. Server-to-Server Payment Processing (S2S)