Merge branch 'fixFinalDecision330-761' into 'stable-3_3_0'

Corrige problema com decisão final quando há múltiplas decisões

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

Author: JhonathanLepidus

classes/ScieloPreprintsDAO.inc.php

@@ -179,7 +179,7 @@ public function getFinalDecisionWithDate($submissionId, $locale)
         $result = Capsule::table('edit_decisions')
         ->where('submission_id', $submissionId)
         ->whereIn('decision', $possibleFinalDecisions)
-        ->orderBy('date_decided', 'asc')
+        ->orderBy('date_decided', 'desc')
         ->first();
 
         if (is_null($result)) {

classes/ScieloSubmissionsDAO.inc.php

@@ -136,7 +136,7 @@ public function getFinalDecisionWithDate($submissionId, $locale)
         $result = Capsule::table('edit_decisions')
         ->where('submission_id', $submissionId)
         ->whereIn('decision', $possibleFinalDecisions)
-        ->orderBy('date_decided', 'asc')
+        ->orderBy('date_decided', 'desc')
         ->first();
 
         if (is_null($result)) {

tests/ScieloSubmissionsReportFactoryTest.php

@@ -51,7 +51,7 @@ private function createTestSections(): array
         return [$firstSectionId, $secondSectionId];
     }
 
-    private function createSubmission($dateSubmitted = null, $dateFinalDecision = null): int
+    private function createSubmission($dateSubmitted = null, $finalDecisions = []): int
     {
         $submissionDao = DAORegistry::getDAO('SubmissionDAO');
 
@@ -65,27 +65,29 @@ private function createSubmission($dateSubmitted = null, $dateFinalDecision = nu
         }
         $submissionId = $submissionDao->insertObject($submission);
 
-        if (!is_null($dateFinalDecision)) {
-            $this->addFinalDecision($submissionId, $dateFinalDecision);
+        if (!empty($finalDecisions)) {
+            foreach ($finalDecisions as $decisionDate => $decisionType) {
+                $this->addFinalDecision($submissionId, $decisionDate, $decisionType);
+            }
         }
 
         return $submissionId;
     }
 
     private function createTestSubmissions(): array
     {
-        $firstSubmissionId = $this->createSubmission('1921-05-21 11:56:37', '1921-05-24 13:00:00');
-        $secondSubmissionId = $this->createSubmission('1921-05-29 12:58:29', '1921-06-01 23:41:09');
-        $thirdSubmissionId = $this->createSubmission('1921-06-14 04:30:08', '1921-06-17 12:00:00');
-        $fourthSubmissionId = $this->createSubmission('1921-07-08 18:37:12', '1921-07-10 15:49:00');
+        $firstSubmissionId = $this->createSubmission('1921-05-21 11:56:37', ['1921-05-24 13:00:00' => SUBMISSION_EDITOR_DECISION_DECLINE]);
+        $secondSubmissionId = $this->createSubmission('1921-05-29 12:58:29', ['1921-06-01 23:41:09' => SUBMISSION_EDITOR_DECISION_DECLINE]);
+        $thirdSubmissionId = $this->createSubmission('1921-06-14 04:30:08', ['1921-06-17 12:00:00' => SUBMISSION_EDITOR_DECISION_DECLINE]);
+        $fourthSubmissionId = $this->createSubmission('1921-07-08 18:37:12', ['1921-07-10 15:49:00' => SUBMISSION_EDITOR_DECISION_DECLINE, '1921-11-07 16:00:00' => SUBMISSION_EDITOR_DECISION_ACCEPT]);
 
         return [$firstSubmissionId, $secondSubmissionId, $thirdSubmissionId, $fourthSubmissionId];
     }
 
-    private function addFinalDecision($submissionId, $dateDecided)
+    private function addFinalDecision($submissionId, $decisionDate, $decisionType)
     {
         $editDecisionDao = DAORegistry::getDAO('EditDecisionDAO');
-        $editDecisionDao->updateEditorDecision($submissionId, ['editDecisionId' => null, 'decision' => SUBMISSION_EDITOR_DECISION_DECLINE, 'dateDecided' => $dateDecided, 'editorId' => 1]);
+        $editDecisionDao->updateEditorDecision($submissionId, ['editDecisionId' => null, 'decision' => $decisionType, 'dateDecided' => $decisionDate, 'editorId' => 1]);
     }
 
     private function createPublication($submissionId, $sectionId, $datePublished = null)
@@ -228,14 +230,14 @@ public function testReportFilterByFinalDecisionDate(): void
         $this->reportFactory = new ScieloSubmissionsReportFactory($this->application, $this->contextId, $this->sectionsIds, $this->submissionDateInterval, $this->finalDecisionDateInterval, $this->locale, $this->includeViews);
         $report = $this->reportFactory->createReport();
 
-        $expectedSubmissions = [$this->submissionsIds[2], $this->submissionsIds[3]];
+        $expectedSubmissions = [$this->submissionsIds[2]];
         $scieloSubmissionsIds = $this->mapScieloSubmissionsToIds($report->getSubmissions());
         $this->assertEquals($expectedSubmissions, $scieloSubmissionsIds);
     }
 
     public function testReportFilterByFinalDecisionDateSubmissionAtIntervalStart(): void
     {
-        $this->finalDecisionDateInterval = new ClosedDateInterval('1921-07-10', '1921-07-12');
+        $this->finalDecisionDateInterval = new ClosedDateInterval('1921-11-07', '1921-11-09');
         $this->reportFactory = new ScieloSubmissionsReportFactory($this->application, $this->contextId, $this->sectionsIds, $this->submissionDateInterval, $this->finalDecisionDateInterval, $this->locale, $this->includeViews);
         $report = $this->reportFactory->createReport();
 
@@ -246,7 +248,7 @@ public function testReportFilterByFinalDecisionDateSubmissionAtIntervalStart():
 
     public function testReportFilterByFinalDecisionDateSubmissionAtIntervalEnd(): void
     {
-        $this->finalDecisionDateInterval = new ClosedDateInterval('1921-07-05', '1921-07-10');
+        $this->finalDecisionDateInterval = new ClosedDateInterval('1921-11-05', '1921-11-07');
         $this->reportFactory = new ScieloSubmissionsReportFactory($this->application, $this->contextId, $this->sectionsIds, $this->submissionDateInterval, $this->finalDecisionDateInterval, $this->locale, $this->includeViews);
         $report = $this->reportFactory->createReport();
 
@@ -261,7 +263,7 @@ public function testReportFilterByFinalDecisionDateExcludesSubmissionsWithoutFin
         $publicationId = $this->createPublication($submissionWithoutFinalDecisionId, $this->sectionsIds[0]);
         $this->addCurrentPublicationToSubmission($submissionWithoutFinalDecisionId, $publicationId);
 
-        $this->finalDecisionDateInterval = new ClosedDateInterval('1921-05-20', '1921-07-12');
+        $this->finalDecisionDateInterval = new ClosedDateInterval('1921-05-20', '1921-11-12');
         $this->reportFactory = new ScieloSubmissionsReportFactory($this->application, $this->contextId, $this->sectionsIds, $this->submissionDateInterval, $this->finalDecisionDateInterval, $this->locale, $this->includeViews);
         $report = $this->reportFactory->createReport();
 
@@ -272,7 +274,7 @@ public function testReportFilterByFinalDecisionDateExcludesSubmissionsWithoutFin
     public function testReportFilterBySubmissionDateAndFinalDecisionDate(): void
     {
         $this->submissionDateInterval = new ClosedDateInterval('1921-05-23', '1921-07-01');
-        $this->finalDecisionDateInterval = new ClosedDateInterval('1921-06-15', '1921-07-12');
+        $this->finalDecisionDateInterval = new ClosedDateInterval('1921-06-15', '1921-11-12');
         $this->reportFactory = new ScieloSubmissionsReportFactory($this->application, $this->contextId, $this->sectionsIds, $this->submissionDateInterval, $this->finalDecisionDateInterval, $this->locale, $this->includeViews);
         $report = $this->reportFactory->createReport();
 
@@ -289,7 +291,7 @@ public function testReportFilterByFinalDecisionDateInOPSGetsPostedSubmissions():
         $publicationId = $this->createPublication($postedSubmissionId, $this->sectionsIds[0], '1921-06-21 14:13:20');
         $this->addCurrentPublicationToSubmission($postedSubmissionId, $publicationId);
 
-        $this->finalDecisionDateInterval = new ClosedDateInterval('1921-05-20', '1921-07-12');
+        $this->finalDecisionDateInterval = new ClosedDateInterval('1921-05-20', '1921-11-12');
         $this->application = 'ops';
         $this->reportFactory = new ScieloSubmissionsReportFactory($this->application, $this->contextId, $this->sectionsIds, $this->submissionDateInterval, $this->finalDecisionDateInterval, $this->locale, $this->includeViews);
         $report = $this->reportFactory->createReport();

version.xml

@@ -4,8 +4,8 @@
 <version>
 	<application>scieloSubmissionsReport</application>
 	<type>plugins.reports</type>
-	<release>2.4.4.0</release>
-	<date>2025-03-20</date>
+	<release>2.4.5.0</release>
+	<date>2025-04-01</date>
 	<lazy-load>1</lazy-load>
 	<class>ScieloSubmissionsReportPlugin</class>
 </version>