Use ResultRow DTO now that we have it

DOMjudge · Jul 29, 2024 · 2e4abad · 2e4abad
1 parent ca0665f
commit 2e4abad
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 45 deletions.
diff --git a/webapp/src/Command/CompareResultsCommand.php b/webapp/src/Command/CompareResultsCommand.php
@@ -2,13 +2,13 @@
 
 namespace App\Command;
 
-use App\DataTransferObject\Result;
+use App\DataTransferObject\ResultRow;
 use App\Service\Compare\ResultsCompareService;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
- * @extends AbstractCompareCommand<Result[]>
+ * @extends AbstractCompareCommand<ResultRow[]>
  */
 #[AsCommand(
     name: 'compare:results',

diff --git a/webapp/src/DataTransferObject/Result.php b/webapp/src/DataTransferObject/Result.php
diff --git a/webapp/src/Service/Compare/ResultsCompareService.php b/webapp/src/Service/Compare/ResultsCompareService.php
@@ -2,11 +2,11 @@
 
 namespace App\Service\Compare;
 
-use App\DataTransferObject\Result;
+use App\DataTransferObject\ResultRow;
 use Symfony\Component\Serializer\Encoder\CsvEncoder;
 
 /**
- * @extends AbstractCompareService<Result[]>
+ * @extends AbstractCompareService<ResultRow[]>
  */
 class ResultsCompareService extends AbstractCompareService
 {
@@ -21,30 +21,30 @@ protected function parseFile(string $file)
         $resultsContents = substr($resultsContents, strpos($resultsContents, "\n") + 1);
 
         // Prefix file with a fake header, so we can deserialize them
-        $resultsContents = "team_id\trank\taward\tnum_solved\ttotal_time\tlast_time\tgroup_winner\n" . $resultsContents;
+        $resultsContents = "team_id\trank\taward\tnum_solved\ttotal_time\ttime_of_last_submission\tgroup_winner\n" . $resultsContents;
 
-        $results = $this->serializer->deserialize($resultsContents, Result::class . '[]', 'csv', [
+        $results = $this->serializer->deserialize($resultsContents, ResultRow::class . '[]', 'csv', [
             CsvEncoder::DELIMITER_KEY => "\t",
         ]);
 
         // Sort results: first by num_solved, then by total_time
         usort($results, fn(
-            Result $a,
-            Result $b
+            ResultRow $a,
+            ResultRow $b
         ) => $a->numSolved === $b->numSolved ? $a->totalTime <=> $b->totalTime : $b->numSolved <=> $a->numSolved);
 
         return $results;
     }
 
     public function compare($object1, $object2): void
     {
-        /** @var array<string,Result> $results1Indexed */
+        /** @var array<string,ResultRow> $results1Indexed */
         $results1Indexed = [];
         foreach ($object1 as $result) {
             $results1Indexed[$result->teamId] = $result;
         }
 
-        /** @var array<string,Result> $results2Indexed */
+        /** @var array<string,ResultRow> $results2Indexed */
         $results2Indexed = [];
         foreach ($object2 as $result) {
             $results2Indexed[$result->teamId] = $result;
@@ -67,8 +67,8 @@ public function compare($object1, $object2): void
                 if ($result->totalTime !== $result2->totalTime) {
                     $this->addMessage(MessageType::ERROR, sprintf('Team "%s" has different total time', $result->teamId), (string)$result->totalTime, (string)$result2->totalTime);
                 }
-                if ($result->lastTime !== $result2->lastTime) {
-                    $this->addMessage(MessageType::ERROR, sprintf('Team "%s" has different last time', $result->teamId), (string)$result->lastTime, (string)$result2->lastTime);
+                if ($result->timeOfLastSubmission !== $result2->timeOfLastSubmission) {
+                    $this->addMessage(MessageType::ERROR, sprintf('Team "%s" has different last time', $result->teamId), (string)$result->timeOfLastSubmission, (string)$result2->timeOfLastSubmission);
                 }
                 if ($result->groupWinner !== $result2->groupWinner) {
                     $this->addMessage(MessageType::WARNING, sprintf('Team "%s" has different group winner', $result->teamId), (string)$result->groupWinner, (string)$result2->groupWinner);

diff --git a/webapp/tests/Unit/Service/Compare/ResultsCompareServiceTest.php b/webapp/tests/Unit/Service/Compare/ResultsCompareServiceTest.php
@@ -2,7 +2,7 @@
 
 namespace App\Tests\Unit\Service\Compare;
 
-use App\DataTransferObject\Result;
+use App\DataTransferObject\ResultRow;
 use App\Service\Compare\Message;
 use App\Service\Compare\MessageType;
 use App\Service\Compare\ResultsCompareService;
@@ -13,8 +13,8 @@
 class ResultsCompareServiceTest extends KernelTestCase
 {
     /**
-     * @param Result[]  $results1
-     * @param Result[]  $results2
+     * @param ResultRow[]  $results1
+     * @param ResultRow[]  $results2
      * @param Message[] $expectedMessages
      *
      * @dataProvider provideCompare
@@ -34,43 +34,43 @@ public function provideCompare(): Generator
     {
         yield [[], [], []];
         yield [
-            [new Result('team1', 1, '', 0, 0, 0)],
+            [new ResultRow('team1', 1, '', 0, 0, 0)],
             [],
             [new Message(MessageType::ERROR, 'Team "team1" not found in second file', null, null)],
         ];
         yield [
             [],
-            [new Result('team2', 1, '', 0, 0, 0)],
+            [new ResultRow('team2', 1, '', 0, 0, 0)],
             [new Message(MessageType::ERROR, 'Team "team2" not found in first file', null, null)],
         ];
         yield [
-            [new Result('team3', 1, '', 0, 0, 0)],
-            [new Result('team3', 2, '', 0, 0, 0)],
+            [new ResultRow('team3', 1, '', 0, 0, 0)],
+            [new ResultRow('team3', 2, '', 0, 0, 0)],
             [new Message(MessageType::ERROR, 'Team "team3" has different rank', '1', '2')],
         ];
         yield [
-            [new Result('team4', 1, 'award1', 0, 0, 0)],
-            [new Result('team4', 1, 'award2', 0, 0, 0)],
+            [new ResultRow('team4', 1, 'award1', 0, 0, 0)],
+            [new ResultRow('team4', 1, 'award2', 0, 0, 0)],
             [new Message(MessageType::ERROR, 'Team "team4" has different award', 'award1', 'award2')],
         ];
         yield [
-            [new Result('team5', 1, 'award3', 1, 0, 0)],
-            [new Result('team5', 1, 'award3', 2, 0, 0)],
+            [new ResultRow('team5', 1, 'award3', 1, 0, 0)],
+            [new ResultRow('team5', 1, 'award3', 2, 0, 0)],
             [new Message(MessageType::ERROR, 'Team "team5" has different num solved', '1', '2')],
         ];
         yield [
-            [new Result('team6', 1, 'award4', 1, 100, 0)],
-            [new Result('team6', 1, 'award4', 1, 200, 0)],
+            [new ResultRow('team6', 1, 'award4', 1, 100, 0)],
+            [new ResultRow('team6', 1, 'award4', 1, 200, 0)],
             [new Message(MessageType::ERROR, 'Team "team6" has different total time', '100', '200')],
         ];
         yield [
-            [new Result('team7', 1, 'award4', 1, 100, 10)],
-            [new Result('team7', 1, 'award4', 1, 100, 20)],
+            [new ResultRow('team7', 1, 'award4', 1, 100, 10)],
+            [new ResultRow('team7', 1, 'award4', 1, 100, 20)],
             [new Message(MessageType::ERROR, 'Team "team7" has different last time', '10', '20')],
         ];
         yield [
-            [new Result('team8', 1, 'award4', 1, 100, 10, 'winner1')],
-            [new Result('team8', 1, 'award4', 1, 100, 10, 'winner2')],
+            [new ResultRow('team8', 1, 'award4', 1, 100, 10, 'winner1')],
+            [new ResultRow('team8', 1, 'award4', 1, 100, 10, 'winner2')],
             [new Message(MessageType::WARNING, 'Team "team8" has different group winner', 'winner1', 'winner2')],
         ];
     }