From 0ce5b61d4f9e728f6a24cf9e0e4088b9578ae918 Mon Sep 17 00:00:00 2001 From: Felix Fernando Wijaya Date: Fri, 28 Jun 2024 20:19:00 +0700 Subject: [PATCH 1/2] Update internal/app/entity/menu_entity.go Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- internal/app/entity/menu_entity.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/app/entity/menu_entity.go b/internal/app/entity/menu_entity.go index 53dd373..7450368 100644 --- a/internal/app/entity/menu_entity.go +++ b/internal/app/entity/menu_entity.go @@ -17,7 +17,7 @@ type Menu struct { type MenuORM struct { ID int64 `db:"id"` Name string `db:"name"` - UserId int64 `db:"user_id"` + UserID int64 `db:"user_id"` Thumbnail string `db:"thumbnail"` Price float64 `db:"price"` IsActive bool `db:"is_active"` From 1e175eca60b7685e2e0956148b461ffaa87db86d Mon Sep 17 00:00:00 2001 From: Felix Fernando Wijaya Date: Fri, 28 Jun 2024 20:27:08 +0700 Subject: [PATCH 2/2] Fix rabbit review --- internal/app/repository/menu_repository.go | 4 ++-- internal/app/service/menu_service.go | 4 ++-- internal/utils/validator.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/app/repository/menu_repository.go b/internal/app/repository/menu_repository.go index 9afb4b5..1ded38b 100644 --- a/internal/app/repository/menu_repository.go +++ b/internal/app/repository/menu_repository.go @@ -78,7 +78,7 @@ func (m *MenuRepository) UpdateMenuByMenuID(ctx context.Context, menuData *entit span, ctx := opentracing.StartSpanFromContext(ctx, "repo.MenuRepository.UpdateMenuByMenuID") defer span.Finish() - result, err := m.MasterDB.ExecContext(ctx, queryUpdateMenuByMenuId, menuData.Name, menuData.Price, menuData.Thumbnail, menuData.IsActive, menuData.UserId, time.Now(), menuData.ID) + result, err := m.MasterDB.ExecContext(ctx, queryUpdateMenuByMenuId, menuData.Name, menuData.Price, menuData.Thumbnail, menuData.IsActive, menuData.UserID, time.Now(), menuData.ID) if err != nil { return 0, err } @@ -100,7 +100,7 @@ func (m *MenuRepository) AddMenu(ctx context.Context, menuData entity.MenuORM) ( span, ctx := opentracing.StartSpanFromContext(ctx, "repo.MenuRepository.AddMenu") defer span.Finish() - result, err := m.MasterDB.ExecContext(ctx, queryInsertMenu, menuData.Name, menuData.Thumbnail, menuData.Price, menuData.IsActive, menuData.UserId) + result, err := m.MasterDB.ExecContext(ctx, queryInsertMenu, menuData.Name, menuData.Thumbnail, menuData.Price, menuData.IsActive, menuData.UserID) if err != nil { return 0, err } diff --git a/internal/app/service/menu_service.go b/internal/app/service/menu_service.go index 44dbfb5..08f2fb1 100644 --- a/internal/app/service/menu_service.go +++ b/internal/app/service/menu_service.go @@ -28,7 +28,7 @@ func (s *MenuService) RegisterMenu(ctx context.Context, menuData entity.Menu) (i menuConvert := entity.MenuORM{ Name: menuData.Name, Thumbnail: menuData.Thumbnail, - UserId: menuData.UserID, + UserID: menuData.UserID, Price: menuData.Price, } @@ -113,7 +113,7 @@ func (s *MenuService) UpdateMenuID(ctx context.Context, menuData entity.Menu) (i Name: menuData.Name, Thumbnail: menuData.Thumbnail, Price: menuData.Price, - UserId: menuData.UserID, + UserID: menuData.UserID, IsActive: menuData.IsActive, } diff --git a/internal/utils/validator.go b/internal/utils/validator.go index e15cef0..8232dbf 100644 --- a/internal/utils/validator.go +++ b/internal/utils/validator.go @@ -7,9 +7,9 @@ import ( ) func GetFirstValidatorError(valErr error) (err error) { - for _, valErr := range valErr.(validator.ValidationErrors) { - err = fmt.Errorf("field %s %s", valErr.Field(), valErr.Tag()) - continue + valErrs := valErr.(validator.ValidationErrors) + if len(valErrs) != 0 { + err = fmt.Errorf("field %s %s", valErrs[0].Field(), valErrs[0].Tag()) } return err