Added errors for services

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