#11219 Fix: Detect correctly that the revision was uploaded in internal review round

Author: jardakotesovec

classes/decision/Repository.php

@@ -304,7 +304,10 @@ public function getDecisionType(int $decision): ?DecisionType
     public function getActivePendingRevisionsDecision(int $submissionId, int $stageId, int $decision = Decision::PENDING_REVISIONS): ?Decision
     {
         $postReviewDecisions = [Decision::SEND_TO_PRODUCTION];
-        $revisionDecisions = [Decision::PENDING_REVISIONS, Decision::RESUBMIT];
+        $revisionDecisions = $stageId === WORKFLOW_STAGE_ID_EXTERNAL_REVIEW 
+            ? [Decision::PENDING_REVISIONS, Decision::RESUBMIT] 
+            : [Decision::PENDING_REVISIONS_INTERNAL, Decision::RESUBMIT_INTERNAL];
+
         if (!in_array($decision, $revisionDecisions)) {
             return null;
         }
@@ -353,10 +356,14 @@ public function revisionsUploadedSinceDecision(Decision $decision, int $submissi
         $reviewRoundDao = DAORegistry::getDAO('ReviewRoundDAO'); /** @var ReviewRoundDAO $reviewRoundDao */
         $reviewRound = $reviewRoundDao->getReviewRound($submissionId, $stageId, $round);
 
+        $fileStage = $stageId === WORKFLOW_STAGE_ID_EXTERNAL_REVIEW
+            ? SubmissionFile::SUBMISSION_FILE_REVIEW_REVISION
+            : SubmissionFile::SUBMISSION_FILE_INTERNAL_REVIEW_REVISION;
+
         $submissionFiles = Repo::submissionFile()
             ->getCollector()
             ->filterByReviewRoundIds([$reviewRound->getId()])
-            ->filterByFileStages([SubmissionFile::SUBMISSION_FILE_REVIEW_REVISION])
+            ->filterByFileStages([$fileStage])
             ->getMany();
 
         foreach ($submissionFiles as $submissionFile) {

classes/submission/reviewRound/ReviewRound.php

@@ -159,7 +159,8 @@ public function determineStatus()
         // submitted
         if ($this->getStatus() == self::REVIEW_ROUND_STATUS_REVISIONS_REQUESTED || $this->getStatus() == self::REVIEW_ROUND_STATUS_REVISIONS_SUBMITTED) {
             // get editor decisions
-            $pendingRevisionDecision = Repo::decision()->getActivePendingRevisionsDecision($this->getSubmissionId(), $this->getStageId(), Decision::PENDING_REVISIONS);
+            $decisionToCheck = $this->getStageId() === WORKFLOW_STAGE_ID_EXTERNAL_REVIEW ? Decision::PENDING_REVISIONS : Decision::PENDING_REVISIONS_INTERNAL;
+            $pendingRevisionDecision = Repo::decision()->getActivePendingRevisionsDecision($this->getSubmissionId(), $this->getStageId(), $decisionToCheck);
 
             if ($pendingRevisionDecision) {
                 if (Repo::decision()->revisionsUploadedSinceDecision($pendingRevisionDecision, $this->getSubmissionId())) {
@@ -173,7 +174,9 @@ public function determineStatus()
         // submitted
         if ($this->getStatus() == self::REVIEW_ROUND_STATUS_RESUBMIT_FOR_REVIEW || $this->getStatus() == self::REVIEW_ROUND_STATUS_RESUBMIT_FOR_REVIEW_SUBMITTED) {
             // get editor decisions
-            $pendingRevisionDecision = Repo::decision()->getActivePendingRevisionsDecision($this->getSubmissionId(), $this->getStageId(), Decision::RESUBMIT);
+            $decisionToCheck = $this->getStageId() === WORKFLOW_STAGE_ID_EXTERNAL_REVIEW ? Decision::RESUBMIT : Decision::RESUBMIT_INTERNAL;
+
+            $pendingRevisionDecision = Repo::decision()->getActivePendingRevisionsDecision($this->getSubmissionId(), $this->getStageId(), $decisionToCheck);
 
             if ($pendingRevisionDecision) {
                 if (Repo::decision()->revisionsUploadedSinceDecision($pendingRevisionDecision, $this->getSubmissionId())) {