Merge branch 'reminderAreaModeratorsAutomatic-714' into 'stable-3_3_0'

Adiciona envio automático de lembretes a moderadores de área - 330

See merge request softwares-pkp/plugins_ojs/scieloModerationStages!24

Author: JhonathanLepidus

classes/ModerationStageDAO.inc.php

@@ -57,7 +57,7 @@ public function getAssignmentsByUserGroupAndModerationStage(int $userGroupId, in
             ->where('sub_s.setting_name', 'currentModerationStage')
             ->where('sub_s.setting_value', '=', $moderationStage)
             ->where('sa.user_group_id', '=', $userGroupId)
-            ->select('sa.user_id', 'sa.submission_id');
+            ->select('sa.user_id', 'sa.submission_id', 'sa.date_assigned');
 
         if ($userId) {
             $query = $query->where('sa.user_id', '=', $userId);
@@ -68,7 +68,11 @@ public function getAssignmentsByUserGroupAndModerationStage(int $userGroupId, in
 
         foreach ($result as $row) {
             $row = get_object_vars($row);
-            $assignments[] = ['userId' => $row['user_id'], 'submissionId' => $row['submission_id']];
+            $assignments[] = [
+                'userId' => $row['user_id'],
+                'submissionId' => $row['submission_id'],
+                'dateAssigned' => $row['date_assigned']
+            ];
         }
 
         return $assignments;

classes/tasks/SendModerationReminders.inc.php

@@ -16,6 +16,20 @@ public function executeActions()
         $this->plugin = PluginRegistry::getPlugin('generic', 'scielomoderationstagesplugin');
 
         $context = Application::get()->getRequest()->getContext();
+        $locale = $context->getPrimaryLocale();
+        $this->plugin->addLocaleData($locale);
+
+        $preModerationTimeLimit = $this->plugin->getSetting($context->getId(), 'preModerationTimeLimit');
+        $this->sendResponsiblesReminders($context, $preModerationTimeLimit, $locale);
+
+        $areaModerationTimeLimit = $this->plugin->getSetting($context->getId(), 'areaModerationTimeLimit');
+        $this->sendAreaModeratorsReminders($context, $areaModerationTimeLimit, $locale);
+
+        return true;
+    }
+
+    private function sendResponsiblesReminders($context, $preModerationTimeLimit, $locale)
+    {
         $moderationReminderHelper = new ModerationReminderHelper();
         $responsiblesUserGroup = $moderationReminderHelper->getResponsiblesUserGroup($context->getId());
 
@@ -26,16 +40,12 @@ public function executeActions()
         );
 
         if (empty($responsibleAssignments)) {
-            return true;
+            return;
         }
 
-        $usersWithOverduePreModeration = $this->getUsersWithOverduePreModeration($context->getId(), $responsibleAssignments);
+        $usersWithOverduePreModeration = $this->getUsersWithOverduePreModeration($responsibleAssignments, $preModerationTimeLimit);
         $mapModeratorsAndOverdueSubmissions = $moderationReminderHelper->mapUsersAndSubmissions($usersWithOverduePreModeration, $responsibleAssignments);
 
-        $locale = $context->getPrimaryLocale();
-        $this->plugin->addLocaleData($locale);
-        $preModerationTimeLimit = $this->plugin->getSetting($context->getId(), 'preModerationTimeLimit');
-
         foreach ($mapModeratorsAndOverdueSubmissions as $userId => $submissions) {
             $moderator = DAORegistry::getDAO('UserDAO')->getById($userId);
             $moderationReminderEmailBuilder = new ModerationReminderEmailBuilder(
@@ -50,14 +60,45 @@ public function executeActions()
             $reminderEmail = $moderationReminderEmailBuilder->buildEmail();
             $reminderEmail->send();
         }
+    }
 
-        return true;
+    private function sendAreaModeratorsReminders($context, $areaModerationTimeLimit, $locale)
+    {
+        $moderationReminderHelper = new ModerationReminderHelper();
+        $areaModeratorsUserGroup = $moderationReminderHelper->getAreaModeratorsUserGroup($context->getId());
+
+        $moderationStageDao = new ModerationStageDAO();
+        $areaModeratorAssignments = $moderationStageDao->getAssignmentsByUserGroupAndModerationStage(
+            $areaModeratorsUserGroup->getId(),
+            SCIELO_MODERATION_STAGE_AREA
+        );
+
+        if (empty($areaModeratorAssignments)) {
+            return;
+        }
+
+        $usersWithOverdueAreaModeration = $this->getUsersWithOverdueAreaModeration($areaModeratorAssignments, $areaModerationTimeLimit);
+        $mapModeratorsAndOverdueSubmissions = $moderationReminderHelper->mapUsersAndSubmissions($usersWithOverdueAreaModeration, $areaModeratorAssignments);
+
+        foreach ($mapModeratorsAndOverdueSubmissions as $userId => $submissions) {
+            $moderator = DAORegistry::getDAO('UserDAO')->getById($userId);
+            $moderationReminderEmailBuilder = new ModerationReminderEmailBuilder(
+                $context,
+                $moderator,
+                $submissions,
+                $locale,
+                REMINDER_TYPE_AREA_MODERATION,
+                $areaModerationTimeLimit
+            );
+
+            $reminderEmail = $moderationReminderEmailBuilder->buildEmail();
+            $reminderEmail->send();
+        }
     }
 
-    private function getUsersWithOverduePreModeration($contextId, $assignments): array
+    private function getUsersWithOverduePreModeration($assignments, $preModerationTimeLimit): array
     {
         $usersIds = [];
-        $preModerationTimeLimit = $this->plugin->getSetting($contextId, 'preModerationTimeLimit');
         $moderationStageDao = new ModerationStageDAO();
 
         foreach ($assignments as $assignment) {
@@ -71,4 +112,20 @@ private function getUsersWithOverduePreModeration($contextId, $assignments): arr
 
         return $usersIds;
     }
+
+    private function getUsersWithOverdueAreaModeration($assignments, $areaModerationTimeLimit): array
+    {
+        $usersIds = [];
+        $limitDaysAgo = (new DateTime())->modify("-$areaModerationTimeLimit days");
+
+        foreach ($assignments as $assignment) {
+            $dateAssigned = new DateTime($assignment['dateAssigned']);
+
+            if ($dateAssigned < $limitDaysAgo and !isset($usersIds[$assignment['userId']])) {
+                $usersIds[$assignment['userId']] = $assignment['userId'];
+            }
+        }
+
+        return $usersIds;
+    }
 }

version.xml

@@ -13,7 +13,7 @@
 	<application>scieloModerationStages</application>
 	<type>plugins.generic</type>
 	<lazy-load>0</lazy-load>
-	<release>1.7.1.0</release>
-	<date>2024-10-30</date>
+	<release>1.7.2.0</release>
+	<date>2024-11-05</date>
   <class>ScieloModerationStagesPlugin</class>
 </version>