Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

feat(badge): badge list earned return earned total

kumfo1666b9413514
diff --git a/docs/docs.go b/docs/docs.go
index e5cc6f16..a9d56ab9 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7793,7 +7793,7 @@ const docTemplate = `{
"description": "badge award count",
"type": "integer"
},
- "earned": {
+ "earned_count": {
"description": "badge earned count",
"type": "integer"
},
diff --git a/docs/swagger.json b/docs/swagger.json
index 5fd36907..82ec1a6f 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -7767,7 +7767,7 @@
"description": "badge award count",
"type": "integer"
},
- "earned": {
+ "earned_count": {
"description": "badge earned count",
"type": "integer"
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 72871edc..2af2900f 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -370,7 +370,7 @@ definitions:
award_count:
description: badge award count
type: integer
- earned:
+ earned_count:
description: badge earned count
type: integer
icon:
diff --git a/internal/schema/badge_schema.go b/internal/schema/badge_schema.go
index 1dd2e76f..a33fb480 100644
--- a/internal/schema/badge_schema.go
+++ b/internal/schema/badge_schema.go
@@ -49,7 +49,7 @@ type BadgeListInfo struct {
// badge award count
AwardCount int `json:"award_count" `
// badge earned count
- Earned int64 `json:"earned" `
+ EarnedCount int64 `json:"earned_count" `
// badge level
Level entity.BadgeLevel `json:"level" `
}
diff --git a/internal/service/badge/badge_service.go b/internal/service/badge/badge_service.go
index 49591adc..3ec7b5bf 100644
--- a/internal/service/badge/badge_service.go
+++ b/internal/service/badge/badge_service.go
@@ -110,12 +110,12 @@ func (b *BadgeService) ListByGroup(ctx context.Context, userID string) (resp []*
}
badgesMap[badge.BadgeGroupID] = append(badgesMap[badge.BadgeGroupID], &schema.BadgeListInfo{
- ID: uid.EnShortID(badge.ID),
- Name: translator.Tr(handler.GetLangByCtx(ctx), badge.Name),
- Icon: badge.Icon,
- AwardCount: badge.AwardCount,
- Earned: earned,
- Level: badge.Level,
+ ID: uid.EnShortID(badge.ID),
+ Name: translator.Tr(handler.GetLangByCtx(ctx), badge.Name),
+ Icon: badge.Icon,
+ AwardCount: badge.AwardCount,
+ EarnedCount: earned,
+ Level: badge.Level,
})
}