From 1fe6a66044307791c477dff21e37af7068be8084 Mon Sep 17 00:00:00 2001
From: Henrique Ramos <henrique@henriqueramos.eti.br>
Date: Thu, 10 Jun 2021 03:50:33 -0300
Subject: [PATCH] pkp/pkp-lib#4622 Doing C.R requested changes and improving
 naming convention at some files

---
 .../Submissions/UpdateSubmissionSearchJob.php |  6 ++--
 classes/core/PKPEventServiceProvider.inc.php  | 12 +++----
 .../DeleteSubmissionFileListener.inc.php      | 34 -------------------
 .../DeletedSubmissionListener.inc.php         | 34 -------------------
 .../SubmissionDeletedListener.inc.php         |  1 -
 .../UpdateSubmissionSearchListener.inc.php    | 34 -------------------
 6 files changed, 9 insertions(+), 112 deletions(-)
 delete mode 100644 classes/observers/listeners/DeleteSubmissionFileListener.inc.php
 delete mode 100644 classes/observers/listeners/DeletedSubmissionListener.inc.php
 delete mode 100644 classes/observers/listeners/UpdateSubmissionSearchListener.inc.php

diff --git a/Jobs/Submissions/UpdateSubmissionSearchJob.php b/Jobs/Submissions/UpdateSubmissionSearchJob.php
index 124c7a4d941..902ceb17162 100644
--- a/Jobs/Submissions/UpdateSubmissionSearchJob.php
+++ b/Jobs/Submissions/UpdateSubmissionSearchJob.php
@@ -3,13 +3,13 @@
 declare(strict_types=1);
 
 /**
- * @file Jobs/Submissions/UpdateSubmissionSearchJob.php
+ * @file Jobs/Submissions/UpdateSubmissionOnSearchIndexJob.php
  *
  * Copyright (c) 2014-2021 Simon Fraser University
  * Copyright (c) 2000-2021 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
- * @class UpdateSubmissionSearchJob
+ * @class UpdateSubmissionOnSearchIndexJob
  * @ingroup jobs
  *
  * @brief Class to handle the Submission Search data update as a Job
@@ -24,7 +24,7 @@
 use PKP\submission\PKPSubmission;
 use PKP\Support\Jobs\BaseJob;
 
-class UpdateSubmissionSearchJob extends BaseJob
+class UpdateSubmissionOnSearchIndexJob extends BaseJob
 {
     /**
      * @var int The submission ID
diff --git a/classes/core/PKPEventServiceProvider.inc.php b/classes/core/PKPEventServiceProvider.inc.php
index ef5e49f3b6e..3a9de552885 100644
--- a/classes/core/PKPEventServiceProvider.inc.php
+++ b/classes/core/PKPEventServiceProvider.inc.php
@@ -32,20 +32,20 @@ class PKPEventServiceProvider extends EventServiceProvider
      * @brief Registering events & listeners, see Illuminate\Events\EventServiceProvider
      */
     protected $listen = [
-        DeletedSubmission::class => [
-            DeletedSubmissionListener::class,
+        SubmissionDeleted::class => [
+            SubmissionDeletedListener::class,
         ],
-        DeleteSubmissionFile::class => [
-            DeleteSubmissionFileListener::class,
+        SubmissionFileDeleted::class => [
+            SubmissionFileDeletedListener::class,
         ],
         MetadataChanged::class => [
             MetadataChangedListener::class
         ],
         PublishedEvent::class => [
-            UpdateSubmissionSearchListener::class,
+            SubmissionUpdatedListener::class,
         ],
         UnpublishedEvent::class => [
-            UpdateSubmissionSearchListener::class,
+            SubmissionUpdatedListener::class,
         ]
     ];
 
diff --git a/classes/observers/listeners/DeleteSubmissionFileListener.inc.php b/classes/observers/listeners/DeleteSubmissionFileListener.inc.php
deleted file mode 100644
index f854b4d962d..00000000000
--- a/classes/observers/listeners/DeleteSubmissionFileListener.inc.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @file classes/observers/listeners/DeleteSubmissionFileListener.inc.php
- *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2000-2021 John Willinsky
- * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
- *
- * @class DeletedSubmission
- * @ingroup core
- *
- * @brief Listener fired when submission file's deleted
- */
-
-namespace PKP\observers\listeners;
-
-use PKP\Jobs\Submissions\DeleteSubmissionFileJob;
-use PKP\observers\events\DeleteSubmissionFile;
-
-class DeleteSubmissionFileListener
-{
-    /**
-     * Handle the listener call
-     *
-     *
-     */
-    public function handle(DeleteSubmissionFile $event)
-    {
-        dispatch(new DeleteSubmissionFileJob($event->submissionFile->getId()));
-    }
-}
diff --git a/classes/observers/listeners/DeletedSubmissionListener.inc.php b/classes/observers/listeners/DeletedSubmissionListener.inc.php
deleted file mode 100644
index 938eebf62f8..00000000000
--- a/classes/observers/listeners/DeletedSubmissionListener.inc.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @file classes/observers/events/DeletedSubmission.inc.php
- *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2000-2021 John Willinsky
- * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
- *
- * @class DeletedSubmission
- * @ingroup core
- *
- * @brief Event fired when submission's deleted
- */
-
-namespace PKP\observers\listeners;
-
-use PKP\Jobs\Submissions\DeletedSubmissionSearchJob;
-use PKP\observers\events\DeletedSubmission;
-
-class DeletedSubmissionListener
-{
-    /**
-     * Handle the listener call
-     *
-     *
-     */
-    public function handle(DeletedSubmission $event)
-    {
-        dispatch(new DeletedSubmissionSearchJob($event->submission->getId()));
-    }
-}
diff --git a/classes/observers/listeners/SubmissionDeletedListener.inc.php b/classes/observers/listeners/SubmissionDeletedListener.inc.php
index 055675ae5f4..67f04bf20c9 100644
--- a/classes/observers/listeners/SubmissionDeletedListener.inc.php
+++ b/classes/observers/listeners/SubmissionDeletedListener.inc.php
@@ -19,7 +19,6 @@
 
 use Illuminate\Events\Dispatcher;
 use PKP\Jobs\Submissions\RemoveSubmissionFromSearchIndexJob;
-
 use PKP\observers\events\SubmissionDeleted;
 
 class SubmissionDeletedListener
diff --git a/classes/observers/listeners/UpdateSubmissionSearchListener.inc.php b/classes/observers/listeners/UpdateSubmissionSearchListener.inc.php
deleted file mode 100644
index f1079b6c650..00000000000
--- a/classes/observers/listeners/UpdateSubmissionSearchListener.inc.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @file classes/observers/listeners/UpdateSubmissionSearchListener.inc.php
- *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2000-2021 John Willinsky
- * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
- *
- * @class DeletedSubmission
- * @ingroup core
- *
- * @brief Listener fired when submission's updated
- */
-
-namespace PKP\observers\listeners;
-
-use PKP\Jobs\Submissions\UpdateSubmissionSearchJob;
-use PKP\observers\events\PublishedEvent;
-
-class UpdateSubmissionSearchListener
-{
-    /**
-     * Handle the listener call
-     *
-     *
-     */
-    public function handle(PublishedEvent $event)
-    {
-        dispatch(new UpdateSubmissionSearchJob($event->submission->getId()));
-    }
-}