Merge branch 'second-half-feature'

mariusklocke · Jul 25, 2020 · 96dd282 · 96dd282
2 parents 26c0219 + 5dc45be
commit 96dd282
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 59 deletions.
diff --git a/src/Application/Handler/CreateMatchesForSeasonHandler.php b/src/Application/Handler/CreateMatchesForSeasonHandler.php
@@ -8,7 +8,7 @@
 use HexagonalPlayground\Application\Permission\IsAdmin;
 use HexagonalPlayground\Application\Repository\SeasonRepositoryInterface;
 use HexagonalPlayground\Application\Security\AuthContext;
-use HexagonalPlayground\Domain\MatchFactory;
+use HexagonalPlayground\Domain\MatchDayGenerator;
 use HexagonalPlayground\Domain\Season;
 
 class CreateMatchesForSeasonHandler implements AuthAwareHandler
@@ -37,7 +37,10 @@ public function __invoke(CreateMatchesForSeasonCommand $command, AuthContext $au
         /** @var Season $season */
         $season = $this->seasonRepository->find($command->getSeasonId());
         $season->clearMatchDays();
-        (new MatchFactory())->createMatchDaysForSeason($season, $command->getMatchDaysDates());
+
+        $generator = new MatchDayGenerator();
+        $generator->generateMatchDaysForSeason($season, $command->getMatchDaysDates());
+
         $this->seasonRepository->save($season);
     }
 }
diff --git a/src/Domain/MatchDay.php b/src/Domain/MatchDay.php
@@ -89,14 +89,6 @@ public function clearMatches(): void
         $this->matches->clear();
     }
 
-    /**
-     * @return Competition
-     */
-    public function getCompetition(): Competition
-    {
-        return $this->season ?? $this->tournament;
-    }
-
     /**
      * @param DateTimeImmutable $startDate
      * @param DateTimeImmutable $endDate
@@ -138,9 +130,8 @@ public function getEndDate(): DateTimeImmutable
      */
     public function addResult(string $homeTeamId, string $guestTeamId, MatchResult $matchResult): void
     {
-        $competition = $this->getCompetition();
-        if ($competition instanceof Season) {
-            $competition->addResult($homeTeamId, $guestTeamId, $matchResult);
+        if ($this->season !== null) {
+            $this->season->getRanking()->addResult($homeTeamId, $guestTeamId, $matchResult);
         }
     }
 
@@ -151,9 +142,8 @@ public function addResult(string $homeTeamId, string $guestTeamId, MatchResult $
      */
     public function revertResult(string $homeTeamId, string $guestTeamId, MatchResult $matchResult): void
     {
-        $competition = $this->getCompetition();
-        if ($competition instanceof Season) {
-            $competition->revertResult($homeTeamId, $guestTeamId, $matchResult);
+        if ($this->season !== null) {
+            $this->season->getRanking()->revertResult($homeTeamId, $guestTeamId, $matchResult);
         }
     }
 
@@ -181,4 +171,4 @@ private function setCompetition(Competition $competition): void
             $this->tournament = $competition;
         }
     }
-}
+}
diff --git a/src/Domain/MatchFactory.php → src/Domain/MatchDayGenerator.php b/src/Domain/MatchFactory.php → src/Domain/MatchDayGenerator.php
@@ -7,17 +7,17 @@
 use HexagonalPlayground\Domain\Util\Assert;
 
 /**
- * A factory which constructs Match objects and implements a match day generation algorithm
+ * Generates MatchDays and Matches for a Season
  */
-class MatchFactory
+class MatchDayGenerator
 {
     /**
-     * Create all matches for a given season
+     * Generates all MatchDays for a Season
      *
      * @param Season $season
      * @param array|DatePeriod[] $matchDayDates
      */
-    public function createMatchDaysForSeason(Season $season, array $matchDayDates): void
+    public function generateMatchDaysForSeason(Season $season, array $matchDayDates): void
     {
         $teams = array_values($season->getTeams());
         Assert::true(count($teams) >= 2, 'Cannot create matches for season with less than 2 teams');
@@ -26,20 +26,45 @@ public function createMatchDaysForSeason(Season $season, array $matchDayDates):
             $teams[] = null;
         }
         shuffle($teams);
-        $expectedMatchDayCount = count($teams) - 1;
 
-        Assert::true(count($matchDayDates) === $expectedMatchDayCount, sprintf(
-            'Count of MatchDay dates does not match. Expected %d. Got %d',
-            $expectedMatchDayCount,
-            count($matchDayDates)
-        ));
+        $matchDaysPerHalf = count($teams) - 1;
+        $possibleMatchDayCounts = [$matchDaysPerHalf, $matchDaysPerHalf * 2];
+
+        Assert::oneOf(
+            count($matchDayDates),
+            $possibleMatchDayCounts,
+            'Count of MatchDay dates does not match. Expected: [%s]. Got: %s',
+        );
+
+        /** @var DatePeriod[] $secondHalfMatchDayDates */
+        $secondHalfMatchDayDates = [];
+        if (count($matchDayDates) > $matchDaysPerHalf) {
+            $secondHalfMatchDayDates = array_splice($matchDayDates, $matchDaysPerHalf, $matchDaysPerHalf);
+        }
 
         $matchDayNumber = 1;
         foreach ($matchDayDates as $datePeriod) {
             $matchDay = $season->createMatchDay(null, $matchDayNumber, $datePeriod->getStartDate(), $datePeriod->getEndDate());
             $this->generateMatchesForMatchDay($matchDay, $teams);
             $matchDayNumber++;
         }
+
+        if (!empty($secondHalfMatchDayDates)) {
+            $i = 0;
+            foreach ($season->getMatchDays() as $firstHalfMatchDay) {
+                $secondHalfMatchDay = $season->createMatchDay(
+                    null,
+                    $matchDayNumber,
+                    $secondHalfMatchDayDates[$i]->getStartDate(),
+                    $secondHalfMatchDayDates[$i]->getEndDate()
+                );
+                foreach ($firstHalfMatchDay->getMatches() as $match) {
+                    $secondHalfMatchDay->createMatch(null, $match->getGuestTeam(), $match->getHomeTeam());
+                }
+                $i++;
+                $matchDayNumber++;
+            }
+        }
     }
 
     /**
@@ -84,4 +109,4 @@ private function generateMatchesForMatchDay(MatchDay $matchDay, array $teams) :
             $matchDay->createMatch(null, $homeTeam, $guestTeam);
         }
     }
-}
+}
diff --git a/src/Domain/Season.php b/src/Domain/Season.php
@@ -9,7 +9,6 @@
 use HexagonalPlayground\Domain\Event\Event;
 use HexagonalPlayground\Domain\Event\Publisher;
 use HexagonalPlayground\Domain\Util\Assert;
-use HexagonalPlayground\Domain\Value\MatchResult;
 
 class Season extends Competition
 {
@@ -117,14 +116,6 @@ private function hasStarted() : bool
         return ($this->ranking !== null);
     }
 
-    /**
-     * @return bool
-     */
-    public function hasEnded() : bool
-    {
-        return $this->state === self::STATE_ENDED;
-    }
-
     /**
      * @return bool
      */
@@ -203,26 +194,6 @@ public function getMatchDays(): array
         return $this->matchDays->toArray();
     }
 
-    /**
-     * @param string $homeTeamId
-     * @param string $guestTeamId
-     * @param MatchResult $matchResult
-     */
-    public function addResult(string $homeTeamId, string $guestTeamId, MatchResult $matchResult): void
-    {
-        $this->getRanking()->addResult($homeTeamId, $guestTeamId, $matchResult);
-    }
-
-    /**
-     * @param string $homeTeamId
-     * @param string $guestTeamId
-     * @param MatchResult $matchResult
-     */
-    public function revertResult(string $homeTeamId, string $guestTeamId, MatchResult $matchResult): void
-    {
-        $this->getRanking()->revertResult($homeTeamId, $guestTeamId, $matchResult);
-    }
-
     private function updateMatchDayCount(): void
     {
         $this->matchDayCount = $this->matchDays->count();

diff --git a/tests/GraphQL/SeasonTest.php b/tests/GraphQL/SeasonTest.php
@@ -69,7 +69,7 @@ public function testSeasonCanBeStarted(string $seasonId): string
             $this->client->addTeamToSeason($seasonId, $teamId);
         }
 
-        $dates = self::createMatchDayDates(count(self::$teamIds) - 1);
+        $dates = self::createMatchDayDates(2 * (count(self::$teamIds) - 1));
         $this->client->createMatchesForSeason($seasonId, $dates);
 
         $events = EventCapturer::getInstance()->capture(function() use ($seasonId) {
@@ -380,4 +380,4 @@ private function getNonParticipatingTeamIds(stdClass $match): array
             $match->guest_team->id
         ]);
     }
-}
+}