feat(badge): badge list earned return earned total

apache · Sep 2, 2024 · 1666b94 · 1666b94
1 parent 4f80f9e
commit 1666b94
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,
 		})
 	}