Merge pull request #932 from NFDI4Chem/issue-#764

fix: archival mail issue
NFDI4Chem · Nov 29, 2023 · 8199b4a · 8199b4a
2 parents d697dee + 8850dfb
commit 8199b4a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.env.example b/.env.example
@@ -48,7 +48,7 @@ MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=info@nmrxiv.org
+MAIL_FROM_ADDRESS=info.nmrxiv@uni-jena.de
 MAIL_FROM_NAME="${APP_NAME}"
 
 FILESYSTEM_DRIVER=minio

diff --git a/app/Actions/Project/ArchiveProject.php b/app/Actions/Project/ArchiveProject.php
@@ -20,10 +20,10 @@ public function toggle($project)
  $study->datasets()->update(['is_archived' => $archiveState]);
  }
  $project->is_archived = $archiveState;
- $project->save();
  if ($project->is_archived) {
  $project->sendNotification('archival', $this->prepareSendList($project));
  }
+ $project->save();
  }
 
  /**

diff --git a/app/Jobs/ArchiveProject.php b/app/Jobs/ArchiveProject.php
@@ -14,7 +14,7 @@
 use Illuminate\Support\Facades\Storage;
 use ZipStream;
 
-class ArchiveProject implements ShouldQueue, ShouldBeUnique
+class ArchiveProject implements ShouldBeUnique, ShouldQueue
 {
  use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -35,6 +35,14 @@ public function __construct(Project $project)
  $this->project = $project;
  }
 
+ /**
+ * Get the unique ID for the job.
+ */
+ public function uniqueId(): string
+ {
+ return $this->project->id;
+ }
+
  /**
  * Execute the job.
  */

diff --git a/app/Listeners/ProjectArchival.php b/app/Listeners/ProjectArchival.php
@@ -22,7 +22,7 @@ public function __construct()
  */
  public function handle(object $event): void
  {
- Notification::send($event->$sendTo, new ProjectArchivalNotification($event->project));
- Notification::send(User::role(['super-admin'])->get(), new ProjectArchivalNotificationToAdmins($this));
+ Notification::send($event->sendTo, new ProjectArchivalNotification($event->project));
+ Notification::send(User::role(['super-admin'])->get(), new ProjectArchivalNotificationToAdmins($event->project));
  }
 }