From cbaf638abf6f2f5bcd1f1ded5a6fee7c619c012f Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Sat, 1 Aug 2026 23:53:34 +0300 Subject: [PATCH] Update: 2026-08-01 23:53:33 --- backend/bot/seed_kazan.php | 30 ++++++++++++++++++++++++++++++ backend/ride/firebase/send_fcm.php | 6 +++--- backend/schema_primary.sql | 15 +++++++++++++++ backend/schema_ride.sql | 19 +++++++++++++++++++ 4 files changed, 67 insertions(+), 3 deletions(-) diff --git a/backend/bot/seed_kazan.php b/backend/bot/seed_kazan.php index 8d5a74e..f5e044a 100644 --- a/backend/bot/seed_kazan.php +++ b/backend/bot/seed_kazan.php @@ -153,3 +153,33 @@ foreach ($defaultPricing as $row) { } echo "Kazan seeding completed.\n"; + +// Also ensure ride_chat_logs table exists in main DB and ride DB +$sqlCreateChat = "CREATE TABLE IF NOT EXISTS `ride_chat_logs` ( + `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT, + `ride_id` int NOT NULL, + `sender_id` varchar(111) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `receiver_id` varchar(111) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `sender_type` enum('passenger','driver') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `message_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_ride_id` (`ride_id`), + KEY `idx_created_at` (`created_at`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;"; + +try { + $con->exec($sqlCreateChat); + echo "Successfully created/verified `ride_chat_logs` table in main DB.\n"; +} catch (Exception $e) { + echo "Error creating `ride_chat_logs` in main DB: " . $e->getMessage() . "\n"; +} + +try { + $con_ride = Database::get('ride'); + $con_ride->exec($sqlCreateChat); + echo "Successfully created/verified `ride_chat_logs` table in ride DB.\n"; +} catch (Exception $e) { + echo "Error creating `ride_chat_logs` in ride DB: " . $e->getMessage() . "\n"; +} + diff --git a/backend/ride/firebase/send_fcm.php b/backend/ride/firebase/send_fcm.php index 6dcd463..2d9c1cf 100644 --- a/backend/ride/firebase/send_fcm.php +++ b/backend/ride/firebase/send_fcm.php @@ -19,9 +19,9 @@ function resolveServiceAccountPath(): string { if (!empty($envPath) && file_exists($envPath)) { return $envPath; } - // if (file_exists('/keys/firebase_service_account.json')) { - // return '/keys/firebase_service_account.json'; - // } + if (file_exists('/keys/firebase_service_account.json')) { + return '/keys/firebase_service_account.json'; + } if (file_exists('/keys/service-account.json')) { return '/keys/service-account.json'; } diff --git a/backend/schema_primary.sql b/backend/schema_primary.sql index 25c3d53..b8d3f38 100644 --- a/backend/schema_primary.sql +++ b/backend/schema_primary.sql @@ -2188,3 +2188,18 @@ CREATE TABLE IF NOT EXISTS `competitor_surge_insights` ( `detected_at` TIMESTAMP DEFAULT CURRENT_TIMESTAMP, UNIQUE KEY `unique_surge` (`competitor_name`, `country_code`, `peak_start_hour`, `peak_end_hour`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- 4. Chat Logs Table +CREATE TABLE IF NOT EXISTS `ride_chat_logs` ( + `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT, + `ride_id` int NOT NULL, + `sender_id` varchar(111) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `receiver_id` varchar(111) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `sender_type` enum('passenger','driver') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `message_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_ride_id` (`ride_id`), + KEY `idx_created_at` (`created_at`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + diff --git a/backend/schema_ride.sql b/backend/schema_ride.sql index e7a6a4e..c7c6f76 100644 --- a/backend/schema_ride.sql +++ b/backend/schema_ride.sql @@ -1696,6 +1696,25 @@ CREATE TABLE `write_argument_after_applied_from_background` ( ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `ride_chat_logs` +-- + +DROP TABLE IF EXISTS `ride_chat_logs`; +CREATE TABLE IF NOT EXISTS `ride_chat_logs` ( + `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT, + `ride_id` int NOT NULL, + `sender_id` varchar(111) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `receiver_id` varchar(111) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `sender_type` enum('passenger','driver') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `message_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_ride_id` (`ride_id`), + KEY `idx_created_at` (`created_at`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + + -- -- Dumping events for database 'intaleq-ridesDB' --