Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[11.x] Allow readAt method to use in database channel #54729

Merged
merged 3 commits into from
Feb 20, 2025
Merged

[11.x] Allow readAt method to use in database channel #54729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e28b0ef
Allow default readed notification
utsavsomaiya Feb 20, 2025
ea5a29e
Update DatabaseChannel.php
taylorotwell Feb 20, 2025
c531583
Update NotificationDatabaseChannelTest.php
taylorotwell Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Illuminate/Notifications/Channels/DatabaseChannel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ protected function buildPayload($notifiable, Notification $notification)
? $notification->databaseType($notifiable)
: get_class($notification),
'data' => $this->getData($notifiable, $notification),
'read_at' => null,
'read_at' => method_exists($notification, 'initialDatabaseReadAtValue')
? $notification->initialDatabaseReadAtValue($notifiable)
: null,
];
}

Expand Down
8 changes: 7 additions & 1 deletion tests/Notifications/NotificationDatabaseChannelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Illuminate\Tests\Notifications;

use Carbon\Carbon;
use Illuminate\Notifications\Channels\DatabaseChannel;
use Illuminate\Notifications\Messages\DatabaseMessage;
use Illuminate\Notifications\Notification;
Expand Down Expand Up @@ -60,7 +61,7 @@ public function testCustomizeTypeIsSentToDatabase()
'id' => 1,
'type' => 'MONTHLY',
'data' => ['invoice_id' => 1],
'read_at' => null,
'read_at' => Carbon::now()->toDateTimeString(),
'something' => 'else',
]);

Expand Down Expand Up @@ -88,6 +89,11 @@ public function databaseType()
{
return 'MONTHLY';
}

public function initialDatabaseReadAtValue()
{
return Carbon::now();
}
}

class ExtendedDatabaseChannel extends DatabaseChannel
Expand Down
Loading