From f62cc35ab818d5d2c6a64221817379c0abf37def Mon Sep 17 00:00:00 2001 From: Ross Bearman Date: Tue, 21 May 2024 15:19:06 +0100 Subject: [PATCH 1/2] fix: Dispatch DatabaseNotificationsSent from import/export jobs --- packages/actions/src/Concerns/CanImportRecords.php | 2 +- packages/actions/src/Exports/Jobs/ExportCompletion.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/actions/src/Concerns/CanImportRecords.php b/packages/actions/src/Concerns/CanImportRecords.php index 44668308fc..4bb0e1528e 100644 --- a/packages/actions/src/Concerns/CanImportRecords.php +++ b/packages/actions/src/Concerns/CanImportRecords.php @@ -334,7 +334,7 @@ function (string $attribute, mixed $value, Closure $fail) use ($action) { ->markAsRead(), ]), ) - ->sendToDatabase($import->user); + ->sendToDatabase($import->user, true); }) ->dispatch(); diff --git a/packages/actions/src/Exports/Jobs/ExportCompletion.php b/packages/actions/src/Exports/Jobs/ExportCompletion.php index e5662067d3..89d26e6f3e 100644 --- a/packages/actions/src/Exports/Jobs/ExportCompletion.php +++ b/packages/actions/src/Exports/Jobs/ExportCompletion.php @@ -74,6 +74,6 @@ public function handle(): void $this->formats, )), ) - ->sendToDatabase($this->export->user); + ->sendToDatabase($this->export->user, true); } } From 2cc7a1bbb777ca3d8dead49f5a18881f8d2fa35b Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Wed, 22 May 2024 11:31:06 +0100 Subject: [PATCH 2/2] Apply suggestions from code review --- packages/actions/src/Concerns/CanImportRecords.php | 2 +- packages/actions/src/Exports/Jobs/ExportCompletion.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/actions/src/Concerns/CanImportRecords.php b/packages/actions/src/Concerns/CanImportRecords.php index 4bb0e1528e..78e5cf12b0 100644 --- a/packages/actions/src/Concerns/CanImportRecords.php +++ b/packages/actions/src/Concerns/CanImportRecords.php @@ -334,7 +334,7 @@ function (string $attribute, mixed $value, Closure $fail) use ($action) { ->markAsRead(), ]), ) - ->sendToDatabase($import->user, true); + ->sendToDatabase($import->user, isEventDispatched: true); }) ->dispatch(); diff --git a/packages/actions/src/Exports/Jobs/ExportCompletion.php b/packages/actions/src/Exports/Jobs/ExportCompletion.php index 89d26e6f3e..a5ea18e7de 100644 --- a/packages/actions/src/Exports/Jobs/ExportCompletion.php +++ b/packages/actions/src/Exports/Jobs/ExportCompletion.php @@ -74,6 +74,6 @@ public function handle(): void $this->formats, )), ) - ->sendToDatabase($this->export->user, true); + ->sendToDatabase($this->export->user, isEventDispatched: true); } }