This is an automated email from the ASF dual-hosted git repository. linkinstar pushed a commit to branch feat/1.4.0/badge in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit b2d36e0a73281a985fc83805139d5ecc5cf2fc17 Merge: 797ea9b9 07e4f549 Author: LinkinStars <[email protected]> AuthorDate: Thu Aug 8 16:43:31 2024 +0800 Merge branch 'feat/1.4.0/badges' into feat/1.4.0/badge # Conflicts: # internal/service/provider.go Makefile | 2 +- cmd/wire_gen.go | 18 +++-- internal/base/constant/event.go | 75 +++++++++++++++++++ internal/controller/template_controller.go | 24 ++++++ internal/controller/template_render/question.go | 22 ++++++ internal/controller_admin/siteinfo_controller.go | 10 +-- internal/repo/badge/badge_event_handler.go | 57 ++++++++++++++ internal/repo/badge/badge_rule.go | 95 ++++++++++++++++++++++++ internal/repo/badge/event_rule_mapping.go | 47 ++++++++++++ internal/repo/badge/rule.go | 43 +++++++++++ internal/repo/question/question_repo.go | 2 +- internal/repo/repo_test/email_repo_test.go | 4 +- internal/router/template_router.go | 2 + internal/schema/event_schema.go | 70 +++++++++++++++++ internal/service/comment/comment_service.go | 19 ++++- internal/service/content/answer_service.go | 13 ++++ internal/service/content/question_service.go | 10 +++ internal/service/content/user_service.go | 8 ++ internal/service/content/vote_service.go | 31 ++++++++ internal/service/event_queue/event_queue.go | 69 +++++++++++++++++ internal/service/meta/meta_service.go | 22 +++++- internal/service/provider.go | 2 + internal/service/question_common/question.go | 9 +++ internal/service/report/report_service.go | 30 +++++++- ui/template/header.html | 1 + ui/template/opensearch.xml | 29 ++++++++ 26 files changed, 691 insertions(+), 23 deletions(-) diff --cc cmd/wire_gen.go index 30b3b65c,c6cdc021..24cdb163 --- a/cmd/wire_gen.go +++ b/cmd/wire_gen.go @@@ -256,15 -253,9 +258,15 @@@ func initApplication(debug bool, server permissionController := controller.NewPermissionController(rankService) userPluginController := controller.NewUserPluginController(pluginCommonService) reviewController := controller.NewReviewController(reviewService, rankService, captchaService) - metaService := meta2.NewMetaService(metaCommonService, userCommon, answerRepo, questionRepo) + metaService := meta2.NewMetaService(metaCommonService, userCommon, answerRepo, questionRepo, eventQueueService) metaController := controller.NewMetaController(metaService) - 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, pluginCo [...] + badgeRepo := badge.NewBadgeRepo(dataData, uniqueIDRepo) + badgeGroupRepo := badge_group.NewBadgeGroupRepo(dataData, uniqueIDRepo) + badgeAwardRepo := badge_award.NewBadgeAwardRepo(dataData, uniqueIDRepo) + badgeService := badge2.NewBadgeService(badgeRepo, badgeGroupRepo, badgeAwardRepo) + badgeAwardService := badge_award2.NewBadgeAwardService(badgeAwardRepo, userCommon, objService, questionRepo, answerRepo) + 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, pluginCo [...] swaggerRouter := router.NewSwaggerRouter(swaggerConf) uiRouter := router.NewUIRouter(controllerSiteInfoController, siteInfoCommonService) authUserMiddleware := middleware.NewAuthUserMiddleware(authService, siteInfoCommonService) diff --cc internal/service/provider.go index 38832923,a22a6ea9..bf1528b8 --- a/internal/service/provider.go +++ b/internal/service/provider.go @@@ -120,7 -118,5 +121,8 @@@ var ProviderSetService = wire.NewSet notice_queue.NewNewQuestionNotificationQueueService, review.NewReviewService, meta.NewMetaService, + event_queue.NewEventQueueService, + badge.NewBadgeService, + badge_award.NewBadgeAwardService, + badge_group.NewBadgeGroupService, )
