fix: rename DeleteUserBadge to DeleteUserBadgeAward

apache · Jan 3, 2025 · ac8d027 · ac8d027
1 parent d9bd3a2
commit ac8d027
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
diff --git a/internal/repo/badge/badge_repo.go b/internal/repo/badge/badge_repo.go
@@ -149,12 +149,3 @@ func (r *badgeRepo) UpdateAwardCount(ctx context.Context, badgeID string, awardC
 	}
 	return
 }
-
-// DeleteUserBadge delete user badge
-func (r *badgeRepo) DeleteUserBadge(ctx context.Context, userID string) (err error) {
-	_, err = r.data.DB.Context(ctx).Where("user_id = ?", userID).Delete(&entity.BadgeAward{})
-	if err != nil {
-		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
-	}
-	return
-}
diff --git a/internal/repo/badge_award/badge_award_repo.go b/internal/repo/badge_award/badge_award_repo.go
@@ -184,3 +184,12 @@ func (r *badgeAwardRepo) GetByUserIdAndBadgeIdAndAwardKey(ctx context.Context, u
 	}
 	return
 }
+
+// DeleteUserBadgeAward delete user badge award
+func (r *badgeAwardRepo) DeleteUserBadgeAward(ctx context.Context, userID string) (err error) {
+	_, err = r.data.DB.Context(ctx).Where("user_id = ?", userID).Delete(&entity.BadgeAward{})
+	if err != nil {
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
diff --git a/internal/service/badge/badge_award_service.go b/internal/service/badge/badge_award_service.go
@@ -52,6 +52,8 @@ type BadgeAwardRepo interface {
 
 	GetByUserIdAndBadgeId(ctx context.Context, userID string, badgeID string) (badgeAward *entity.BadgeAward, exists bool, err error)
 	GetByUserIdAndBadgeIdAndAwardKey(ctx context.Context, userID string, badgeID string, awardKey string) (badgeAward *entity.BadgeAward, exists bool, err error)
+
+	DeleteUserBadgeAward(ctx context.Context, userID string) (err error)
 }
 
 type BadgeAwardService struct {

diff --git a/internal/service/badge/badge_service.go b/internal/service/badge/badge_service.go
@@ -45,8 +45,6 @@ type BadgeRepo interface {
 
 	UpdateStatus(ctx context.Context, id string, status int8) (err error)
 	UpdateAwardCount(ctx context.Context, badgeID string, awardCount int) (err error)
-
-	DeleteUserBadge(ctx context.Context, userID string) (err error)
 }
 
 type BadgeService struct {

diff --git a/internal/service/user_admin/user_backyard.go b/internal/service/user_admin/user_backyard.go
@@ -84,7 +84,7 @@ type UserAdminService struct {
 	userExternalLoginRepo user_external_login.UserExternalLoginRepo
 	notificationRepo      notificationcommon.NotificationRepo
 	pluginUserConfigRepo  plugin_common.PluginUserConfigRepo
-	badgeRepo             badge.BadgeRepo
+	badgeAwardRepo        badge.BadgeAwardRepo
 }
 
 // NewUserAdminService new user admin service
@@ -102,7 +102,7 @@ func NewUserAdminService(
 	userExternalLoginRepo user_external_login.UserExternalLoginRepo,
 	notificationRepo notificationcommon.NotificationRepo,
 	pluginUserConfigRepo plugin_common.PluginUserConfigRepo,
-	badgeRepo badge.BadgeRepo,
+	badgeAwardRepo badge.BadgeAwardRepo,
 ) *UserAdminService {
 	return &UserAdminService{
 		userRepo:              userRepo,
@@ -118,7 +118,7 @@ func NewUserAdminService(
 		userExternalLoginRepo: userExternalLoginRepo,
 		notificationRepo:      notificationRepo,
 		pluginUserConfigRepo:  pluginUserConfigRepo,
-		badgeRepo:             badgeRepo,
+		badgeAwardRepo:        badgeAwardRepo,
 	}
 }
 
@@ -194,9 +194,9 @@ func (us *UserAdminService) removeAllUserConfiguration(ctx context.Context, user
 	if err != nil {
 		log.Errorf("remove all user plugin config error: %v", err)
 	}
-	err = us.badgeRepo.DeleteUserBadge(ctx, userID)
+	err = us.badgeAwardRepo.DeleteUserBadgeAward(ctx, userID)
 	if err != nil {
-		log.Errorf("remove all user badge error: %v", err)
+		log.Errorf("remove all user badge award error: %v", err)
 	}
 }