Merge pull request #11083 from touhidurabir/i10214_stable_3_5_0

#10214 Editorial reminder issue update

Author: touhidurabir

classes/submission/reviewRound/ReviewRound.php

@@ -259,6 +259,7 @@ public function determineStatus()
                     break;
 
                 case ReviewAssignment::REVIEW_ASSIGNMENT_STATUS_AWAITING_RESPONSE:
+                case ReviewAssignment::REVIEW_ASSIGNMENT_STATUS_REQUEST_RESEND:
                 case ReviewAssignment::REVIEW_ASSIGNMENT_STATUS_ACCEPTED:
                     $anyIncompletedReview = true;
                     break;

jobs/email/EditorialReminder.php

@@ -16,11 +16,12 @@
 
 namespace PKP\jobs\email;
 
-use APP\core\Application;
 use APP\facades\Repo;
 use APP\notification\NotificationManager;
 use APP\submission\Submission;
+use Carbon\Carbon;
 use Illuminate\Support\Facades\Mail;
+use PKP\security\Role;
 use PKP\context\Context;
 use PKP\db\DAORegistry;
 use PKP\facades\Locale;
@@ -51,14 +52,24 @@ public function __construct(int $editorId, int $contextId)
      */
     public function handle(): void
     {
-        if (!$this->isSubscribed()) {
-            return;
-        }
-
         /** @var Context $context */
         $context = app()->get('context')->get($this->contextId);
         $editor = Repo::user()->get($this->editorId);
 
+        // Context or user was removed since job was created, or the user was disabled
+        if (!$context || !$editor) {
+            return;
+        }
+
+        // If the user has been removed form manager or editor role since the job was created
+        if (!$editor->hasRole([Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR], $context->getId())) {
+            return;
+        }
+
+        if (!$this->isSubscribed()) {
+            return;
+        }
+
         // Don't use the request locale because this job is
         // run during a scheduled task
         $requestLocale = Locale::getLocale();
@@ -89,31 +100,43 @@ public function handle(): void
                 /** @var ReviewRoundDAO $reviewRoundDao */
                 $reviewRoundDao = DAORegistry::getDAO('ReviewRoundDAO');
                 $reviewRound = $reviewRoundDao->getLastReviewRoundBySubmissionId($submission->getId(), $submission->getData('stageId'));
+                $status = $reviewRound->determineStatus();
 
-                if ($reviewRound->getStatus() === ReviewRound::REVIEW_ROUND_STATUS_PENDING_REVIEWERS) {
+                if ($status === ReviewRound::REVIEW_ROUND_STATUS_PENDING_REVIEWERS) {
                     $outstanding[$submissionId] = __('editor.submission.roundStatus.pendingReviewers');
                     continue;
                 }
 
-                if ($reviewRound->getStatus() === ReviewRound::REVIEW_ROUND_STATUS_REVIEWS_COMPLETED) {
+                if ($status === ReviewRound::REVIEW_ROUND_STATUS_PENDING_REVIEWS) {
+                    $outstanding[$submissionId] = __('editor.submission.roundStatus.pendingReviews');
+                    continue;
+                }
+
+                if ($status === ReviewRound::REVIEW_ROUND_STATUS_REVIEWS_READY) {
+                    $outstanding[$submissionId] = __('editor.submission.roundStatus.reviewsReady');
+                    continue;
+                }
+
+                if ($status === ReviewRound::REVIEW_ROUND_STATUS_REVIEWS_COMPLETED) {
                     $outstanding[$submissionId] = __('editor.submission.roundStatus.reviewsCompleted');
                     continue;
                 }
 
-                if ($reviewRound->getStatus() === ReviewRound::REVIEW_ROUND_STATUS_REVIEWS_OVERDUE) {
+                if ($status === ReviewRound::REVIEW_ROUND_STATUS_REVIEWS_OVERDUE) {
                     $outstanding[$submissionId] = __('editor.submission.roundStatus.reviewOverdue');
                     continue;
                 }
 
-                if ($reviewRound->getStatus() === ReviewRound::REVIEW_ROUND_STATUS_REVISIONS_SUBMITTED) {
+                if ($status === ReviewRound::REVIEW_ROUND_STATUS_REVISIONS_SUBMITTED) {
                     $outstanding[$submissionId] = __('editor.submission.roundStatus.revisionsSubmitted');
                     continue;
                 }
             }
 
             if (in_array($submission->getData('stageId'), [WORKFLOW_STAGE_ID_EDITING, WORKFLOW_STAGE_ID_PRODUCTION])) {
-                $lastActivityTimestamp = strtotime($submission->getData('dateLastActivity'));
-                if ($lastActivityTimestamp < strtotime('-30 days')) {
+                $lastActivityTimestamp = Carbon::parse($submission->getData('dateLastActivity'))->endOfDay();
+                $comparingTimestamp = Carbon::today()->endOfDay()->subDays(30);
+                if ($comparingTimestamp->gt($lastActivityTimestamp)) {
                     /** @var WorkflowStageDAO $workflowStageDao */
                     $workflowStageDao = DAORegistry::getDAO('WorkflowStageDAO');
                     $outstanding[$submissionId] = __(
@@ -135,11 +158,6 @@ public function handle(): void
             return;
         }
 
-        // Context or user was removed since job was created, or the user was disabled
-        if (!$context || !$editor) {
-            return;
-        }
-
         $notificationManager = new NotificationManager();
         $notification = $notificationManager->createNotification(
             $this->editorId,
@@ -165,13 +183,18 @@ public function handle(): void
     }
 
     /**
-     * Is this editor subscribed to this email?
+     * Is this editor subscribed to this notification type?
      */
     protected function isSubscribed(): bool
     {
         /** @var NotificationSubscriptionSettingsDAO $notificationSubscriptionSettingsDao  */
         $notificationSubscriptionSettingsDao = DAORegistry::getDAO('NotificationSubscriptionSettingsDAO');
-        $blockedEmails = $notificationSubscriptionSettingsDao->getNotificationSubscriptionSettings('blocked_emailed_notification', $this->editorId, $this->contextId);
+        $blockedEmails = $notificationSubscriptionSettingsDao->getNotificationSubscriptionSettings(
+            NotificationSubscriptionSettingsDAO::BLOCKED_EMAIL_NOTIFICATION_KEY,
+            $this->editorId,
+            $this->contextId
+        );
+
         return !in_array(Notification::NOTIFICATION_TYPE_EDITORIAL_REMINDER, $blockedEmails);
     }