Merge branch 'medal-v1' of git.openi.org.cn:OpenI/aiforge into medal-v1

models/badge_user.go

@@ -142,6 +142,9 @@ func GetUserBadgesPaging(userId int64, opts GetUserBadgesOpts) ([]*Badge, error)
 	err := x.Join("INNER", "badge_user", "badge_user.badge_id = badge.id").Where(cond).OrderBy("badge_user.id desc").Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&r)
 	return r, err
 }
+func CountUserBadges(userId int64) (int64, error) {
+	return x.Where("user_id = ?", userId).Count(&BadgeUser{})
+}
 
 func GetUserBadges(userId, categoryId int64) ([]*Badge, error) {
 	cond := builder.NewCond()

routers/user/profile.go

@@ -97,12 +97,19 @@ func Profile(ctx *context.Context) {
 		ctx.ServerError("GetUserBadges", err)
 		return
 	}
+	// Count user badges
+	cnt, err := badge.CountUserBadges(ctxUser.ID)
+	if err != nil {
+		ctx.ServerError("CountUserBadges", err)
+		return
+	}
 
 	ctx.Data["Title"] = ctxUser.DisplayName()
 	ctx.Data["PageIsUserProfile"] = true
 	ctx.Data["Owner"] = ctxUser
 	ctx.Data["OpenIDs"] = openIDs
 	ctx.Data["RecentBadges"] = badges
+	ctx.Data["TotalBadges"] = cnt
 	ctx.Data["EnableHeatmap"] = setting.Service.EnableUserHeatmap
 	ctx.Data["HeatmapUser"] = ctxUser.Name
 	showPrivate := ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.ID == ctxUser.ID)

services/badge/user.go

@@ -60,13 +60,17 @@ func GetUserBadges(userId int64, opts models.ListOptions) ([]*models.Badge4UserS
 	return r, nil
 }
 
+func CountUserBadges(userId int64) (int64, error) {
+	return models.CountUserBadges(userId)
+}
+
 func GetUserAllBadges(userId int64) ([]models.UserAllBadgeInCategory, error) {
 	categoryList, err := models.GetBadgeCategoryList()
 	if err != nil {
 		return nil, err
 	}
-	r := make([]models.UserAllBadgeInCategory, len(categoryList))
-	for i, v := range categoryList {
+	r := make([]models.UserAllBadgeInCategory, 0)
+	for _, v := range categoryList {
 		badges, err := models.GetBadgeByCategoryId(v.ID)
 		if badges == nil || len(badges) == 0 {
 			continue
@@ -89,7 +93,7 @@ func GetUserAllBadges(userId int64) ([]models.UserAllBadgeInCategory, error) {
 			bArray[j] = b
 		}
 		t.Badges = bArray
-		r[i] = t
+		r = append(r, t)
 	}
 	return r, nil
 }