fix: send due parameters
This commit is contained in:
@@ -70,22 +70,14 @@ public function handle(): int
|
||||
}
|
||||
// Otherwise, send to all users that have this package
|
||||
else {
|
||||
$users = $packageName->users()->whereNotNull('package_name_user.fcm_token')->get();
|
||||
|
||||
foreach ($users as $user) {
|
||||
$fcmToken = $user->packageNames()->where('package_names.id', $packageName->id)->first()->pivot->fcm_token;
|
||||
|
||||
if (!$fcmToken) continue;
|
||||
|
||||
SendPushToPackageJob::dispatch(
|
||||
user: $user,
|
||||
title: $reminder->title,
|
||||
packageName: $packageName,
|
||||
description: $reminder->description ?? '',
|
||||
data: $reminder->data ?? []
|
||||
);
|
||||
}
|
||||
}
|
||||
// Just dispatch the job once for all users with this package
|
||||
SendPushToPackageJob::dispatch(
|
||||
$packageName,
|
||||
$reminder->title,
|
||||
$reminder->description ?? '',
|
||||
$reminder->data ?? []
|
||||
);
|
||||
}
|
||||
|
||||
$reminder->last_repeat = now();
|
||||
$reminder->save();
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace App\Jobs;
|
||||
|
||||
use App\Models\PackageName;
|
||||
@@ -27,38 +26,49 @@ public function handle(): void
|
||||
{
|
||||
$firebaseFile = $this->getFirebaseJsonPath();
|
||||
if (!$firebaseFile) {
|
||||
\Log::warning('Firebase JSON file not found for package: ' . $this->packageName->id);
|
||||
return;
|
||||
}
|
||||
|
||||
$factory = (new Factory)->withServiceAccount($firebaseFile);
|
||||
$push = $factory->createMessaging();
|
||||
try {
|
||||
$factory = (new Factory)->withServiceAccount($firebaseFile);
|
||||
$messaging = $factory->createMessaging();
|
||||
|
||||
// Get all users that have this package AND have an FCM token
|
||||
$users = $this->packageName->users()
|
||||
->whereNotNull('package_name_user.fcm_token')
|
||||
->get();
|
||||
// Get all users that have this package AND have an FCM token
|
||||
$users = $this->packageName->users()
|
||||
->whereNotNull('package_name_user.fcm_token')
|
||||
->get();
|
||||
|
||||
foreach ($users as $user) {
|
||||
$fcmToken = $user->packageNames()
|
||||
->where('package_names.id', $this->packageName->id)
|
||||
->first()
|
||||
->pivot
|
||||
->fcm_token;
|
||||
foreach ($users as $user) {
|
||||
$fcmToken = $user->packageNames()
|
||||
->where('package_names.id', $this->packageName->id)
|
||||
->first()
|
||||
->pivot
|
||||
->fcm_token;
|
||||
|
||||
if (!$fcmToken) {
|
||||
continue;
|
||||
if (!$fcmToken) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$message = CloudMessage::withTarget('token', $fcmToken)
|
||||
->withNotification([
|
||||
'title' => $this->title,
|
||||
'body' => $this->description,
|
||||
])
|
||||
->withData($this->data);
|
||||
|
||||
try {
|
||||
$messaging->send($message);
|
||||
\Log::info("Push notification sent to user {$user->id} for package {$this->packageName->id}");
|
||||
} catch (\Throwable $e) {
|
||||
\Log::error("Failed to send push to user {$user->id}: " . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
$message = CloudMessage::fromArray([
|
||||
'token' => $fcmToken,
|
||||
'notification' => [
|
||||
'title' => $this->title,
|
||||
'body' => $this->description,
|
||||
],
|
||||
'data' => $this->data,
|
||||
]);
|
||||
|
||||
$push->send($message);
|
||||
\Log::info("Sent push notifications to " . $users->count() . " users for package: " . $this->packageName->id);
|
||||
|
||||
} catch (\Throwable $e) {
|
||||
\Log::error('Firebase error in SendPushToPackageJob: ' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,4 +77,4 @@ private function getFirebaseJsonPath(): ?string
|
||||
$media = $this->packageName->getFirstMedia('firebase_json');
|
||||
return $media?->getPath();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user