Skip to content

Prevent duplicate query in notifications component #493

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

Merged
merged 2 commits into from
Mar 11, 2020
Merged

Prevent duplicate query in notifications component #493

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52fd49e
Prevent duplicate query
joedixon Mar 10, 2020
182972a
Apply fixes from StyleCI
joedixon Mar 10, 2020
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
9 changes: 2 additions & 7 deletions app/Http/Livewire/Notifications.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Http\Livewire;

use App\Policies\NotificationPolicy;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Notifications\DatabaseNotification;
use Illuminate\Support\Facades\Auth;
Expand Down Expand Up @@ -34,18 +33,14 @@ public function getNotificationProperty(): DatabaseNotification
return DatabaseNotification::findOrFail($this->notificationId);
}

public function markAsRead(string $notificationId): LengthAwarePaginator
public function markAsRead(string $notificationId): void
{
$this->notificationId = $notificationId;

$this->authorize(NotificationPolicy::MARK_AS_READ, $this->notification);

$this->notification->markAsRead();

$unreadNotifications = Auth::user()->unreadNotifications()->paginate(10);

$this->emit('NotificationMarkedAsRead', $unreadNotifications->total());

return $unreadNotifications;
$this->emit('NotificationMarkedAsRead', Auth::user()->unreadNotifications()->count());
}
}