fix

internal/app/gameplay_errors.go

@@ -0,0 +1,20 @@
+package app
+
+import (
+	"errors"
+
+	"evening_detective_server/internal/services/gameplay_service"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+func gameplayErrorStatus(err error, internalMessage string) error {
+	if errors.Is(err, gameplay_service.ErrTeamNotFound) {
+		return status.Error(codes.NotFound, gameplay_service.ErrTeamNotFound.Error())
+	}
+	if errors.Is(err, gameplay_service.ErrGameNotFound) {
+		return status.Error(codes.NotFound, gameplay_service.ErrGameNotFound.Error())
+	}
+	return status.Error(codes.Internal, internalMessage)
+}

internal/app/teams.go

@@ -105,9 +105,7 @@ func (s *server) GiveTeamApplications(ctx context.Context, req *proto.GiveTeamAp
 		req.Name,
 	)
 	if err != nil {
-		return &proto.GiveTeamApplicationsRsp{
-			Error: err.Error(),
-		}, nil
+		return nil, gameplayErrorStatus(err, "не удалось обработать заявку команды")
 	}
 
 	return &proto.GiveTeamApplicationsRsp{}, nil
@@ -120,9 +118,7 @@ func (s *server) GetTeamStory(ctx context.Context, req *proto.GetTeamStoryReq) (
 		req.Password,
 	)
 	if err != nil {
-		return &proto.GetTeamStoryRsp{
-			Error: err.Error(),
-		}, nil
+		return nil, gameplayErrorStatus(err, "не удалось получить историю команды")
 	}
 	protoActions := make([]*proto.TeamAction, 0, len(actions))
 	for _, action := range actions {
@@ -145,9 +141,7 @@ func (s *server) AddTeamAction(ctx context.Context, req *proto.AddTeamActionReq)
 		false,
 	)
 	if err != nil {
-		return &proto.AddTeamActionRsp{
-			Error: err.Error(),
-		}, nil
+		return nil, gameplayErrorStatus(err, "не удалось добавить действие команды")
 	}
 
 	return &proto.AddTeamActionRsp{}, nil
@@ -167,9 +161,7 @@ func (s *server) DeleteLastTeamAction(ctx context.Context, req *proto.DeleteLast
 		int(req.ID),
 	)
 	if err != nil {
-		return &proto.DeleteLastTeamActionRsp{
-			Error: err.Error(),
-		}, nil
+		return nil, gameplayErrorStatus(err, "не удалось удалить последнее действие команды")
 	}
 
 	return &proto.DeleteLastTeamActionRsp{}, nil

internal/app/user_errors.go

@@ -3,7 +3,6 @@ package app
 import (
 	"errors"
 
-	"evening_detective_server/internal/repos/users_repo"
 	"evening_detective_server/internal/services/users_service"
 
 	"google.golang.org/grpc/codes"
@@ -16,7 +15,7 @@ func userErrorStatus(err error, internalMessage string) error {
 		return status.Error(codes.NotFound, err.Error())
 	case errors.Is(err, users_service.ErrTermsNotAccepted), errors.Is(err, users_service.ErrInvalidEmail), errors.Is(err, users_service.ErrInvalidRole), errors.Is(err, users_service.ErrInvalidPasswordChange):
 		return status.Error(codes.InvalidArgument, err.Error())
-	case errors.Is(err, users_service.ErrInvalidCredentials), errors.Is(err, users_repo.ErrUserNotFound):
+	case errors.Is(err, users_service.ErrInvalidCredentials):
 		return status.Error(codes.Unauthenticated, users_service.ErrInvalidCredentials.Error())
 	case errors.Is(err, users_service.ErrInvalidAccountPassword):
 		return status.Error(codes.PermissionDenied, err.Error())