diff --git a/src/Dto/SeasonDto.php b/src/Dto/SeasonDto.php index 1bd3c786..f028e483 100644 --- a/src/Dto/SeasonDto.php +++ b/src/Dto/SeasonDto.php @@ -14,6 +14,7 @@ class SeasonDto public array $teamDtoList; public array $facilityDtoList; public int $leagueId; + public int $numberOfTeams; public int $seasonNumber; public int $gamesPerWeek; public string $leagueName; @@ -28,9 +29,15 @@ class SeasonDto public function createSeasonArray(): array { + $numberOfTeams = $this->numberOfTeams ?? 0; + if (!empty($this->teamDtoList)) + { + $numberOfTeams = count($this->teamDtoList); + } return [ 'id' => $this->id ?? null, 'seasonNumber' => $this->seasonNumber ?? null, + 'numberOfTeams' => $numberOfTeams, 'gamesPerWeek' => $this->gamesPerWeek ?? null, 'dateStart' => !empty($this->dateStart) ? $this->dateStart->format('Y-m'): null, 'leagueId' => $this->leagueId ?? null, @@ -76,6 +83,10 @@ class SeasonDto { $this->active = $dataList['active']; } + if (isset($dataList['numberOfTeams'])) + { + $this->numberOfTeams = $dataList['numberOfTeams']; + } if (isset($dataList['teamList'])) { foreach ($dataList['teamList'] as $teamName) diff --git a/src/Service/Season/SeasonFactory.php b/src/Service/Season/SeasonFactory.php index 427f5c73..16739a07 100644 --- a/src/Service/Season/SeasonFactory.php +++ b/src/Service/Season/SeasonFactory.php @@ -28,7 +28,6 @@ class SeasonFactory { $seasonEntity->setPointsPerLoss($seasonDto->pointsPerLoss); } - $seasonEntity->setActive(false); return $seasonEntity; } } \ No newline at end of file diff --git a/src/Service/Season/addTeam/HandleAddTeamList.php b/src/Service/Season/addTeam/HandleAddTeamList.php index f5c3da9a..f498e560 100644 --- a/src/Service/Season/addTeam/HandleAddTeamList.php +++ b/src/Service/Season/addTeam/HandleAddTeamList.php @@ -52,6 +52,7 @@ class HandleAddTeamList $teamEntity = $this->teamFactory::createEntityFromDto($teamDto); $teamEntity->addSeason($seasonEntity); $teamEntity->setLeagueId($leagueId); + $teamEntity->setActive(true); $this->entityManager->persist($teamEntity); $this->entityManager->flush(); $teamDto->id = $teamEntity->getId(); diff --git a/src/Service/Season/createSeason/HandleCreateSeason.php b/src/Service/Season/createSeason/HandleCreateSeason.php index 4d7fc1c7..df33c56c 100644 --- a/src/Service/Season/createSeason/HandleCreateSeason.php +++ b/src/Service/Season/createSeason/HandleCreateSeason.php @@ -53,7 +53,7 @@ class HandleCreateSeason $numberOfTeams = $request->toArray()['numberOfTeams']; $seasonEntity = $this->seasonFactory::create($seasonDto); $seasonEntity->setLeague($leagueEntity); - + $seasonEntity->setActive(true); if (!empty($numberOfTeams)) { $this->createTeams($numberOfTeams, $seasonEntity);