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

Fix 500 in payment endpoints by using separate connections

Browse Source
This commit is contained in:
Hamza-Ayed
2026-08-01 15:54:52 +03:00
parent 3c6ed0d2b1
commit 7efb913245
3 changed files with 35 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
payment_server/v2/main/ride/payment/getAllPayment.php
+23 -55
View File
@@ -2,63 +2,31 @@
include "../../connect.php";
$driverID = filterRequest("driverID");
$sql = "SELECT
(
SELECT
COUNT(*)
FROM
`rideDB`.`ride`
WHERE
LOWER(`ride`.`status`) IN ('finished','completed')
AND `ride`.`created_at` BETWEEN CURRENT_DATE() + INTERVAL 7 HOUR AND CURRENT_DATE() + INTERVAL 10 HOUR
AND `ride`.`driver_id` = :driverID
) AS morning_count,
(
SELECT
COUNT(*)
FROM
`rideDB`.`ride`
WHERE
LOWER(`ride`.`status`) IN ('finished','completed')
AND `ride`.`created_at` BETWEEN CURRENT_DATE() + INTERVAL 15 HOUR AND CURRENT_DATE() + INTERVAL 18 HOUR
AND `ride`.`driver_id` = :driverID
) AS afternoon_count,
(
SELECT
COALESCE(SUM(amount), 0) AS total_amount
FROM
payments
WHERE
isGiven = 'waiting' AND `driverID` = :driverID
) AS total_amount,
(
SELECT
COALESCE(SUM(price), 0) AS total_amount
FROM
`rideDB`.`ride`
WHERE
`driver_id` = :driverID
AND LOWER(`ride`.`status`) IN ('finished','completed')
AND `ride`.`created_at` > CURRENT_DATE() - INTERVAL 1 WEEK
) AS total_amount_last_week
FROM
dual
LIMIT 1;
";
/**
* كان معرّف السائق يُدمج في نص الاستعلام مباشرةً (حقن SQL)، وكانت الحالة
* تُطابق 'Finished' فقط بينما خط الرحلات الحالي يكتب 'completed' — فتظهر
* أرباح السائق ورحلاته أصفاراً.
*/
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':driverID', $driverID);
$stmt->execute();
// 1. Get ride stats using $conRide
$sqlRide = "SELECT
(SELECT COUNT(*) FROM `ride` WHERE LOWER(`status`) IN ('finished','completed') AND `created_at` BETWEEN CURRENT_DATE() + INTERVAL 7 HOUR AND CURRENT_DATE() + INTERVAL 10 HOUR AND `driver_id` = :driverID) AS morning_count,
(SELECT COUNT(*) FROM `ride` WHERE LOWER(`status`) IN ('finished','completed') AND `created_at` BETWEEN CURRENT_DATE() + INTERVAL 15 HOUR AND CURRENT_DATE() + INTERVAL 18 HOUR AND `driver_id` = :driverID) AS afternoon_count,
(SELECT COALESCE(SUM(price), 0) FROM `ride` WHERE `driver_id` = :driverID AND LOWER(`status`) IN ('finished','completed') AND `created_at` > CURRENT_DATE() - INTERVAL 1 WEEK) AS total_amount_last_week
FROM dual";
$stmtRide = $conRide->prepare($sqlRide);
$stmtRide->bindValue(':driverID', $driverID);
$stmtRide->execute();
$rideStats = $stmtRide->fetch(PDO::FETCH_ASSOC) ?: [];
if ($stmt->rowCount() > 0) {
$row = $stmt->fetchAll(PDO::FETCH_ASSOC);
// 2. Get payment stats using $con
$sqlPayment = "SELECT COALESCE(SUM(amount), 0) AS total_amount FROM payments WHERE isGiven = 'waiting' AND `driverID` = :driverID";
$stmtPayment = $con->prepare($sqlPayment);
$stmtPayment->bindValue(':driverID', $driverID);
$stmtPayment->execute();
$paymentStats = $stmtPayment->fetch(PDO::FETCH_ASSOC) ?: [];
// 3. Combine
if (!empty($rideStats) || !empty($paymentStats)) {
$row = [
array_merge($rideStats, $paymentStats)
];
printSuccess($row);
} else {
printFailure("No wallet record found");