From 91254adfe3412998733749e7cfa5cc9672879bba Mon Sep 17 00:00:00 2001 From: SoXX Date: Tue, 15 Oct 2024 10:38:46 +0200 Subject: [PATCH] fix: wrong error message - fix the error message to be more precise what it is --- pkg/database/favorite.go | 2 +- pkg/database/pool.go | 2 +- pkg/database/pool_post.go | 8 ++++---- pkg/database/pool_reference.go | 8 ++++---- pkg/database/post.go | 2 +- pkg/database/source.go | 4 ++-- pkg/database/userSource.go | 4 ++-- pkg/error/validation.go | 28 ++++++++++++++-------------- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pkg/database/favorite.go b/pkg/database/favorite.go index 27384ac..a15f8da 100644 --- a/pkg/database/favorite.go +++ b/pkg/database/favorite.go @@ -183,7 +183,7 @@ func DeleteUserFavorite(ctx context.Context, id models.UserFavoriteID) error { } if len(id) != 25 { - return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.UserFavoriteIDToShort}) + return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.UserFavoriteIsWrongLength}) } result := client.WithContext(ctx).Delete(&userFavorite, id) diff --git a/pkg/database/pool.go b/pkg/database/pool.go index 4e4947d..e525fae 100644 --- a/pkg/database/pool.go +++ b/pkg/database/pool.go @@ -147,7 +147,7 @@ func DeletePool(ctx context.Context, id models.PoolID) error { } if len(id) != 25 { - return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PoolIDToShort}) + return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PoolIDIsWrongLength}) } result := client.WithContext(ctx).Delete(&pool, "id = ?", id) diff --git a/pkg/database/pool_post.go b/pkg/database/pool_post.go index b5d8f15..4d69595 100644 --- a/pkg/database/pool_post.go +++ b/pkg/database/pool_post.go @@ -37,7 +37,7 @@ func CreatePoolPost(ctx context.Context, poolID models.PoolID, postID models.Pos } if len(poolID) != 25 { - return models.PoolPost{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PoolIDToShort}) + return models.PoolPost{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PoolIDIsWrongLength}) } if postID == "" { @@ -45,7 +45,7 @@ func CreatePoolPost(ctx context.Context, poolID models.PoolID, postID models.Pos } if len(postID) != 25 { - return models.PoolPost{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PostIDToShort}) + return models.PoolPost{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PostIDIsWrongLength}) } poolPost := models.PoolPost{ @@ -93,7 +93,7 @@ func DeletePoolPost(ctx context.Context, poolID models.PoolID, postID models.Pos } if len(poolID) != 25 { - return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PoolIDToShort}) + return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PoolIDIsWrongLength}) } if postID == "" { @@ -101,7 +101,7 @@ func DeletePoolPost(ctx context.Context, poolID models.PoolID, postID models.Pos } if len(postID) != 25 { - return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PostIDToShort}) + return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PostIDIsWrongLength}) } result := client.WithContext(ctx).Delete(&poolPost, "pool_id = ? AND post_id = ?", poolID, postID) diff --git a/pkg/database/pool_reference.go b/pkg/database/pool_reference.go index f0f1dbb..e675a07 100644 --- a/pkg/database/pool_reference.go +++ b/pkg/database/pool_reference.go @@ -37,7 +37,7 @@ func CreatePoolReference(ctx context.Context, poolID models.PoolID, sourceID mod } if len(poolID) != 25 { - return models.PoolReference{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PoolIDToShort}) + return models.PoolReference{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PoolIDIsWrongLength}) } if sourceID == "" { @@ -45,7 +45,7 @@ func CreatePoolReference(ctx context.Context, poolID models.PoolID, sourceID mod } if len(sourceID) != 25 { - return models.PoolReference{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.SourceIDToShort}) + return models.PoolReference{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.SourceIDIsWrongLength}) } if url == "" { @@ -97,7 +97,7 @@ func DeletePoolReference(ctx context.Context, poolID models.PoolID, sourceID mod } if len(poolID) != 25 { - return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PostIDToShort}) + return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PostIDIsWrongLength}) } if sourceID == "" { @@ -105,7 +105,7 @@ func DeletePoolReference(ctx context.Context, poolID models.PoolID, sourceID mod } if len(sourceID) != 25 { - return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.SourceIDToShort}) + return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.SourceIDIsWrongLength}) } result := client.WithContext(ctx).Delete(&poolReference, "pool_id = ? AND source_id = ?", poolID, sourceID) diff --git a/pkg/database/post.go b/pkg/database/post.go index 1e0eefa..b857d81 100644 --- a/pkg/database/post.go +++ b/pkg/database/post.go @@ -191,7 +191,7 @@ func DeletePost(ctx context.Context, id models.PostID) error { } if len(id) != 25 { - return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PostIDToShort}) + return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.PostIDIsWrongLength}) } result := client.WithContext(ctx).Delete(&userFavorite, "id = ?", id) diff --git a/pkg/database/source.go b/pkg/database/source.go index 5c82cc3..d565252 100644 --- a/pkg/database/source.go +++ b/pkg/database/source.go @@ -155,7 +155,7 @@ func GetSourceByID(ctx context.Context, id models.SourceID) (models.Source, erro } if len(id) != 25 { - return models.Source{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.SourceIDToShort}) + return models.Source{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.SourceIDIsWrongLength}) } result := client.WithContext(ctx).First(&source, "id = ?", id) @@ -231,7 +231,7 @@ func DeleteSource(ctx context.Context, id models.SourceID) error { } if len(id) != 25 { - return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.SourceIDToShort}) + return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.SourceIDIsWrongLength}) } result := client.WithContext(ctx).Delete(&source, id) diff --git a/pkg/database/userSource.go b/pkg/database/userSource.go index 6338ee4..1afd13b 100644 --- a/pkg/database/userSource.go +++ b/pkg/database/userSource.go @@ -118,7 +118,7 @@ func GetUserSourceByID(ctx context.Context, id models.UserSourceID) (models.User } if len(id) != 25 { - return models.UserSource{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.UserSourceIDToShort}) + return models.UserSource{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.UserSourceIsWrongLength}) } result := client.WithContext(ctx).First(&user, "id = ?", id) @@ -157,7 +157,7 @@ func DeleteUserSource(ctx context.Context, id models.UserSourceID) error { } if len(id) != 25 { - return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.UserSourceIDToShort}) + return utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.UserSourceIsWrongLength}) } result := client.WithContext(ctx).Delete(&user, id) diff --git a/pkg/error/validation.go b/pkg/error/validation.go index 3219a1b..f91a447 100644 --- a/pkg/error/validation.go +++ b/pkg/error/validation.go @@ -3,13 +3,13 @@ package error import "fmt" const ( - SourceListIsEmpty = "sourceList cannot be empty" - SourceIDIsEmpty = "SourceID cannot be empty" - SourceIDToShort = "sourceID needs to be 25 characters long" - SourceDomainIsEmpty = "source Domain cannot be empty" + SourceListIsEmpty = "sourceList cannot be empty" + SourceIDIsEmpty = "SourceID cannot be empty" + SourceIDIsWrongLength = "sourceID has the wrong length" + SourceDomainIsEmpty = "source Domain cannot be empty" - UserSourceIDIsEmpty = "userSourceID cannot be empty" - UserSourceIDToShort = "userSourceID needs to be 25 characters long" + UserSourceIDIsEmpty = "userSourceID cannot be empty" + UserSourceIsWrongLength = "userSourceID has the wrong length" TagNameIsEmpty = "tagName cannot be empty" TagTypeIsEmpty = "tagType cannot be empty" @@ -21,18 +21,18 @@ const ( TagGroupListIsEmpty = "tagGroupList cannot be empty" TagGroupNameIsEmpty = "tagGroupName cannot be empty" - UserFavoriteListIsEmpty = "userFavoriteList cannot be empty" - UserFavoriteIDIsEmpty = "userFavoriteID cannot be empty" - UserFavoriteIDToShort = "userFavoriteID needs to be 25 characters long" + UserFavoriteListIsEmpty = "userFavoriteList cannot be empty" + UserFavoriteIDIsEmpty = "userFavoriteID cannot be empty" + UserFavoriteIsWrongLength = "userFavoriteID has the wrong length" - PostListIsEmpty = "userFavoriteList cannot be empty" - PostIDIsEmpty = "userFavoriteID cannot be empty" - PostIDToShort = "PostID needs to be 25 characters long" + PostListIsEmpty = "userFavoriteList cannot be empty" + PostIDIsEmpty = "userFavoriteID cannot be empty" + PostIDIsWrongLength = "PostID has the wrong length" BatchSizeIsEmpty = "batchSize cannot be empty" - PoolIDIsEmpty = "PoolID cannot be empty" - PoolIDToShort = "PoolID needs to be 25 characters long" + PoolIDIsEmpty = "PoolID cannot be empty" + PoolIDIsWrongLength = "PoolID has the wrong length" PoolURLIsEmpty = "PoolURL cannot be empty" )