Amirmahdi/approagency
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: send due parameters

Browse Source
This commit is contained in:
Amirmahdi
2025-12-12 19:59:04 +03:30
parent a49c6f078d
commit 3aab22fe2c
2 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/SendDueReminders.php
+8 -16
View File
@@ -70,22 +70,14 @@ public function handle(): int
} }
// Otherwise, send to all users that have this package // Otherwise, send to all users that have this package
else { else {
$users = $packageName->users()->whereNotNull('package_name_user.fcm_token')->get(); // Just dispatch the job once for all users with this package
SendPushToPackageJob::dispatch(
foreach ($users as $user) { $packageName,
$fcmToken = $user->packageNames()->where('package_names.id', $packageName->id)->first()->pivot->fcm_token; $reminder->title,
$reminder->description ?? '',
if (!$fcmToken) continue; $reminder->data ?? []
);
SendPushToPackageJob::dispatch( }
user: $user,
title: $reminder->title,
packageName: $packageName,
description: $reminder->description ?? '',
data: $reminder->data ?? []
);
}
}
$reminder->last_repeat = now(); $reminder->last_repeat = now();
$reminder->save(); $reminder->save();
app/Jobs/SendPushToPackageJob.php
+36 -26
View File
@@ -1,6 +1,5 @@
<?php <?php
namespace App\Jobs; namespace App\Jobs;
use App\Models\PackageName; use App\Models\PackageName;
@@ -27,38 +26,49 @@ public function handle(): void
{ {
$firebaseFile = $this->getFirebaseJsonPath(); $firebaseFile = $this->getFirebaseJsonPath();
if (!$firebaseFile) { if (!$firebaseFile) {
\Log::warning('Firebase JSON file not found for package: ' . $this->packageName->id);
return; return;
} }
$factory = (new Factory)->withServiceAccount($firebaseFile); try {
$push = $factory->createMessaging(); $factory = (new Factory)->withServiceAccount($firebaseFile);
$messaging = $factory->createMessaging();
// Get all users that have this package AND have an FCM token // Get all users that have this package AND have an FCM token
$users = $this->packageName->users() $users = $this->packageName->users()
->whereNotNull('package_name_user.fcm_token') ->whereNotNull('package_name_user.fcm_token')
->get(); ->get();
foreach ($users as $user) { foreach ($users as $user) {
$fcmToken = $user->packageNames() $fcmToken = $user->packageNames()
->where('package_names.id', $this->packageName->id) ->where('package_names.id', $this->packageName->id)
->first() ->first()
->pivot ->pivot
->fcm_token; ->fcm_token;
if (!$fcmToken) { if (!$fcmToken) {
continue; 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([ \Log::info("Sent push notifications to " . $users->count() . " users for package: " . $this->packageName->id);
'token' => $fcmToken,
'notification' => [ } catch (\Throwable $e) {
'title' => $this->title, \Log::error('Firebase error in SendPushToPackageJob: ' . $e->getMessage());
'body' => $this->description,
],
'data' => $this->data,
]);
$push->send($message);
} }
} }
@@ -67,4 +77,4 @@ private function getFirebaseJsonPath(): ?string
$media = $this->packageName->getFirstMedia('firebase_json'); $media = $this->packageName->getFirstMedia('firebase_json');
return $media?->getPath(); return $media?->getPath();
} }
} }