clear

internal/services/game_service/service.go

@@ -145,15 +145,11 @@ func (s *GameService) AddTeam(
 	gameId int,
 	name string,
 ) (*Team, error) {
-	game, err := s.gamesRepo.GetGameByID(ctx, gameId)
-	if err != nil {
-		return nil, err
-	}
 	password, err := s.passwordGenerator.Generate()
 	if err != nil {
 		return nil, err
 	}
-	id, err := s.teamsRepo.AddTeam(ctx, creatorId, gameId, name, game.ScenarioId, password)
+	id, err := s.teamsRepo.AddTeam(ctx, creatorId, gameId, name, password)
 	if err != nil {
 		return nil, err
 	}
@@ -185,12 +181,17 @@ func (s *GameService) GetTeamActions(ctx context.Context, teamId int, password s
 		return nil, teams_repo.ErrTeamNotFound
 	}
 
+	game, err := s.gamesRepo.GetGameByID(ctx, team.GameId)
+	if err != nil {
+		return nil, err
+	}
+
 	actions, err := s.actionsRepo.GetActionsByTeamID(ctx, teamId)
 	if err != nil {
 		return nil, err
 	}
 
-	scenario, err := s.scenarioService.GetFullScenarioByID(ctx, team.ScenarioId)
+	scenario, err := s.scenarioService.GetFullScenarioByID(ctx, game.ScenarioId)
 	if err != nil {
 		return nil, err
 	}
@@ -213,12 +214,17 @@ func (s *GameService) AddTeamAction(ctx context.Context, teamId int, password st
 		return err
 	}
 
+	game, err := s.gamesRepo.GetGameByID(ctx, team.GameId)
+	if err != nil {
+		return err
+	}
+
 	actions, err := s.actionsRepo.GetActionsByTeamID(ctx, teamId)
 	if err != nil {
 		return err
 	}
 
-	scenario, err := s.scenarioService.GetFullScenarioByID(ctx, team.ScenarioId)
+	scenario, err := s.scenarioService.GetFullScenarioByID(ctx, game.ScenarioId)
 	if err != nil {
 		return err
 	}
@@ -243,12 +249,17 @@ func (s *GameService) DeleteLastTeamAction(ctx context.Context, teamId int) erro
 		return err
 	}
 
+	game, err := s.gamesRepo.GetGameByID(ctx, team.GameId)
+	if err != nil {
+		return err
+	}
+
 	actions, err := s.actionsRepo.GetActionsByTeamID(ctx, teamId)
 	if err != nil {
 		return err
 	}
 
-	scenario, err := s.scenarioService.GetFullScenarioByID(ctx, team.ScenarioId)
+	scenario, err := s.scenarioService.GetFullScenarioByID(ctx, game.ScenarioId)
 	if err != nil {
 		return err
 	}