Merge branch 'fixesAssignmentsImport-797' into 'main'

Fixes submission assignment if user has not been imported See merge request softwares-pkp/plugins_ojs/fullJournalTransfer!48
lepidus · Apr 18, 2024 · 5a05631 · 5a05631
2 parents 389db88 + 2069ad9
commit 5a05631
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/filter/import/NativeXmlExtendedArticleFilter.inc.php b/filter/import/NativeXmlExtendedArticleFilter.inc.php
@@ -43,9 +43,24 @@ public function parseStage($node, $submission)
 
     public function parseStageAssignment($node, $submission, $stageId)
     {
+        $deployment = $this->getDeployment();
+
         $user = DAORegistry::getDAO('UserDAO')
             ->getUserByEmail($node->getAttribute('user_email'));
 
+        if (is_null($user)) {
+            $deployment->addWarning(
+                ASSOC_TYPE_SUBMISSION,
+                $submission->getId(),
+                __(
+                    'plugins.importexport.fullJournal.error.userNotFound',
+                    ['email' => $node->getAttribute('user_email')]
+                )
+            );
+
+            return null;
+        }
+
         $userGroups = DAORegistry::getDAO('UserGroupDAO')
             ->getByContextId($submission->getContextId())
             ->toArray();
@@ -125,13 +140,27 @@ public function parseDecision($node, $submission, $stageId, $reviewRound = null)
     public function parseReviewAssignment($node, $reviewRound)
     {
         $deployment = $this->getDeployment();
+        $submission = $deployment->getSubmission();
 
         $reviewAssignmentDAO = DAORegistry::getDAO('ReviewAssignmentDAO');
         $reviewAssignment = $reviewAssignmentDAO->newDataObject();
 
         $userDAO = DAORegistry::getDAO('UserDAO');
         $reviewer = $userDAO->getUserByEmail($node->getAttribute('reviewer_email'));
 
+        if (is_null($reviewer)) {
+            $deployment->addWarning(
+                ASSOC_TYPE_SUBMISSION,
+                $submission->getId(),
+                __(
+                    'plugins.importexport.fullJournal.error.userNotFound',
+                    ['email' => $node->getAttribute('reviewer_email')]
+                )
+            );
+
+            return null;
+        }
+
         $reviewAssignment->setSubmissionId($reviewRound->getSubmissionId());
         $reviewAssignment->setReviewerId($reviewer->getId());
         $reviewAssignment->setReviewRoundId($reviewRound->getId());

diff --git a/locale/en_US/locale.po b/locale/en_US/locale.po
@@ -46,3 +46,6 @@ msgstr "Importing articles..."
 
 msgid "plugins.importexport.fullJournal.importCompleted"
 msgstr "Import completed successfully"
+
+msgid "plugins.importexport.fullJournal.error.userNotFound"
+msgstr "User with email {$email} is not present on the site."
diff --git a/locale/pt_BR/locale.po b/locale/pt_BR/locale.po
@@ -46,3 +46,6 @@ msgstr "Importando artigos..."
 
 msgid "plugins.importexport.fullJournal.importCompleted"
 msgstr "Importação concluída com sucesso"
+
+msgid "plugins.importexport.fullJournal.error.userNotFound"
+msgstr "Usuário com email {$email} não está presente no site."
diff --git a/version.xml b/version.xml
@@ -10,7 +10,7 @@
 <version>
 	<application>fullJournalTransfer</application>
 	<type>plugins.importexport</type>
-	<release>2.0.9.2</release>
-	<date>2024-04-17</date>
+	<release>2.0.9.3</release>
+	<date>2024-04-18</date>
     <class>FullJournalImportExportPlugin</class>
 </version>