Fix rabbit review

voltgizerz · Jun 28, 2024 · 1e175ec · 1e175ec
1 parent 0ce5b61
commit 1e175ec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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