Merge branch 'fixDisabledUsers340-885' into 'main'

Corrige problema com usuários desabilitados - 3.4.0

See merge request softwares-pkp/plugins_ojs/relatorioscielo!40

Author: JhonathanLepidus

.gitlab-ci.yml

@@ -3,7 +3,7 @@ variables:
 
 include:
   - project: 'documentacao-e-tarefas/modelosparaintegracaocontinua'
-    ref: main
+    ref: stable-3_4_0
     file:
       - 'templates/groups/pkp_plugin.yml'
       - 'templates/groups/ojs/unit_tests.yml'

classes/ScieloArticlesDAO.php

@@ -41,7 +41,11 @@ public function getSectionEditor($submissionId): string
         $stageAssignmentsSectionEditorResults = $stageAssignmentDao->getBySubmissionAndRoleId($submissionId, Role::ROLE_ID_SUB_EDITOR, self::SUBMISSION_STAGE_ID);
 
         while ($stageAssignment = $stageAssignmentsSectionEditorResults->next()) {
-            $user = Repo::user()->get($stageAssignment->getUserId(), false);
+            $user = Repo::user()->get($stageAssignment->getUserId(), true);
+            if (is_null($user)) {
+                continue;
+            }
+
             $userGroup = Repo::userGroup()->get($stageAssignment->getUserGroupId());
             $currentUserGroupName = strtolower($userGroup->getName('en'));
             if ($currentUserGroupName == 'section editor') {
@@ -58,7 +62,11 @@ public function getJournalEditors($submissionId): array
         $journalEditors = [];
 
         while ($stageAssignment = $stageAssignmentsEditorResults->next()) {
-            $user = Repo::user()->get($stageAssignment->getUserId(), false);
+            $user = Repo::user()->get($stageAssignment->getUserId(), true);
+            if (is_null($user)) {
+                continue;
+            }
+
             $userGroup = Repo::userGroup()->get($stageAssignment->getUserGroupId());
             $currentUserGroupName = strtolower($userGroup->getName('en'));
             if ($currentUserGroupName == 'journal editor') {

classes/ScieloPreprintsDAO.php

@@ -75,7 +75,11 @@ public function getSectionModerators($submissionId): array
         $stageAssignmentsResults = $stageAssignmentDao->getBySubmissionAndRoleId($submissionId, ROLE_ID_SUB_EDITOR, self::SUBMISSION_STAGE_ID);
 
         while ($stageAssignment = $stageAssignmentsResults->next()) {
-            $user = Repo::user()->get($stageAssignment->getUserId(), false);
+            $user = Repo::user()->get($stageAssignment->getUserId(), true);
+            if (is_null($user)) {
+                continue;
+            }
+
             $userGroup = Repo::userGroup()->get($stageAssignment->getUserGroupId());
             $currentUserGroupAbbrev = strtolower($userGroup->getData('abbrev', 'en'));
 
@@ -94,7 +98,11 @@ public function getResponsibles($submissionId): array
         $stageAssignmentsResults = $stageAssignmentDao->getBySubmissionAndRoleId($submissionId, ROLE_ID_SUB_EDITOR, self::SUBMISSION_STAGE_ID);
 
         while ($stageAssignment = $stageAssignmentsResults->next()) {
-            $user = Repo::user()->get($stageAssignment->getUserId(), false);
+            $user = Repo::user()->get($stageAssignment->getUserId(), true);
+            if (is_null($user)) {
+                continue;
+            }
+
             $userGroup = Repo::userGroup()->get($stageAssignment->getUserGroupId());
             $currentUserGroupAbbrev = strtolower($userGroup->getData('abbrev', 'en'));
 

classes/ScieloSubmissionFactory.php

@@ -68,7 +68,10 @@ protected function retrieveSubmitter($submissionId)
             return '';
         }
 
-        $submitter = Repo::user()->get($userId);
+        $submitter = Repo::user()->get($userId, true);
+        if (is_null($submitter)) {
+            return '';
+        }
 
         return $submitter->getFullName();
     }
@@ -82,7 +85,11 @@ protected function retrieveSubmitterCountry($submissionId)
             return '';
         }
 
-        $submitter = Repo::user()->get($userId);
+        $submitter = Repo::user()->get($userId, true);
+        if (is_null($submitter)) {
+            return '';
+        }
+
         $submitterCountry = $submitter->getCountryLocalized();
 
         return !is_null($submitterCountry) ? $submitterCountry : '';