diff --git a/backend/internal/httpapi/dto/error.go b/backend/internal/httpapi/dto/error.go index 0fe6c00..4466e73 100644 --- a/backend/internal/httpapi/dto/error.go +++ b/backend/internal/httpapi/dto/error.go @@ -25,9 +25,14 @@ type coded interface { func ErrorFromDomain(err error, requestID string) ErrorResponse { var c coded if errors.As(err, &c) { + code := c.Code() + message := err.Error() + if code == domain.CodeInternalError { + message = "внутренняя ошибка" + } return ErrorResponse{Error: ErrorBody{ - Code: string(c.Code()), - Message: err.Error(), + Code: string(code), + Message: message, RequestID: requestID, }} } @@ -39,14 +44,20 @@ func ErrorFromDomain(err error, requestID string) ErrorResponse { code = domain.CodeConflict case errors.Is(err, domain.ErrInvalidInput): code = domain.CodeInvalidRequest - case errors.Is(err, domain.ErrForbidden): + case errors.Is(err, domain.ErrUnauthorized): code = domain.CodeUnauthorized case errors.Is(err, domain.ErrUnsupportedMediaType): code = domain.CodeUnsupportedMediaType + case errors.Is(err, domain.ErrUnavailable): + code = domain.CodeUnavailable + } + message := err.Error() + if code == domain.CodeInternalError { + message = "внутренняя ошибка" } return ErrorResponse{Error: ErrorBody{ Code: string(code), - Message: err.Error(), + Message: message, RequestID: requestID, }} } @@ -59,10 +70,12 @@ func StatusFromError(err error) int { return 409 case errors.Is(err, domain.ErrInvalidInput): return 400 - case errors.Is(err, domain.ErrForbidden): + case errors.Is(err, domain.ErrUnauthorized): return 401 case errors.Is(err, domain.ErrUnsupportedMediaType): return 415 + case errors.Is(err, domain.ErrUnavailable): + return 503 default: return 500 } diff --git a/backend/internal/httpapi/dto/user.go b/backend/internal/httpapi/dto/user.go index 07b9ebf..0a027c1 100644 --- a/backend/internal/httpapi/dto/user.go +++ b/backend/internal/httpapi/dto/user.go @@ -9,6 +9,7 @@ const timeFormat = "2006-01-02T15:04:05.000000Z07:00" type CreateUserRequest struct { Username string `json:"username" binding:"required,min=3,max=32"` DisplayName string `json:"display_name" binding:"required,min=1,max=100"` + Password string `json:"password" binding:"required,min=12,max=128"` } type UserResponse struct {