Add servers tests

Author: leighmacdonald

frontend/src/api/server.ts

@@ -106,7 +106,7 @@ export const apiSaveServer = async (server_id: number, opts: SaveServerOpts) =>
 };
 
 export const apiGetServersAdmin = async (abortController?: AbortController) => {
-    const resp = await apiCall<Server[]>(`/api/servers_admin`, 'POST', undefined, abortController);
+    const resp = await apiCall<Server[]>(`/api/servers_admin`, 'GET', undefined, abortController);
     return resp.map(transformTimeStampedDates).map((s) => {
         s.token_created_on = parseDateTime(s.token_created_on as unknown as string);
         return s;

internal/auth/auth_usecase.go

@@ -213,7 +213,7 @@ func (u *auth) AuthServerMiddleWare() gin.HandlerFunc {
 		}
 
 		var server domain.Server
-		if errServer := u.servers.GetServerByPassword(ctx, reqAuthHeader, &server, false, false); errServer != nil {
+		if errServer := u.servers.GetByPassword(ctx, reqAuthHeader, &server, false, false); errServer != nil {
 			slog.Error("Failed to load server during auth", log.ErrAttr(errServer), slog.String("token", reqAuthHeader), slog.String("IP", ctx.ClientIP()))
 			ctx.AbortWithStatus(http.StatusUnauthorized)
 

internal/demo/demo_usecase.go

@@ -210,7 +210,7 @@ func (d demoUsecase) GetDemos(ctx context.Context) ([]domain.DemoFile, error) {
 }
 
 func (d demoUsecase) CreateFromAsset(ctx context.Context, asset domain.Asset, serverID int) (*domain.DemoFile, error) {
-	_, errGetServer := d.servers.GetServer(ctx, serverID)
+	_, errGetServer := d.servers.Server(ctx, serverID)
 	if errGetServer != nil {
 		return nil, domain.ErrGetServer
 	}

internal/discord/discord_service.go

@@ -366,7 +366,7 @@ func (h discordService) makeOnSay() func(context.Context, *discordgo.Session, *d
 		msg := opts[domain.OptMessage].StringValue()
 
 		var server domain.Server
-		if err := h.servers.GetServerByName(ctx, serverName, &server, false, false); err != nil {
+		if err := h.servers.GetByName(ctx, serverName, &server, false, false); err != nil {
 			return nil, domain.ErrUnknownServer
 		}
 
@@ -386,7 +386,7 @@ func (h discordService) makeOnCSay() func(_ context.Context, _ *discordgo.Sessio
 		msg := opts[domain.OptMessage].StringValue()
 
 		var server domain.Server
-		if err := h.servers.GetServerByName(ctx, serverName, &server, false, false); err != nil {
+		if err := h.servers.GetByName(ctx, serverName, &server, false, false); err != nil {
 			return nil, domain.ErrUnknownServer
 		}
 
@@ -665,7 +665,7 @@ func (h discordService) makeOnFind() func(context.Context, *discordgo.Session, *
 		var found []domain.FoundPlayer
 
 		for _, player := range players {
-			server, errServer := h.servers.GetServer(ctx, player.ServerID)
+			server, errServer := h.servers.Server(ctx, player.ServerID)
 			if errServer != nil {
 				return nil, errors.Join(errServer, domain.ErrGetServer)
 			}

internal/domain/server.go

@@ -12,13 +12,40 @@ import (
 	"github.com/leighmacdonald/steamid/v4/steamid"
 )
 
+type RequestServerUpdate struct {
+	ServerID        int     `json:"server_id"`
+	ServerName      string  `json:"server_name"`
+	ServerNameShort string  `json:"server_name_short"`
+	Host            string  `json:"host"`
+	Port            int     `json:"port"`
+	ReservedSlots   int     `json:"reserved_slots"`
+	Password        string  `json:"password"`
+	RCON            string  `json:"rcon"`
+	Lat             float64 `json:"lat"`
+	Lon             float64 `json:"lon"`
+	CC              string  `json:"cc"`
+	DefaultMap      string  `json:"default_map"`
+	Region          string  `json:"region"`
+	IsEnabled       bool    `json:"is_enabled"`
+	EnableStats     bool    `json:"enable_stats"`
+	LogSecret       int     `json:"log_secret"`
+}
+
+type ServerInfoSafe struct {
+	ServerNameLong string `json:"server_name_long"`
+	ServerName     string `json:"server_name"`
+	ServerID       int    `json:"server_id"`
+	Colour         string `json:"colour"`
+}
+
 type ServersUsecase interface {
-	GetServer(ctx context.Context, serverID int) (Server, error)
-	GetServerPermissions(ctx context.Context) ([]ServerPermission, error)
-	GetServers(ctx context.Context, filter ServerQueryFilter) ([]Server, int64, error)
-	GetServerByName(ctx context.Context, serverName string, server *Server, disabledOk bool, deletedOk bool) error
-	GetServerByPassword(ctx context.Context, serverPassword string, server *Server, disabledOk bool, deletedOk bool) error
-	SaveServer(ctx context.Context, server *Server) error
+	Server(ctx context.Context, serverID int) (Server, error)
+	ServerPermissions(ctx context.Context) ([]ServerPermission, error)
+	Servers(ctx context.Context, filter ServerQueryFilter) ([]Server, int64, error)
+	GetByName(ctx context.Context, serverName string, server *Server, disabledOk bool, deletedOk bool) error
+	GetByPassword(ctx context.Context, serverPassword string, server *Server, disabledOk bool, deletedOk bool) error
+	Save(ctx context.Context, req RequestServerUpdate) (Server, error)
+	Delete(ctx context.Context, serverID int) error
 }
 
 type ServersRepository interface {

internal/httphelper/http.go

@@ -87,6 +87,10 @@ func HandleErrs(ctx *gin.Context, err error) {
 		HandleErrPermissionDenied(ctx)
 	case errors.Is(err, domain.ErrNoResult):
 		HandleErrNotFound(ctx)
+	case errors.Is(err, domain.ErrParamKeyMissing):
+		HandleErrBadRequest(ctx)
+	case errors.Is(err, domain.ErrInvalidParameter):
+		HandleErrBadRequest(ctx)
 	case errors.Is(err, domain.ErrBadRequest):
 		HandleErrBadRequest(ctx)
 	case errors.Is(err, domain.ErrDuplicate):

internal/match/match_repository.go

@@ -66,7 +66,7 @@ func (r *matchRepository) onMatchComplete(ctx context.Context, matchContext *act
 		matchContext.match.Title = server.Name
 	}
 
-	fullServer, err := r.servers.GetServer(ctx, server.ServerID)
+	fullServer, err := r.servers.Server(ctx, server.ServerID)
 	if err != nil {
 		return errors.Join(err, domain.ErrLoadServer)
 	}

internal/match/match_service.go

@@ -96,7 +96,7 @@ func (h matchHandler) onAPIPostMatchStart() gin.HandlerFunc {
 			return
 		}
 
-		server, errServer := h.servers.GetServer(ctx, serverID)
+		server, errServer := h.servers.Server(ctx, serverID)
 		if errServer != nil {
 			httphelper.ResponseErr(ctx, http.StatusInternalServerError, domain.ErrUnknownServerID)
 			slog.Error("Failed to get server", log.ErrAttr(errServer))

internal/match/match_usecase.go

@@ -54,7 +54,7 @@ func (m matchUsecase) EndMatch(ctx context.Context, serverID int) (uuid.UUID, er
 		return matchID, domain.ErrLoadMatch
 	}
 
-	server, errServer := m.servers.GetServer(ctx, serverID)
+	server, errServer := m.servers.Server(ctx, serverID)
 	if errServer != nil {
 		return matchID, errors.Join(errServer, domain.ErrUnknownServer)
 	}

internal/network/scp.go

@@ -73,7 +73,7 @@ func (f SCPExecer) Start(ctx context.Context) {
 }
 
 func (f SCPExecer) update(ctx context.Context) error {
-	servers, _, errServers := f.serversUsecase.GetServers(ctx, domain.ServerQueryFilter{})
+	servers, _, errServers := f.serversUsecase.Servers(ctx, domain.ServerQueryFilter{})
 	if errServers != nil {
 		return errServers
 	}