Fix missing sorting in BufferedMatchDayLoader

mariusklocke · Jan 9, 2022 · ca3ffcf · ca3ffcf
1 parent e4ee5a3
commit ca3ffcf
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 6 deletions.
diff --git a/src/Infrastructure/API/GraphQL/Loader/BufferedMatchDayLoader.php b/src/Infrastructure/API/GraphQL/Loader/BufferedMatchDayLoader.php
@@ -5,6 +5,7 @@
 
 use HexagonalPlayground\Infrastructure\Persistence\Read\Criteria\EqualityFilter;
 use HexagonalPlayground\Infrastructure\Persistence\Read\Criteria\Filter;
+use HexagonalPlayground\Infrastructure\Persistence\Read\Criteria\Sorting;
 use HexagonalPlayground\Infrastructure\Persistence\Read\MatchDayRepository;
 
 class BufferedMatchDayLoader
@@ -51,9 +52,23 @@ public function getBySeason(string $seasonId): array
         $seasonIds = array_keys($this->bySeasonId, null, true);
 
         if (count($seasonIds)) {
-            $filter = new EqualityFilter($this->matchDayRepository->getField('season_id'), Filter::MODE_INCLUDE, $seasonIds);
-
-            $matchDays = $this->matchDayRepository->findMany([$filter], [], null, 'season_id');
+            $filter = new EqualityFilter(
+                $this->matchDayRepository->getField('season_id'),
+                Filter::MODE_INCLUDE,
+                $seasonIds
+            );
+
+            $sorting = new Sorting(
+                $this->matchDayRepository->getField('number'),
+                Sorting::DIRECTION_ASCENDING
+            );
+
+            $matchDays = $this->matchDayRepository->findMany(
+                [$filter],
+                [$sorting],
+                null,
+                'season_id'
+            );
 
             foreach ($seasonIds as $id) {
                 $this->bySeasonId[$id] = $matchDays[$id] ?? [];
@@ -72,9 +87,23 @@ public function getByTournament(string $tournamentId): array
         $tournamentIds = array_keys($this->byTournamentId, null ,true);
 
         if (count($tournamentIds)) {
-            $filter = new EqualityFilter($this->matchDayRepository->getField('tournament_id'), Filter::MODE_INCLUDE, $tournamentIds);
-
-            $matchDays = $this->matchDayRepository->findMany([$filter], [], null, 'tournament_id');
+            $filter = new EqualityFilter(
+                $this->matchDayRepository->getField('tournament_id'),
+                Filter::MODE_INCLUDE,
+                $tournamentIds
+            );
+
+            $sorting = new Sorting(
+                $this->matchDayRepository->getField('number'),
+                Sorting::DIRECTION_ASCENDING
+            );
+
+            $matchDays = $this->matchDayRepository->findMany(
+                [$filter],
+                [$sorting],
+                null,
+                'tournament_id'
+            );
 
             foreach ($tournamentIds as $id) {
                 $this->byTournamentId[$id] = $matchDays[$id] ?? [];

diff --git a/src/Infrastructure/API/GraphQL/SeasonType.php b/src/Infrastructure/API/GraphQL/SeasonType.php
@@ -41,6 +41,7 @@ public function __construct()
                             /** @var BufferedTeamLoader $loader */
                             $loader = $context->getContainer()->get(BufferedTeamLoader::class);
                             $loader->addSeason($root['id']);
+
                             return new Deferred(function () use ($loader, $root) {
                                 return $loader->getBySeason($root['id']);
                             });
@@ -52,6 +53,7 @@ public function __construct()
                             /** @var BufferedMatchDayLoader $loader */
                             $loader = $context->getContainer()->get(BufferedMatchDayLoader::class);
                             $loader->addSeason($root['id']);
+
                             return new Deferred(function () use ($loader, $root) {
                                 return $loader->getBySeason($root['id']);
                             });

diff --git a/tests/GraphQL/SeasonTest.php b/tests/GraphQL/SeasonTest.php
@@ -92,9 +92,17 @@ public function testSeasonCanBeStarted(string $seasonId): string
         self::assertSame(count($dates), count($season->match_days));
 
         $matchCount = 0;
+        $previousMatchDay = null;
         foreach ($season->match_days as $matchDay) {
             $matchCount += count($matchDay->matches);
+
+            if ($previousMatchDay !== null) {
+                self::assertGreaterThan($previousMatchDay->number, $matchDay->number);
+            }
+
+            $previousMatchDay = $matchDay;
         }
+
         self::assertSame(count($dates) * count(self::$teamIds) / 2, $matchCount);
 
         return $season->id;