Article DAO considers disabled editors

Issue: documentacao-e-tarefas/scielo#885

Signed-off-by: Jhon <jhon@lepidus.com.br>

Author: JhonathanLepidus

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') {

tests/ScieloArticleFactoryTest.php

@@ -94,7 +94,7 @@ private function clearDB(): void
 
         if (!empty($this->editorsUsersIds)) {
             foreach ($this->editorsUsersIds as $editorUserId) {
-                $editorUser = Repo::user()->get($editorUserId);
+                $editorUser = Repo::user()->get($editorUserId, true);
                 if ($editorUser) {
                     Repo::user()->delete($editorUser);
                 }
@@ -353,6 +353,40 @@ public function testSubmissionGetsJournalEditors(): void
         $this->assertEquals($expectedEditors, $scieloArticle->getJournalEditors());
     }
 
+    /**
+     * @group OJS
+     */
+    public function testSubmissionGetsDisabledJournalEditors(): void
+    {
+        $journalEditorsData = [
+            [
+                'userName' => 'examplePeter',
+                'email' => 'peter@example.com',
+                'password' => 'examplepass',
+                'givenName' => [$this->locale => "Peter"],
+                'familyName' => [$this->locale => "Parker"],
+                'dateRegistered' => Core::getCurrentDate()
+            ],
+            [
+                'userName' => 'exampleCharles',
+                'email' => 'charles@example.com',
+                'password' => 'examplepass',
+                'givenName' => [$this->locale => "Charles"],
+                'familyName' => [$this->locale => "Xavier"],
+                'dateRegistered' => Core::getCurrentDate(),
+                'disabled' => true
+            ]
+        ];
+        $editorsUsers = $this->createEditorUsers($journalEditorsData);
+
+        $articleFactory = new ScieloArticleFactory();
+        $scieloArticle = $articleFactory->createSubmission($this->submissionId, $this->locale);
+
+        $expectedEditors = $editorsUsers[0]->getFullName()
+            . "," . $editorsUsers[1]->getFullName();
+        $this->assertEquals($expectedEditors, $scieloArticle->getJournalEditors());
+    }
+
     /**
      * @group OJS
      */
@@ -385,6 +419,28 @@ public function testSubmissionGetsSectionEditor(): void
         $this->assertEquals($sectionEditorsUser->getFullName(), $scieloArticle->getSectionEditor());
     }
 
+    /**
+     * @group OJS
+     */
+    public function testSubmissionGetsDisabledSectionEditor(): void
+    {
+        $sectionEditorData = [
+            'userName' => 'exampleCharles',
+            'email' => 'charles@example.com',
+            'password' => 'examplepass',
+            'givenName' => [$this->locale => "Charles"],
+            'familyName' => [$this->locale => "Xavier"],
+            'dateRegistered' => Core::getCurrentDate(),
+            'disabled' => true
+        ];
+        $sectionEditorsUser = $this->createEditorUsers([$sectionEditorData], true)[0];
+
+        $articleFactory = new ScieloArticleFactory();
+        $scieloArticle = $articleFactory->createSubmission($this->submissionId, $this->locale);
+
+        $this->assertEquals($sectionEditorsUser->getFullName(), $scieloArticle->getSectionEditor());
+    }
+
     /**
      * @group OJS
      */