Fix conflict

voltgizerz · Jul 8, 2024 · 1b54695 · 1b54695
2 parents 6d69ccb + c255d69
commit 1b54695
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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"`

diff --git a/internal/app/repository/menu_repository.go b/internal/app/repository/menu_repository.go
@@ -88,7 +88,7 @@ func (m *MenuRepository) UpdateMenuByMenuID(ctx context.Context, tx *sql.Tx, men
 	span, ctx := opentracing.StartSpanFromContext(ctx, "repo.MenuRepository.UpdateMenuByMenuID")
 	defer span.Finish()
 
-	result, err := m.execQuery(ctx, tx, queryUpdateMenuByMenuID, menuData.Name, menuData.Price, menuData.Thumbnail, menuData.IsActive, menuData.UserId, time.Now(), menuData.ID)
+	result, err := m.execQuery(ctx, tx, queryUpdateMenuByMenuID, menuData.Name, menuData.Price, menuData.Thumbnail, menuData.IsActive, menuData.UserID, time.Now(), menuData.ID)
 	if err != nil {
 		return 0, err
 	}
@@ -110,7 +110,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
@@ -30,7 +30,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,
 	}
 
@@ -115,7 +115,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