From 1666b9413514fc19bc24e6629927589058ea46d8 Mon Sep 17 00:00:00 2001
From: kumfo <kumfo@sifou.com>
Date: Mon, 2 Sep 2024 18:26:24 +0800
Subject: [PATCH] feat(badge): badge list earned return earned total

---
 docs/docs.go                            |  2 +-
 docs/swagger.json                       |  2 +-
 docs/swagger.yaml                       |  2 +-
 internal/schema/badge_schema.go         |  2 +-
 internal/service/badge/badge_service.go | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index e5cc6f166..a9d56ab97 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 5fd369073..82ec1a6ff 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 72871edcd..2af2900fb 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 1dd2e76f0..a33fb480d 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 49591adc8..3ec7b5bfb 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,
 		})
 	}