DataLoaders用にチームのバッチ取得を追加

backend/gateway/database/database.go

@@ -174,6 +174,8 @@ type TeamsRepository interface {
 	AddTeam(ctx context.Context, userID entity.UserID, name string, tag string, flag string, logo string, public bool) (entity.TeamID, error)
 	// GetTeam returns a team.
 	GetTeam(ctx context.Context, id entity.TeamID) (*Team, error)
+	// GetTeams returns teams.
+	GetTeams(ctx context.Context, ids []entity.TeamID) ([]*Team, error)
 	// GetTeamsByUser returns teams owned by a user.
 	GetTeamsByUser(ctx context.Context, userID entity.UserID) ([]*Team, error)
 	// GetTeamsByUsers returns teams owned by users.

backend/gateway/database/mysql/gameservers/gameservers.go

@@ -55,7 +55,7 @@ func (gr *gameServerRepository) AddGameServer(ctx context.Context, userID entity
 func (gr *gameServerRepository) DeleteGameServer(ctx context.Context, id entity.GameServerID) error {
 	if _, err := gr.queries.DeleteGameServer(ctx, string(id)); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return database.NewNotFoundError(err)
+			return database.NewNotFoundError(nil)
 		}
 		return database.NewInternalError(err)
 	}
@@ -67,7 +67,7 @@ func (gr *gameServerRepository) GetGameServer(ctx context.Context, id entity.Gam
 	gameserver, err := gr.queries.GetGameServer(ctx, string(id))
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}
@@ -88,7 +88,7 @@ func (gr *gameServerRepository) GetGameServersByUser(ctx context.Context, userID
 	gameservers, err := gr.queries.GetGameServersByUser(ctx, string(userID))
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}

backend/gateway/database/mysql/mapstats/mapstats.go

@@ -37,7 +37,7 @@ func (msr *MapStatRepository) GetMapStat(ctx context.Context, id entity.MapStats
 	res, err := msr.queries.GetMapStat(ctx, string(id))
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}
@@ -125,7 +125,7 @@ func (msr *MapStatRepository) GetMapStatsByMatchAndMap(ctx context.Context, matc
 	})
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}

backend/gateway/database/mysql/matches/matches.go

@@ -61,7 +61,7 @@ func (mr *matchRepository) GetMatch(ctx context.Context, id entity.MatchID) (*da
 	match, err := mr.queries.GetMatch(ctx, string(id))
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}
@@ -130,6 +130,13 @@ func (mr *matchRepository) GetMatchesByUsers(ctx context.Context, userIDs []enti
 	ids := database.IDsToString(userIDs)
 	matches, err := mr.queries.GetMatchesByUsers(ctx, ids)
 	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			ret := make(map[entity.UserID][]*database.Match, len(userIDs))
+			for _, userID := range userIDs {
+				ret[userID] = []*database.Match{}
+			}
+			return ret, nil
+		}
 		return nil, database.NewInternalError(err)
 	}
 
@@ -163,7 +170,7 @@ func (mr *matchRepository) GetMatchesByUsers(ctx context.Context, userIDs []enti
 func (mr *matchRepository) CancelMatch(ctx context.Context, matchID entity.MatchID) error {
 	if _, err := mr.queries.CancelMatch(ctx, string(matchID)); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return database.NewNotFoundError(err)
+			return database.NewNotFoundError(nil)
 		}
 		return database.NewInternalError(err)
 	}
@@ -253,7 +260,7 @@ func (mr *matchRepository) StartMatch(ctx context.Context, matchID entity.MatchI
 		StartTime: sql.NullTime{Valid: true, Time: time.Now()},
 	}); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return database.NewNotFoundError(err)
+			return database.NewNotFoundError(nil)
 		}
 		return database.NewInternalError(err)
 	}
@@ -280,7 +287,7 @@ func (mr *matchRepository) UpdateTeam1Score(ctx context.Context, matchID entity.
 		Team1Score: score,
 	}); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return database.NewNotFoundError(err)
+			return database.NewNotFoundError(nil)
 		}
 		return database.NewInternalError(err)
 	}
@@ -295,7 +302,7 @@ func (mr *matchRepository) UpdateTeam2Score(ctx context.Context, matchID entity.
 		Team2Score: score,
 	}); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return database.NewNotFoundError(err)
+			return database.NewNotFoundError(nil)
 		}
 		return database.NewInternalError(err)
 	}

backend/gateway/database/mysql/players/players.go

@@ -53,7 +53,7 @@ func (pr *playersRepository) GetPlayer(ctx context.Context, id entity.PlayerID)
 	res, err := pr.queries.GetPlayer(ctx, string(id))
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}

backend/gateway/database/mysql/playerstats/playerstats.go

@@ -38,7 +38,7 @@ func (psr *PlayerStatRepository) GetPlayerStatsByMapstats(ctx context.Context, m
 	stats, err := psr.queries.GetPlayerStatsByMapStats(ctx, ids)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}
@@ -87,7 +87,7 @@ func (psr *PlayerStatRepository) GetPlayerStatsByMatch(ctx context.Context, matc
 	stats, err := psr.queries.GetPlayerStatsByMatch(ctx, string(matchID))
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}
@@ -134,7 +134,7 @@ func (psr *PlayerStatRepository) GetPlayerStatsBySteamID(ctx context.Context, st
 	stats, err := psr.queries.GetPlayerStatsBySteamID(ctx, uint64(steamID))
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}

backend/gateway/database/mysql/teams/teams.go

@@ -83,7 +83,7 @@ func (tr *teamsRepository) GetTeam(ctx context.Context, id entity.TeamID) (*data
 	team, err := tr.queries.GetTeam(ctx, string(id))
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}
@@ -99,6 +99,32 @@ func (tr *teamsRepository) GetTeam(ctx context.Context, id entity.TeamID) (*data
 	}, nil
 }
 
+// GetTeams implements database.TeamsRepository.
+func (tr *teamsRepository) GetTeams(ctx context.Context, ids []entity.TeamID) ([]*database.Team, error) {
+	teams, err := tr.queries.GetTeams(ctx, database.IDsToString(ids))
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return nil, database.NewNotFoundError(nil)
+		}
+		return nil, database.NewInternalError(err)
+	}
+
+	ret := make([]*database.Team, 0, len(teams))
+	for _, team := range teams {
+		ret = append(ret, &database.Team{
+			ID:     entity.TeamID(team.ID),
+			UserID: entity.UserID(team.UserID),
+			Name:   team.Name,
+			Tag:    team.Tag,
+			Flag:   team.Flag,
+			Logo:   team.Logo,
+			Public: team.PublicTeam.Valid && team.PublicTeam.Bool,
+		})
+	}
+
+	return ret, nil
+}
+
 // GetTeamsByUser implements database.TeamsRepository.
 func (tr *teamsRepository) GetTeamsByUser(ctx context.Context, userID entity.UserID) ([]*database.Team, error) {
 	teams, err := tr.queries.GetTeamByUserID(ctx, string(userID))

backend/gateway/database/mysql/users/users.go

@@ -53,7 +53,7 @@ func (ur *usersRepositry) GetUser(ctx context.Context, id entity.UserID) (*datab
 	user, err := ur.queries.GetUser(ctx, string(id))
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}
@@ -73,7 +73,7 @@ func (ur *usersRepositry) GetUserBySteamID(ctx context.Context, steamID entity.S
 	user, err := ur.queries.GetUserBySteamID(ctx, uint64(steamID))
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, database.NewNotFoundError(err)
+			return nil, database.NewNotFoundError(nil)
 		}
 		return nil, database.NewInternalError(err)
 	}

backend/graph/converter.go

@@ -66,6 +66,10 @@ func convertMatch(match *entity.Match) *model.Match {
 	return &model.Match{
 		ID:         string(match.ID),
 		UserID:     string(match.UserID),
+		Team1:      &model.Team{},
+		Team1Id:    string(match.Team1ID),
+		Team2:      &model.Team{},
+		Team2Id:    string(match.Team2ID),
 		Winner:     string(match.Winner),
 		StartedAt:  match.StartTime,
 		EndedAt:    match.EndTime,
@@ -75,6 +79,7 @@ func convertMatch(match *entity.Match) *model.Match {
 		Team1Score: int(match.Team1Score),
 		Team2Score: int(match.Team2Score),
 		Forfeit:    match.Forfeit,
+		MapStats:   []*model.MapStats{},
 	}
 }
 

backend/graph/dataloaders/dataloaders.go

@@ -11,6 +11,7 @@ type Loaders struct {
 	PlayersByTeamID        dataloader.Interface[entity.TeamID, []*entity.Player]
 	MapStatsByMatchID      dataloader.Interface[entity.MatchID, []*entity.MapStat]
 	PlayerStatsByMapStatID dataloader.Interface[entity.MapStatsID, []*entity.PlayerStat]
+	TeamsByTeamID          dataloader.Interface[entity.TeamID, *entity.Team]
 	TeamByUserID           dataloader.Interface[entity.UserID, []*entity.Team]
 	ServersByUserID        dataloader.Interface[entity.UserID, []*entity.GameServer]
 	MatchByUserID          dataloader.Interface[entity.UserID, []*entity.Match]
@@ -20,6 +21,7 @@ func (l *Loaders) ClearAll() {
 	l.PlayersByTeamID.ClearAll()
 	l.MapStatsByMatchID.ClearAll()
 	l.PlayerStatsByMapStatID.ClearAll()
+	l.TeamsByTeamID.ClearAll()
 	l.TeamByUserID.ClearAll()
 	l.ServersByUserID.ClearAll()
 	l.MatchByUserID.ClearAll()
@@ -36,13 +38,15 @@ func NewLoaders(
 	teamPlayersLoader := &teamPlayersLoader{player: player}
 	matchMapstatLoader := &matchMapstat{mapstat: mapstats}
 	mapStatPlayerstatsLoader := &mapstatPlayerStats{playerstat: playerstats}
+	teamsLoader := &teamsLoader{team: team}
 	userTeamLoader := &userTeamLoader{team: team}
 	userServersLoader := &userServersLoader{server: server}
 	userMatchLoader := &userMatchLoader{match: match}
 	return &Loaders{
 		PlayersByTeamID:        dataloader.NewBatchedLoader[entity.TeamID, []*entity.Player](teamPlayersLoader.BatchGetPlayers),
 		MapStatsByMatchID:      dataloader.NewBatchedLoader[entity.MatchID, []*entity.MapStat](matchMapstatLoader.BatchGetMapStats),
 		PlayerStatsByMapStatID: dataloader.NewBatchedLoader[entity.MapStatsID, []*entity.PlayerStat](mapStatPlayerstatsLoader.BatchGetMapstats),
+		TeamsByTeamID:          dataloader.NewBatchedLoader[entity.TeamID, *entity.Team](teamsLoader.BatchGetTeams),
 		TeamByUserID:           dataloader.NewBatchedLoader[entity.UserID, []*entity.Team](userTeamLoader.BatchGetTeams),
 		ServersByUserID:        dataloader.NewBatchedLoader[entity.UserID, []*entity.GameServer](userServersLoader.BatchGetServers),
 		MatchByUserID:          dataloader.NewBatchedLoader[entity.UserID, []*entity.Match](userMatchLoader.BatchGetMatches),

backend/graph/dataloaders/mapstats_by_matchid.go

@@ -2,7 +2,6 @@ package dataloaders
 
 import (
 	"context"
-	"errors"
 
 	"github.com/graph-gophers/dataloader/v7"
 
@@ -19,7 +18,7 @@ func (m *matchMapstat) BatchGetMapStats(ctx context.Context, IDs []entity.MatchI
 	results := make([]*dataloader.Result[[]*entity.MapStat], len(IDs))
 	for i := range results {
 		results[i] = &dataloader.Result[[]*entity.MapStat]{
-			Error: errors.New("not found"),
+			Data: []*entity.MapStat{},
 		}
 	}
 

backend/graph/dataloaders/matches_by_userid.go

@@ -2,7 +2,6 @@ package dataloaders
 
 import (
 	"context"
-	"errors"
 
 	"github.com/FlowingSPDG/get5loader/backend/entity"
 	"github.com/FlowingSPDG/get5loader/backend/usecase"
@@ -18,7 +17,7 @@ func (u *userMatchLoader) BatchGetMatches(ctx context.Context, IDs []entity.User
 	results := make([]*dataloader.Result[[]*entity.Match], len(IDs))
 	for i := range results {
 		results[i] = &dataloader.Result[[]*entity.Match]{
-			Error: errors.New("not found"),
+			Data: []*entity.Match{},
 		}
 	}
 

backend/graph/dataloaders/players_by_teamid.go

@@ -2,7 +2,6 @@ package dataloaders
 
 import (
 	"context"
-	"errors"
 
 	"github.com/graph-gophers/dataloader/v7"
 
@@ -19,7 +18,7 @@ func (t *teamPlayersLoader) BatchGetPlayers(ctx context.Context, IDs []entity.Te
 	results := make([]*dataloader.Result[[]*entity.Player], len(IDs))
 	for i := range results {
 		results[i] = &dataloader.Result[[]*entity.Player]{
-			Error: errors.New("not found"),
+			Data: []*entity.Player{},
 		}
 	}
 
@@ -46,5 +45,6 @@ func (t *teamPlayersLoader) BatchGetPlayers(ctx context.Context, IDs []entity.Te
 		}
 		results[indexs[teamID]] = result
 	}
+
 	return results
 }