pkp#4622 Doing C.R requested changes and improving naming convention …

…at some files
henriqueramos · Feb 17, 2022 · 1fe6a66 · 1fe6a66
1 parent 314d253
commit 1fe6a66
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 112 deletions.
diff --git 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
@@ -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
diff --git a/classes/observers/listeners/DeletedSubmissionListener.inc.php b/classes/observers/listeners/DeletedSubmissionListener.inc.php
diff --git 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