refac: repository updates, image attachment and deletes report the domain not-found error for an unknown id, the same for articles, users and images, and the test fakes stop returning GORM errors

internal/infrastructure/persistence/repositories/articleRepository.go

@@ -2,6 +2,7 @@ package persistence
 
 import (
 	domain "RenewCMS/internal/domain/article"
+	imageDomain "RenewCMS/internal/domain/image"
 	"RenewCMS/internal/infrastructure/persistence/mappers"
 	entity "RenewCMS/internal/infrastructure/persistence/models"
 
@@ -89,7 +90,7 @@ func (a *ArticleRepository) UpdateBody(id uint32, body string) (domain.Article,
 	var localArticle entity.Article
 	err := a.db.Model(&entity.Article{}).First(&localArticle, id).Error
 	if err != nil {
-		return domain.Article{}, err
+		return domain.Article{}, mapNotFoundErr(err, domain.ErrArticleNotFound)
 	}
 
 	localArticle.Body = body
@@ -107,7 +108,7 @@ func (a *ArticleRepository) UpdateIsOnline(id uint32, isOnline bool) (domain.Art
 	var localArticle entity.Article
 	err := a.db.Model(&entity.Article{}).First(&localArticle, id).Error
 	if err != nil {
-		return domain.Article{}, err
+		return domain.Article{}, mapNotFoundErr(err, domain.ErrArticleNotFound)
 	}
 
 	localArticle.IsOnline = isOnline
@@ -120,20 +121,21 @@ func (a *ArticleRepository) UpdateIsOnline(id uint32, isOnline bool) (domain.Art
 }
 
 func (a *ArticleRepository) Delete(id uint32) error {
-	return a.db.Delete(&entity.Article{}, id).Error
+	result := a.db.Delete(&entity.Article{}, id)
+	return deleteOrNotFound(result, domain.ErrArticleNotFound)
 }
 
 func (a *ArticleRepository) AddImage(articleId uint32, imageId uint32) error {
 	var localArticle entity.Article
 	err := a.db.Model(&entity.Article{}).First(&localArticle, articleId).Error
 	if err != nil {
-		return err
+		return mapNotFoundErr(err, domain.ErrArticleNotFound)
 	}
 
 	var localImage entity.Image
 	err = a.db.Model(&entity.Image{}).First(&localImage, imageId).Error
 	if err != nil {
-		return err
+		return mapNotFoundErr(err, imageDomain.ErrImageNotFound)
 	}
 
 	err = a.db.Model(&localArticle).Association("Images").Append(&localImage)

internal/infrastructure/persistence/repositories/imageRepository.go

@@ -65,7 +65,7 @@ func (i ImageRepository) Delete(id uint32) error {
 	var entityImage entity.Image
 	err := i.db.Model(&entity.Image{}).First(&entityImage, id).Error
 	if err != nil {
-		return err
+		return mapNotFoundErr(err, domain.ErrImageNotFound)
 	}
 
 	fileName := filepath.Base(entityImage.Path)

internal/infrastructure/persistence/repositories/notFound.go

@@ -12,3 +12,13 @@ func mapNotFoundErr(err error, sentinel error) error {
 	}
 	return err
 }
+
+func deleteOrNotFound(result *gorm.DB, sentinel error) error {
+	if result.Error != nil {
+		return result.Error
+	}
+	if result.RowsAffected == 0 {
+		return sentinel
+	}
+	return nil
+}

internal/infrastructure/persistence/repositories/userRepository.go

@@ -46,7 +46,8 @@ func (u *UserRepository) Create(user domainUser.User) (domainUser.User, error) {
 }
 
 func (u *UserRepository) Delete(id uint32) error {
-	return u.db.Delete(&domainUser.User{}, id).Error
+	result := u.db.Delete(&domainUser.User{}, id)
+	return deleteOrNotFound(result, domainUser.ErrUserNotFound)
 }
 
 func (u *UserRepository) GetAll() []domainUser.User {
@@ -85,7 +86,7 @@ func (u *UserRepository) UpdateVerificationStatus(userId uint32, isVerified bool
 	var localUser entity.User
 	err := u.db.Model(&entity.User{}).First(&localUser, userId).Error
 	if err != nil {
-		return domainUser.User{}, err
+		return domainUser.User{}, mapNotFoundErr(err, domainUser.ErrUserNotFound)
 	}
 
 	localUser.IsVerified = isVerified
@@ -101,7 +102,7 @@ func (u *UserRepository) UpdatePassword(userId uint32, password string) (domainU
 	var localUser entity.User
 	err := u.db.Model(&entity.User{}).First(&localUser, userId).Error
 	if err != nil {
-		return domainUser.User{}, err
+		return domainUser.User{}, mapNotFoundErr(err, domainUser.ErrUserNotFound)
 	}
 
 	localUser.Password = password
@@ -117,7 +118,7 @@ func (u *UserRepository) UpdatePasswordResetCode(userId uint32, code string) (do
 	var localUser entity.User
 	err := u.db.Model(&entity.User{}).First(&localUser, userId).Error
 	if err != nil {
-		return domainUser.User{}, err
+		return domainUser.User{}, mapNotFoundErr(err, domainUser.ErrUserNotFound)
 	}
 
 	localUser.PasswordResetCode = code