Decrypt token before FCM push and fallback to SMS on push fail, also decrypt names in campaigns log

This commit is contained in:
Hamza-Ayed
2026-06-30 21:52:15 +03:00
parent de06d1cd75
commit cf748dfd7c
2 changed files with 42 additions and 25 deletions

View File

@@ -130,32 +130,39 @@ try {
$stmtToken->execute([':pid' => $passengerId]);
$fcmToken = $stmtToken->fetchColumn();
$pushSent = false;
if ($fcmToken) {
// Send FCM Push Notification (Free channel - no anti-spam restriction needed)
$fcmData = [
'type' => 'marketing_campaign',
'promo_code' => $promoCode,
'discount' => (string)$discountVal
];
$fcmResult = sendFcmNotification(
$fcmToken,
$pushTitle,
$pushBody,
$fcmData,
'Marketing',
'notification'
);
$decryptedToken = $encryptionHelper->decryptData($fcmToken);
if ($decryptedToken) {
// Send FCM Push Notification (Free channel - no anti-spam restriction needed)
$fcmData = [
'type' => 'marketing_campaign',
'promo_code' => $promoCode,
'discount' => (string)$discountVal
];
$fcmResult = sendFcmNotification(
$decryptedToken,
$pushTitle,
$pushBody,
$fcmData,
'Marketing',
'notification'
);
if ($fcmResult['status'] === 'success') {
$sentFcm++;
// Log campaign dispatch
$logStmt = $con->prepare("INSERT INTO marketing_campaigns_log (passenger_id, message_type, country_code, region_name, triggered_by) VALUES (?, 'push', ?, ?, 'autopilot')");
$logStmt->execute([$passengerId, $countryCode, $regionName]);
$dispatchedPassengers[] = $passengerId;
if ($fcmResult['status'] === 'success') {
$sentFcm++;
// Log campaign dispatch
$logStmt = $con->prepare("INSERT INTO marketing_campaigns_log (passenger_id, message_type, country_code, region_name, triggered_by) VALUES (?, 'push', ?, ?, 'autopilot')");
$logStmt->execute([$passengerId, $countryCode, $regionName]);
$dispatchedPassengers[] = $passengerId;
$pushSent = true;
}
}
} else {
// Churned user (Deleted the app / No token) -> Send WhatsApp or SMS
}
if (!$pushSent) {
// Fallback: Churned user (No token) OR Push failed -> Send WhatsApp or SMS
// Check anti-spam first to prevent unnecessary marketing cost
if ($spamCount === 0) {
// Fetch and decrypt passenger phone number