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.
chore(badge): change project code struct
kumfoc2531f9b0724
diff --git a/cmd/wire_gen.go b/cmd/wire_gen.goindex f49ef20e..309af935 100644--- a/cmd/wire_gen.go+++ b/cmd/wire_gen.go@@ -75,7 +75,6 @@ import ("github.com/apache/incubator-answer/internal/service/answer_common"auth2 "github.com/apache/incubator-answer/internal/service/auth"badge2 "github.com/apache/incubator-answer/internal/service/badge"- badge_award2 "github.com/apache/incubator-answer/internal/service/badge_award"collection2 "github.com/apache/incubator-answer/internal/service/collection""github.com/apache/incubator-answer/internal/service/collection_common"comment2 "github.com/apache/incubator-answer/internal/service/comment"@@ -266,7 +265,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,eventRuleRepo := badge.NewEventRuleRepo(dataData)badgeEventService := badge2.NewBadgeEventService(dataData, eventQueueService, badgeRepo, eventRuleRepo)badgeService := badge2.NewBadgeService(badgeRepo, badgeGroupRepo, badgeAwardRepo, badgeEventService)- badgeAwardService := badge_award2.NewBadgeAwardService(badgeAwardRepo, userCommon, objService, questionRepo, answerRepo)+ badgeAwardService := badge2.NewBadgeAwardService(badgeAwardRepo, badgeRepo, userCommon, objService)badgeController := controller.NewBadgeController(badgeService, badgeAwardService)answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, userAdminController, reasonController, themeController, siteInfoController, controllerSiteInfoController, notificationController, dashboardController, uploadController, activityController, roleController, pluginController, permissionController, userPluginController, reviewController, metaController, badgeController)swaggerRouter := router.NewSwaggerRouter(swaggerConf)diff --git a/docs/docs.go b/docs/docs.goindex bda5a17b..e1946590 100644--- a/docs/docs.go+++ b/docs/docs.go@@ -6740,14 +6740,14 @@ const docTemplate = `{},"/custom.css": {"get": {- "description": "get site robots information",+ "description": "get site custom CSS","produces": [- "application/json"+ "text/css"],"tags": ["site"],- "summary": "get site robots information",+ "summary": "get site custom CSS","responses": {"200": {"description": "OK",diff --git a/docs/swagger.json b/docs/swagger.jsonindex 5ea50e6b..0a3bf6c7 100644--- a/docs/swagger.json+++ b/docs/swagger.json@@ -6710,14 +6710,14 @@},"/custom.css": {"get": {- "description": "get site robots information",+ "description": "get site custom CSS","produces": [- "application/json"+ "text/css"],"tags": ["site"],- "summary": "get site robots information",+ "summary": "get site custom CSS","responses": {"200": {"description": "OK",diff --git a/docs/swagger.yaml b/docs/swagger.yamlindex ca11b20f..777445b3 100644--- a/docs/swagger.yaml+++ b/docs/swagger.yaml@@ -6846,15 +6846,15 @@ paths:- Activity/custom.css:get:- description: get site robots information+ description: get site custom CSSproduces:- - application/json+ - text/cssresponses:"200":description: OKschema:type: string- summary: get site robots information+ summary: get site custom CSStags:- site/installation/base-info:diff --git a/internal/controller/badge_controller.go b/internal/controller/badge_controller.goindex c26d9205..d7ecc3fa 100644--- a/internal/controller/badge_controller.go+++ b/internal/controller/badge_controller.go@@ -25,19 +25,18 @@ import ("github.com/apache/incubator-answer/internal/base/pager""github.com/apache/incubator-answer/internal/schema""github.com/apache/incubator-answer/internal/service/badge"- "github.com/apache/incubator-answer/internal/service/badge_award""github.com/apache/incubator-answer/pkg/uid""github.com/gin-gonic/gin")type BadgeController struct {badgeService *badge.BadgeService- badgeAwardService *badge_award.BadgeAwardService+ badgeAwardService *badge.BadgeAwardService}func NewBadgeController(badgeService *badge.BadgeService,- badgeAwardService *badge_award.BadgeAwardService) *BadgeController {+ badgeAwardService *badge.BadgeAwardService) *BadgeController {return &BadgeController{badgeService: badgeService,badgeAwardService: badgeAwardService,diff --git a/internal/repo/badge/badge_event_rule.go b/internal/repo/badge/badge_event_rule.goindex 8f940720..d6c0d826 100644--- a/internal/repo/badge/badge_event_rule.go+++ b/internal/repo/badge/badge_event_rule.go@@ -211,6 +211,6 @@ func (br *eventRuleRepo) createBadgeAward(userID, badgeID, objectID string) (awareturn &entity.BadgeAward{UserID: userID,BadgeID: badgeID,- ObjectID: objectID,+ AwardKey: objectID,}}diff --git a/internal/repo/badge_award/badge_award_repo.go b/internal/repo/badge_award/badge_award_repo.goindex 92807d1d..8860a5b1 100644--- a/internal/repo/badge_award/badge_award_repo.go+++ b/internal/repo/badge_award/badge_award_repo.go@@ -25,7 +25,7 @@ import ("github.com/apache/incubator-answer/internal/base/pager""github.com/apache/incubator-answer/internal/base/reason""github.com/apache/incubator-answer/internal/entity"- "github.com/apache/incubator-answer/internal/service/badge_award"+ "github.com/apache/incubator-answer/internal/service/badge""github.com/apache/incubator-answer/internal/service/unique""github.com/segmentfault/pacman/errors")@@ -35,7 +35,7 @@ type badgeAwardRepo struct {uniqueIDRepo unique.UniqueIDRepo}-func NewBadgeAwardRepo(data *data.Data, uniqueIDRepo unique.UniqueIDRepo) badge_award.BadgeAwardRepo {+func NewBadgeAwardRepo(data *data.Data, uniqueIDRepo unique.UniqueIDRepo) badge.BadgeAwardRepo {return &badgeAwardRepo{data: data,uniqueIDRepo: uniqueIDRepo,diff --git a/internal/repo/badge_group/badge_group_repo.go b/internal/repo/badge_group/badge_group_repo.goindex 7dfe90fc..63f438b9 100644--- a/internal/repo/badge_group/badge_group_repo.go+++ b/internal/repo/badge_group/badge_group_repo.go@@ -23,7 +23,7 @@ import ("context""github.com/apache/incubator-answer/internal/base/data""github.com/apache/incubator-answer/internal/entity"- "github.com/apache/incubator-answer/internal/service/badge_group"+ "github.com/apache/incubator-answer/internal/service/badge""github.com/apache/incubator-answer/internal/service/unique")@@ -32,7 +32,7 @@ type badgeGroupRepo struct {uniqueIDRepo unique.UniqueIDRepo}-func NewBadgeGroupRepo(data *data.Data, uniqueIDRepo unique.UniqueIDRepo) badge_group.BadgeGroupRepo {+func NewBadgeGroupRepo(data *data.Data, uniqueIDRepo unique.UniqueIDRepo) badge.BadgeGroupRepo {return &badgeGroupRepo{data: data,uniqueIDRepo: uniqueIDRepo,diff --git a/internal/service/badge_award/badge_award_service.go b/internal/service/badge/badge_award_service.gosimilarity index 96%rename from internal/service/badge_award/badge_award_service.gorename to internal/service/badge/badge_award_service.goindex 2c7c5ffa..229b09a5 100644--- a/internal/service/badge_award/badge_award_service.go+++ b/internal/service/badge/badge_award_service.go@@ -17,14 +17,13 @@* under the License.*/-package badge_award+package badgeimport ("context""github.com/apache/incubator-answer/internal/base/reason""github.com/apache/incubator-answer/internal/entity""github.com/apache/incubator-answer/internal/schema"- "github.com/apache/incubator-answer/internal/service/badge""github.com/apache/incubator-answer/internal/service/object_info"usercommon "github.com/apache/incubator-answer/internal/service/user_common""github.com/jinzhu/copier"@@ -62,15 +61,15 @@ type BadgeAwardRepo interface {}type BadgeAwardService struct {- badgeAwardRepo BadgeAwardRepo- badgeRepo badge.BadgeRepo- userCommon *usercommon.UserCommon+ badgeAwardRepo BadgeAwardRepo+ badgeRepo BadgeRepo+ userCommon *usercommon.UserCommonobjectInfoService *object_info.ObjService}func NewBadgeAwardService(badgeAwardRepo BadgeAwardRepo,- badgeRepo badge.BadgeRepo,+ badgeRepo BadgeRepo,userCommon *usercommon.UserCommon,objectInfoService *object_info.ObjService,) *BadgeAwardService {diff --git a/internal/service/badge/badge_event_handler.go b/internal/service/badge/badge_event_handler.goindex 587ee77d..d6758baf 100644--- a/internal/service/badge/badge_event_handler.go+++ b/internal/service/badge/badge_event_handler.go@@ -22,7 +22,6 @@ package badgeimport ("context""github.com/apache/incubator-answer/internal/entity"- "github.com/apache/incubator-answer/internal/service/badge_award""github.com/apache/incubator-answer/internal/service/event_queue""github.com/segmentfault/pacman/log"@@ -33,7 +32,7 @@ import (type BadgeEventService struct {data *data.DataeventQueueService event_queue.EventQueueService- badgeAwardRepo badge_award.BadgeAwardRepo+ badgeAwardRepo BadgeAwardRepobadgeRepo BadgeRepoeventRuleRepo EventRuleRepo}diff --git a/internal/service/badge_group/badge_group_service.go b/internal/service/badge/badge_group_service.gosimilarity index 98%rename from internal/service/badge_group/badge_group_service.gorename to internal/service/badge/badge_group_service.goindex c78f3e4f..16dd74ee 100644--- a/internal/service/badge_group/badge_group_service.go+++ b/internal/service/badge/badge_group_service.go@@ -17,7 +17,7 @@* under the License.*/-package badge_group+package badgeimport ("context"diff --git a/internal/service/badge/badge_service.go b/internal/service/badge/badge_service.goindex faf97b11..366dd338 100644--- a/internal/service/badge/badge_service.go+++ b/internal/service/badge/badge_service.go@@ -26,8 +26,6 @@ import ("github.com/apache/incubator-answer/internal/base/translator""github.com/apache/incubator-answer/internal/entity""github.com/apache/incubator-answer/internal/schema"- "github.com/apache/incubator-answer/internal/service/badge_award"- "github.com/apache/incubator-answer/internal/service/badge_group""github.com/apache/incubator-answer/pkg/converter""github.com/apache/incubator-answer/pkg/uid""github.com/gin-gonic/gin"@@ -48,16 +46,16 @@ type BadgeRepo interface {}type BadgeService struct {- badgeRepo BadgeRepo- badgeGroupRepo badge_group.BadgeGroupRepo- badgeAwardRepo badge_award.BadgeAwardRepo+ badgeRepo BadgeRepo+ badgeGroupRepo BadgeGroupRepo+ badgeAwardRepo BadgeAwardRepobadgeEventService *BadgeEventService}func NewBadgeService(badgeRepo BadgeRepo,- badgeGroupRepo badge_group.BadgeGroupRepo,- badgeAwardRepo badge_award.BadgeAwardRepo,+ badgeGroupRepo BadgeGroupRepo,+ badgeAwardRepo BadgeAwardRepo,badgeEventService *BadgeEventService,) *BadgeService {return &BadgeService{diff --git a/internal/service/provider.go b/internal/service/provider.goindex 7a6b1340..12e0db79 100644--- a/internal/service/provider.go+++ b/internal/service/provider.go@@ -27,8 +27,6 @@ import (answercommon "github.com/apache/incubator-answer/internal/service/answer_common""github.com/apache/incubator-answer/internal/service/auth""github.com/apache/incubator-answer/internal/service/badge"- "github.com/apache/incubator-answer/internal/service/badge_award"- "github.com/apache/incubator-answer/internal/service/badge_group""github.com/apache/incubator-answer/internal/service/collection"collectioncommon "github.com/apache/incubator-answer/internal/service/collection_common""github.com/apache/incubator-answer/internal/service/comment"@@ -124,6 +122,6 @@ var ProviderSetService = wire.NewSet(event_queue.NewEventQueueService,badge.NewBadgeService,badge.NewBadgeEventService,- badge_award.NewBadgeAwardService,- badge_group.NewBadgeGroupService,+ badge.NewBadgeAwardService,+ badge.NewBadgeGroupService,)