Added errors for services

internal/application/errors/already_exists_error.go

@@ -0,0 +1,15 @@
+package errors
+
+type AlreadyExistsError struct {
+	msg string
+}
+
+func NewAlreadyExistsError(msg string) *AlreadyExistsError {
+	return &AlreadyExistsError{
+		msg: msg,
+	}
+}
+
+func (e *AlreadyExistsError) Error() string {
+	return "Already exists: " + e.msg
+}

internal/application/errors/db_error.go

@@ -4,12 +4,12 @@ type DBError struct {
 	msg string
 }
 
-func NewDBError(msg string) DBError {
-	return DBError{
+func NewDBError(msg string) *DBError {
+	return &DBError{
 		msg: msg,
 	}
 }
 
 func (e *DBError) Error() string {
-	return e.msg
+	return "Database error:" + e.msg
 }

internal/application/errors/not_found_error.go

@@ -11,5 +11,5 @@ func NewNotFoundError(msg string) *NotFoundError {
 }
 
 func (e *NotFoundError) Error() string {
-	return e.msg
+	return "Not found error: " + e.msg
 }

internal/application/errors/validation_error.go

@@ -0,0 +1,15 @@
+package errors
+
+type ValidationError struct {
+	msg string
+}
+
+func NewValidationError(msg string) *ValidationError {
+	return &ValidationError{
+		msg: msg,
+	}
+}
+
+func (e *ValidationError) Error() string {
+	return "Validation error: " + e.msg
+}

internal/application/services/post_service.go

@@ -3,13 +3,11 @@ package services
 import (
 	"58team_blog/internal/application/commands"
 	"58team_blog/internal/application/common"
-	ie "58team_blog/internal/application/errors"
+	"58team_blog/internal/application/errors"
 	"58team_blog/internal/application/mapper"
 	"58team_blog/internal/application/queries"
 	"58team_blog/internal/domain/entities"
 	"58team_blog/internal/domain/repository"
-	"errors"
-	"fmt"
 	"time"
 )
 
@@ -26,12 +24,12 @@ func CreatePostService(repo repository.PostRepository) PostService {
 func (s *PostService) Create(cmd commands.CreatePostCommand) (*common.PostResult, error) {
 	entity, err := entities.CreatePost(cmd.UserId, cmd.Title, cmd.Description, cmd.Content)
 	if err != nil {
-		return nil, err
+		return nil, errors.NewValidationError("Invalid input data " + err.Error())
 	}
 
 	post, err := s.repo.Create(&entity)
 	if err != nil {
-		return nil, fmt.Errorf("Db error: %s", err)
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	result := mapper.CreatePostResultFromEntity(post)
@@ -42,15 +40,15 @@ func (s *PostService) Create(cmd commands.CreatePostCommand) (*common.PostResult
 func (s *PostService) FindById(query queries.PostFindByIdQuery) (*queries.PostFindByIdResult, error) {
 	post, err := s.repo.FindById(query.Id)
 	if err != nil {
-		return nil, err
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	if post == nil {
-		return nil, ie.NewNotFoundError("Post")
+		return nil, errors.NewNotFoundError("Post")
 	}
 
 	if err := post.Validate(); err != nil {
-		return nil, err
+		return nil, errors.NewValidationError(err.Error())
 	}
 
 	result := mapper.CreatePostFindByIdResultFromEntity(*post)
@@ -61,12 +59,12 @@ func (s *PostService) FindById(query queries.PostFindByIdQuery) (*queries.PostFi
 func (s *PostService) FindAllByUserName(query queries.PostFindAllByUserNameQuery) (*queries.PostFindAllByUserNameResult, error) {
 	posts, err := s.repo.FindAllByUserName(query.UserName)
 	if err != nil {
-		return nil, err
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	for _, p := range posts {
 		if err := p.Validate(); err != nil {
-			return nil, err
+			return nil, errors.NewValidationError(err.Error())
 		}
 	}
 
@@ -78,12 +76,12 @@ func (s *PostService) FindAllByUserName(query queries.PostFindAllByUserNameQuery
 func (s *PostService) GetAll() (*queries.PostGetAllResult, error) {
 	posts, err := s.repo.GetAll()
 	if err != nil {
-		return nil, err
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	for _, p := range posts {
 		if err := p.Validate(); err != nil {
-			return nil, err
+			return nil, errors.NewValidationError(err.Error())
 		}
 	}
 
@@ -94,13 +92,12 @@ func (s *PostService) GetAll() (*queries.PostGetAllResult, error) {
 
 func (s *PostService) GetAllOffset(offset int) (*queries.PostGetAllResult, error) {
 	if offset < 0 {
-		return nil, errors.New("offset is less than 0")
+		return nil, errors.NewValidationError("offset is less than 0")
 	}
 
 	posts, err := s.repo.GetAllOffset(offset)
-
 	if err != nil {
-		return nil, err
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	result := mapper.CreatePostGetAllResult(posts)
@@ -111,11 +108,11 @@ func (s *PostService) GetAllOffset(offset int) (*queries.PostGetAllResult, error
 func (s *PostService) Update(cmd commands.UpdatePostCommand) (*common.PostResult, error) {
 	post, err := s.repo.FindById(cmd.Id)
 	if err != nil {
-		return nil, err
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	if err := post.Validate(); err != nil {
-		return nil, err
+		return nil, errors.NewValidationError(err.Error())
 	}
 
 	post.Title = cmd.Title
@@ -124,7 +121,7 @@ func (s *PostService) Update(cmd commands.UpdatePostCommand) (*common.PostResult
 	post.UpdatedAt = time.Now()
 
 	if err := post.Validate(); err != nil {
-		return nil, err
+		return nil, errors.NewValidationError(err.Error())
 	}
 
 	result := mapper.CreatePostResultFromEntity(post)
@@ -135,16 +132,16 @@ func (s *PostService) Update(cmd commands.UpdatePostCommand) (*common.PostResult
 func (s *PostService) Delete(cmd commands.DeletePostCommand) error {
 	post, err := s.repo.FindById(cmd.Id)
 	if err != nil {
-		return err
+		return errors.NewDBError(err.Error())
 	}
 
 	if err := post.Validate(); err != nil {
-		return err
+		return errors.NewValidationError(err.Error())
 	}
 
 	err = s.repo.Delete(cmd.Id)
 	if err != nil {
-		return err
+		return errors.NewDBError(err.Error())
 	}
 
 	return nil

internal/application/services/user_service.go

@@ -3,12 +3,11 @@ package services
 import (
 	"58team_blog/internal/application/commands"
 	"58team_blog/internal/application/common"
+	"58team_blog/internal/application/errors"
 	"58team_blog/internal/application/mapper"
 	"58team_blog/internal/application/queries"
 	"58team_blog/internal/domain/entities"
 	"58team_blog/internal/domain/repository"
-	"errors"
-	"fmt"
 )
 
 type UserService struct {
@@ -26,27 +25,23 @@ func (s *UserService) Create(cmd commands.CreateUserCommand) (*common.UserResult
 	{
 		user, err := s.repo.FindByName(cmd.Username)
 		if err != nil {
-			return nil, fmt.Errorf("User.create findByName error: %s", err)
+			return nil, errors.NewDBError(err.Error())
 		}
 
 		if user != nil {
-			return nil, fmt.Errorf("User: %s already exists", user.UserName)
+			return nil, errors.NewAlreadyExistsError("user: " + cmd.Username)
 		}
 	}
 
 	// Create new user
 	user, err := entities.CreateUser(cmd.Username, cmd.Password)
 	if err != nil {
-		return nil, err
-	}
-
-	if err := user.Validate(); err != nil {
-		return nil, err
+		return nil, errors.NewValidationError(err.Error())
 	}
 
 	entity, err := s.repo.Create(&user)
 	if err != nil {
-		return nil, err
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	result := mapper.CreateUserResultFromEntity(entity)
@@ -57,11 +52,11 @@ func (s *UserService) Create(cmd commands.CreateUserCommand) (*common.UserResult
 func (s *UserService) FindById(query queries.UserFindByIdQuery) (*queries.UserFindByIdResult, error) {
 	entity, err := s.repo.FindById(query.Id)
 	if err != nil {
-		return nil, err
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	if err := entity.Validate(); err != nil {
-		return nil, err
+		return nil, errors.NewValidationError(err.Error())
 	}
 
 	result := mapper.CreateUserFindByIdResultFromEntity(entity)
@@ -72,11 +67,11 @@ func (s *UserService) FindById(query queries.UserFindByIdQuery) (*queries.UserFi
 func (s *UserService) FindByName(query queries.UserFindByNameQuery) (*queries.UserFindByNameResult, error) {
 	entity, err := s.repo.FindByName(query.Name)
 	if err != nil {
-		return nil, err
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	if err := entity.Validate(); err != nil {
-		return nil, err
+		return nil, errors.NewValidationError(err.Error())
 	}
 
 	result := mapper.CreateUserFindByNameResultFromEntity(entity)
@@ -86,12 +81,12 @@ func (s *UserService) FindByName(query queries.UserFindByNameQuery) (*queries.Us
 func (s *UserService) GetAll() (*queries.UserGetAllResult, error) {
 	entityList, err := s.repo.GetAll()
 	if err != nil {
-		return nil, err
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	for _, e := range entityList {
 		if err := e.Validate(); err != nil {
-			return nil, err
+			return nil, errors.NewValidationError(err.Error())
 		}
 	}
 
@@ -102,25 +97,25 @@ func (s *UserService) GetAll() (*queries.UserGetAllResult, error) {
 func (s *UserService) Update(cmd commands.UpdateUserCommand) (*common.UserResult, error) {
 	entity, err := s.repo.FindById(cmd.Id)
 	if err != nil {
-		return nil, err
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	if err := entity.Validate(); err != nil {
-		return nil, err
+		return nil, errors.NewValidationError(err.Error())
 	}
 
 	if cmd.Username != entity.UserName {
-		return nil, errors.New("You cannot change user name")
+		return nil, errors.NewValidationError("You cannot change user name")
 	}
 
 	entity.Password = cmd.Password
 
 	if err := entity.Validate(); err != nil {
-		return nil, err
+		return nil, errors.NewValidationError(err.Error())
 	}
 
 	if err := s.repo.Update(entity); err != nil {
-		return nil, err
+		return nil, errors.NewDBError(err.Error())
 	}
 
 	result := mapper.CreateUserResultFromEntity(entity)
@@ -130,15 +125,15 @@ func (s *UserService) Update(cmd commands.UpdateUserCommand) (*common.UserResult
 func (s *UserService) Delete(cmd commands.DeleteUserCommand) error {
 	entity, err := s.repo.FindById(cmd.Id)
 	if err != nil {
-		return err
+		return errors.NewDBError(err.Error())
 	}
 
 	if err := entity.Validate(); err != nil {
-		return err
+		return errors.NewValidationError(err.Error())
 	}
 
 	if err := s.repo.Delete(entity.Id); err != nil {
-		return err
+		return errors.NewDBError(err.Error())
 	}
 
 	return nil