Merge branch 'release-13.7.5'

oat-sa · Nov 27, 2023 · 91cacce · 91cacce
2 parents 2613200 + f18a583
commit 91cacce
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 22 deletions.
diff --git a/models/Events/DeliveryExecutionResultsRecalculated.php b/models/Events/DeliveryExecutionResultsRecalculated.php
@@ -32,14 +32,14 @@ class DeliveryExecutionResultsRecalculated implements Event
     private ?float $totalScore;
     private ?float $totalMaxScore;
     private bool $isFullyGraded;
-    private int $timestamp;
+    private ?string $timestamp;
 
     public function __construct(
         DeliveryExecutionInterface $deliveryExecution,
         ?float $totalScore,
         ?float $totalMaxScore,
         bool $isFullyGraded,
-        int $timestamp
+        ?string $timestamp
     ) {
         $this->deliveryExecution = $deliveryExecution;
         $this->totalScore = $totalScore;
@@ -73,7 +73,7 @@ public function isFullyGraded(): bool
         return $this->isFullyGraded;
     }
 
-    public function getTimestamp(): int
+    public function getTimestamp(): ?string
     {
         return $this->timestamp;
     }

diff --git a/models/Import/Service/ResultImporter.php b/models/Import/Service/ResultImporter.php
@@ -95,6 +95,9 @@ private function updateTestVariables(
         string $testUri,
         float $updatedScoreTotal
     ): void {
+        if ($scoreTotalVariable->getValue() != $updatedScoreTotal) {
+            $scoreTotalVariable->setEpoch(microtime());
+        }
         $scoreTotalVariable->setValue($updatedScoreTotal);
 
         $resultStorage->replaceTestVariables(

diff --git a/models/Import/Service/SendCalculatedResultService.php b/models/Import/Service/SendCalculatedResultService.php
@@ -29,9 +29,10 @@
 use oat\taoResultServer\models\classes\implementation\ResultServerService;
 use oat\taoResultServer\models\Events\DeliveryExecutionResultsRecalculated;
 use stdClass;
-use taoResultServer_models_classes_OutcomeVariable;
 use taoResultServer_models_classes_ReadableResultStorage as ReadableResultStorage;
 use taoResultServer_models_classes_Variable as ResultVariable;
+use taoResultServer_models_classes_OutcomeVariable as OutcomeVariable;
+use tao_helpers_Date as DateHelper;
 
 class SendCalculatedResultService
 {
@@ -66,10 +67,10 @@ public function sendByDeliveryExecutionId(string $deliveryExecutionId): array
 
         $isFullyGraded = $this->checkIsFullyGraded($deliveryExecutionId, $outcomeVariables);
 
-        $timestamp = $this->secondsFromMicrotime($deliveryExecution->getFinishTime());
+        $timestamp = DateHelper::formatMicrotime($deliveryExecution->getFinishTime());
+
         if ($isFullyGraded) {
-            $outcomeTimestamp = $this->getLatestOutcomesTimestamp($outcomeVariables);
-            $timestamp = max($outcomeTimestamp, $timestamp);
+            $timestamp = DateHelper::formatMicrotime($this->getLatestOutcomesTimestamp($outcomeVariables));
         }
 
         $this->eventManager->trigger(
@@ -194,25 +195,44 @@ private function isSubjectOutcomeVariableGraded(
         return false;
     }
 
-    private function secondsFromMicrotime(string $microtime): int
-    {
-        list(, $seconds) = explode(' ', $microtime);
-
-        return (int) $seconds;
-    }
-
-    private function getLatestOutcomesTimestamp(array $outcomeVariables): ?int
+    private function getLatestOutcomesTimestamp(array $outcomeVariables): ?string
     {
         $microtimeList = array_map(function ($outcome) {
             $outcome = end($outcome);
-            if ($outcome->variable instanceof taoResultServer_models_classes_OutcomeVariable) {
+            if ($outcome->variable instanceof OutcomeVariable) {
                 return $outcome->variable->getEpoch();
             }
             return 0;
         }, $outcomeVariables);
+        $sortedMicrotime = $this->sortMicrotimeList(array_filter($microtimeList));
+        return array_pop($sortedMicrotime);
+    }
+
+    private function sortMicrotimeList(array $microtimeList): array
+    {
+        usort($microtimeList, function ($a, $b) {
+            // Extract the values from each string
+            $microtimeA = explode(' ', $a);
+            $microtimeB = explode(' ', $b);
+
+            // Compare the timestamp values
+            $compareTimestamp = (float)$microtimeA[1] - (float)$microtimeB[1];
+
+            // If the timestamp values are equal, compare the microseconds
+            if ($compareTimestamp == 0) {
+                $d = (float)$microtimeA[0] - (float)$microtimeB[0];
+                if ($d == 0) {
+                    return 0;
+                } elseif ($d > 0) {
+                    return 1;
+                } else {
+                    return -1;
+                }
+            }
 
-        $timestampList = array_map('self::secondsFromMicrotime', array_filter($microtimeList));
+            return $compareTimestamp;
+        });
 
-        return max($timestampList);
+        return $microtimeList;
     }
 }
diff --git a/models/Import/Task/ImportResultTask.php b/models/Import/Task/ImportResultTask.php
@@ -65,8 +65,9 @@ public function __invoke($params = [])
             return Report::createSuccess($message);
         } catch (Throwable $exception) {
             $message = sprintf(
-                '[DeliveryExecutionResults] Error [%s] importing results [%s]',
+                '[DeliveryExecutionResults] Error [%s] Stacktrace [%s] importing results [%s]',
                 $exception->getMessage(),
+                $exception->getTraceAsString(),
                 isset($importResult) ? var_export($importResult->jsonSerialize(), true) : ''
             );
 

diff --git a/test/Unit/models/Import/Service/ResultImporterTest.php b/test/Unit/models/Import/Service/ResultImporterTest.php
@@ -180,9 +180,13 @@ public function testCreateByImportResult(): void
                 'executionId',
                 'testUri',
                 'executionId',
-                [
-                    777 => $this->createTestVariable(4, 'SCORE_TOTAL'),
-                ]
+                $this->callback(function ($array) {
+                    $variable = array_pop($array);
+                    return $variable->getIdentifier() === 'SCORE_TOTAL'
+                        && $variable->getCardinality() === 'single'
+                        && $variable->getBaseType() === 'float'
+                        && $variable->getExternallyGraded() === false;
+                })
             );
 
         $this->resultStorage
@@ -515,6 +519,7 @@ private function createTestVariable(
         $variable->setIdentifier($identifier);
         $variable->setCardinality('single');
         $variable->setBaseType('float');
+        $variable->setEpoch(microtime());
 
         return $variable;
     }