The_evening_detective/evening_detective_server
1
0
Fork 0
generated from VLADIMIR/template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates

Browse Source
This commit is contained in:
Владимир Фёдоров
2026-10-01 16:16:43 +07:00
parent 06c657f593
commit 9f081eeee5
6 changed files with 106 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/app/game_map.go
+15 -8
View File
@@ -4,7 +4,7 @@ import (
"context"
"errors"
"evening_detective_server/internal/repos/game_map_repo"
"evening_detective_server/internal/services/map_service"
proto "evening_detective_server/proto"
"google.golang.org/grpc/codes"
@@ -22,14 +22,14 @@ func (s *server) GetGameMap(ctx context.Context, req *proto.GetGameMapReq) (*pro
if err != nil {
return nil, status.Error(codes.NotFound, "игра не найдена")
}
if err := s.mapRepo.Ensure(ctx, int(req.GameID), "organizer_desk", 1); err != nil {
if err := s.mapService.Ensure(ctx, int(req.GameID), "organizer_desk", 1); err != nil {
return nil, status.Error(codes.Internal, "не удалось сохранить карту")
}
for _, team := range game.Teams {
if team.ParticipationStatus == "cancelled" {
continue
}
if err := s.mapRepo.Ensure(ctx, int(req.GameID), "team", team.ID); err != nil {
if err := s.mapService.Ensure(ctx, int(req.GameID), "team", team.ID); err != nil {
return nil, status.Error(codes.Internal, "не удалось сохранить карту")
}
}
@@ -38,11 +38,11 @@ func (s *server) GetGameMap(ctx context.Context, req *proto.GetGameMapReq) (*pro
return nil, status.Error(codes.Internal, "не удалось получить экраны")
}
for _, screen := range screens {
if err := s.mapRepo.Ensure(ctx, int(req.GameID), "screen", screen.ID); err != nil {
if err := s.mapService.Ensure(ctx, int(req.GameID), "screen", screen.ID); err != nil {
return nil, status.Error(codes.Internal, "не удалось сохранить карту")
}
}
items, err := s.mapRepo.List(ctx, int(req.GameID))
items, err := s.mapService.List(ctx, int(req.GameID))
if err != nil {
return nil, status.Error(codes.Internal, "не удалось получить карту")
}
@@ -61,7 +61,7 @@ func (s *server) GetGameMap(ctx context.Context, req *proto.GetGameMapReq) (*pro
for _, item := range items {
_, teamExists := teamNames[item.ItemID]
if (item.Kind == "team" && !teamExists) || (item.Kind == "screen" && screenStates[item.ItemID] == nil) {
if err := s.mapRepo.Delete(ctx, item); err != nil {
if err := s.mapService.Delete(ctx, item); err != nil {
return nil, status.Error(codes.Internal, "не удалось обновить карту")
}
continue
@@ -90,8 +90,15 @@ func (s *server) UpdateGameMapItem(ctx context.Context, req *proto.UpdateGameMap
if req == nil || req.GameID <= 0 || req.ItemID <= 0 || (req.Kind != "team" && req.Kind != "screen" && req.Kind != "organizer_desk") {
return nil, status.Error(codes.InvalidArgument, "некорректный объект карты")
}
if err := s.mapRepo.Update(ctx, game_map_repo.Item{GameID: int(req.GameID), Kind: req.Kind, ItemID: int(req.ItemID), X: int(req.X), Y: int(req.Y), Hidden: req.Hidden}); err != nil {
if errors.Is(err, game_map_repo.ErrItemNotFound) {
if err := s.mapService.Update(ctx, &map_service.MapItem{
GameID: int(req.GameID),
Kind: req.Kind,
ItemID: int(req.ItemID),
X: int(req.X),
Y: int(req.Y),
Hidden: req.Hidden,
}); err != nil {
if errors.Is(err, map_service.ErrItemNotFound) {
return nil, status.Error(codes.NotFound, "объект карты не найден")
}
return nil, status.Error(codes.Internal, "не удалось изменить карту")