p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(activity): add activity common service init

This commit is contained in:
LinkinStars 2023-07-03 17:15:29 +08:00
parent 7f58fbdad1
commit 2f4090c25e
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/wire_gen.go
View File

@ -45,6 +45,7 @@ import (
"github.com/answerdev/answer/internal/service" "github.com/answerdev/answer/internal/service"
"github.com/answerdev/answer/internal/service/action" "github.com/answerdev/answer/internal/service/action"
activity2 "github.com/answerdev/answer/internal/service/activity" activity2 "github.com/answerdev/answer/internal/service/activity"
activity_common2 "github.com/answerdev/answer/internal/service/activity_common"
"github.com/answerdev/answer/internal/service/activity_queue" "github.com/answerdev/answer/internal/service/activity_queue"
"github.com/answerdev/answer/internal/service/answer_common" "github.com/answerdev/answer/internal/service/answer_common"
auth2 "github.com/answerdev/answer/internal/service/auth" auth2 "github.com/answerdev/answer/internal/service/auth"
@ -205,8 +206,9 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
uploaderService := uploader.NewUploaderService(serviceConf, siteInfoCommonService) uploaderService := uploader.NewUploaderService(serviceConf, siteInfoCommonService)
uploadController := controller.NewUploadController(uploaderService) uploadController := controller.NewUploadController(uploaderService)
activityActivityRepo := activity.NewActivityRepo(dataData, configService) activityActivityRepo := activity.NewActivityRepo(dataData, configService)
activityCommon := activity_common2.NewActivityCommon(activityRepo, activityQueueService)
commentCommonService := comment_common.NewCommentCommonService(commentCommonRepo) commentCommonService := comment_common.NewCommentCommonService(commentCommonRepo)
activityService := activity2.NewActivityService(activityActivityRepo, userCommon, tagCommonService, objService, commentCommonService, revisionService, metaService, configService) activityService := activity2.NewActivityService(activityActivityRepo, userCommon, activityCommon, tagCommonService, objService, commentCommonService, revisionService, metaService, configService)
activityController := controller.NewActivityController(activityService) activityController := controller.NewActivityController(activityService)
roleController := controller_admin.NewRoleController(roleService) roleController := controller_admin.NewRoleController(roleService)
pluginConfigRepo := plugin_config.NewPluginConfigRepo(dataData) pluginConfigRepo := plugin_config.NewPluginConfigRepo(dataData)

36
internal/service/activity/activity.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/answerdev/answer/internal/service/activity_common"
"strings" "strings"
"github.com/answerdev/answer/internal/base/constant" "github.com/answerdev/answer/internal/base/constant"
@ -30,20 +31,22 @@ type ActivityRepo interface {
// ActivityService activity service // ActivityService activity service
type ActivityService struct { type ActivityService struct {
activityRepo ActivityRepo activityRepo ActivityRepo
userCommon *usercommon.UserCommon userCommon *usercommon.UserCommon
tagCommonService *tag_common.TagCommonService activityCommonService *activity_common.ActivityCommon
objectInfoService *object_info.ObjService tagCommonService *tag_common.TagCommonService
commentCommonService *comment_common.CommentCommonService objectInfoService *object_info.ObjService
revisionService *revision_common.RevisionService commentCommonService *comment_common.CommentCommonService
metaService *meta.MetaService revisionService *revision_common.RevisionService
configService *config.ConfigService metaService *meta.MetaService
configService *config.ConfigService
} }
// NewActivityService new activity service // NewActivityService new activity service
func NewActivityService( func NewActivityService(
activityRepo ActivityRepo, activityRepo ActivityRepo,
userCommon *usercommon.UserCommon, userCommon *usercommon.UserCommon,
activityCommonService *activity_common.ActivityCommon,
tagCommonService *tag_common.TagCommonService, tagCommonService *tag_common.TagCommonService,
objectInfoService *object_info.ObjService, objectInfoService *object_info.ObjService,
commentCommonService *comment_common.CommentCommonService, commentCommonService *comment_common.CommentCommonService,
@ -52,14 +55,15 @@ func NewActivityService(
configService *config.ConfigService, configService *config.ConfigService,
) *ActivityService { ) *ActivityService {
return &ActivityService{ return &ActivityService{
objectInfoService: objectInfoService, objectInfoService: objectInfoService,
activityRepo: activityRepo, activityRepo: activityRepo,
userCommon: userCommon, userCommon: userCommon,
tagCommonService: tagCommonService, activityCommonService: activityCommonService,
commentCommonService: commentCommonService, tagCommonService: tagCommonService,
revisionService: revisionService, commentCommonService: commentCommonService,
metaService: metaService, revisionService: revisionService,
configService: configService, metaService: metaService,
configService: configService,
} }
} }