github-featured/apache--answer
2
0
Fork 0
Code Issues Pull Requests Actions Deployments Models Agent Notes Packages Projects Releases Wiki Activity

feat(review): postpone the notification after review

Browse Source
This commit is contained in:
LinkinStars
2024-03-13 11:23:40 +08:00
parent 6736a711cb
commit cbfd7512f8
9 changed files with 128 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/wire_gen.go
+1 -1
View File
@@ -172,7 +172,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
answerActivityService := activity2.NewAnswerActivityService(answerActivityRepo, configService)
externalNotificationService := notification.NewExternalNotificationService(dataData, userNotificationConfigRepo, followRepo, emailService, userRepo, externalNotificationQueueService, userExternalLoginRepo, siteInfoCommonService)
reviewRepo := review.NewReviewRepo(dataData)
reviewService := review2.NewReviewService(reviewRepo, objService, userCommon, questionRepo, answerRepo, userRoleRelService)
reviewService := review2.NewReviewService(reviewRepo, objService, userCommon, questionRepo, answerRepo, userRoleRelService, externalNotificationQueueService, tagCommonService, notificationQueueService)
questionService := content.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, userRoleRelService, revisionService, metaService, collectionCommon, answerActivityService, emailService, notificationQueueService, externalNotificationQueueService, activityQueueService, siteInfoCommonService, externalNotificationService, reviewService)
answerService := content.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService, notificationQueueService, externalNotificationQueueService, activityQueueService, reviewService)
reportHandle := report_handle.NewReportHandle(questionService, answerService, commentService)
docs/docs.go
+6
View File
@@ -4509,6 +4509,12 @@ const docTemplate = `{
"description": "page",
"name": "page",
"in": "query"
},
{
"type": "string",
"description": "object_id",
"name": "object_id",
"in": "query"
}
],
"responses": {
docs/swagger.json
+6
View File
@@ -4497,6 +4497,12 @@
"description": "page",
"name": "page",
"in": "query"
},
{
"type": "string",
"description": "object_id",
"name": "object_id",
"in": "query"
}
],
"responses": {
docs/swagger.yaml
+4
View File
@@ -5345,6 +5345,10 @@ paths:
in: query
name: page
type: integer
- description: object_id
in: query
name: object_id
type: string
produces:
- application/json
responses:
internal/controller/report_controller.go
+1
View File
@@ -144,6 +144,7 @@ func (rc *ReportController) ReviewReport(ctx *gin.Context) {
}
// TODO: check permission
req.UserID = middleware.GetLoginUserIDFromContext(ctx)
err := rc.reportService.ReviewReport(ctx, req)
handler.HandleResponse(ctx, err, nil)
internal/controller/review_controller.go
+1
View File
@@ -58,6 +58,7 @@ func NewReviewController(
// @Produce json
// @Security ApiKeyAuth
// @Param page query int false "page"
// @Param object_id query string false "object_id"
// @Success 200 {object} handler.RespBody{data=pager.PageModel{list=[]schema.GetUnreviewedPostPageResp}}
// @Router /answer/api/v1/review/pending/post/page [get]
func (rc *ReviewController) GetUnreviewedPostPage(ctx *gin.Context) {
internal/service/content/answer_service.go
+4 -2
View File
@@ -277,8 +277,10 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
if err != nil {
return insertData.ID, err
}
as.notificationAnswerTheQuestion(ctx, questionInfo.UserID, questionInfo.ID, insertData.ID, req.UserID, questionInfo.Title,
insertData.OriginalText)
if insertData.Status == entity.AnswerStatusAvailable {
as.notificationAnswerTheQuestion(ctx, questionInfo.UserID, questionInfo.ID, insertData.ID, req.UserID, questionInfo.Title,
insertData.OriginalText)
}
as.activityQueueService.Send(ctx, &schema.ActivityMsg{
UserID: insertData.UserID,
internal/service/content/question_service.go
+4 -2
View File
@@ -365,8 +365,10 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
RevisionID: revisionID,
})
qs.externalNotificationQueueService.Send(ctx,
schema.CreateNewQuestionNotificationMsg(question.ID, question.Title, question.UserID, tags))
if question.Status == entity.QuestionStatusAvailable {
qs.externalNotificationQueueService.Send(ctx,
schema.CreateNewQuestionNotificationMsg(question.ID, question.Title, question.UserID, tags))
}
questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, req.QuestionPermission)
return
internal/service/review/review_service.go
+101 -19
View File
@@ -28,10 +28,13 @@ import (
"github.com/apache/incubator-answer/internal/entity"
"github.com/apache/incubator-answer/internal/schema"
answercommon "github.com/apache/incubator-answer/internal/service/answer_common"
"github.com/apache/incubator-answer/internal/service/notice_queue"
"github.com/apache/incubator-answer/internal/service/object_info"
questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
"github.com/apache/incubator-answer/internal/service/role"
tagcommon "github.com/apache/incubator-answer/internal/service/tag_common"
usercommon "github.com/apache/incubator-answer/internal/service/user_common"
"github.com/apache/incubator-answer/pkg/token"
"github.com/apache/incubator-answer/pkg/uid"
"github.com/apache/incubator-answer/plugin"
"github.com/jinzhu/copier"
@@ -50,12 +53,16 @@ type ReviewRepo interface {
// ReviewService user service
type ReviewService struct {
reviewRepo ReviewRepo
objectInfoService *object_info.ObjService
userCommon *usercommon.UserCommon
questionRepo questioncommon.QuestionRepo
answerRepo answercommon.AnswerRepo
userRoleService *role.UserRoleRelService
reviewRepo ReviewRepo
objectInfoService *object_info.ObjService
userCommon *usercommon.UserCommon
userRepo usercommon.UserRepo
questionRepo questioncommon.QuestionRepo
answerRepo answercommon.AnswerRepo
userRoleService *role.UserRoleRelService
tagCommon *tagcommon.TagCommonService
externalNotificationQueueService notice_queue.ExternalNotificationQueueService
notificationQueueService notice_queue.NotificationQueueService
}
// NewReviewService new review service
@@ -66,14 +73,20 @@ func NewReviewService(
questionRepo questioncommon.QuestionRepo,
answerRepo answercommon.AnswerRepo,
userRoleService *role.UserRoleRelService,
externalNotificationQueueService notice_queue.ExternalNotificationQueueService,
tagCommon *tagcommon.TagCommonService,
notificationQueueService notice_queue.NotificationQueueService,
) *ReviewService {
return &ReviewService{
reviewRepo: reviewRepo,
objectInfoService: objectInfoService,
userCommon: userCommon,
questionRepo: questionRepo,
answerRepo: answerRepo,
userRoleService: userRoleService,
reviewRepo: reviewRepo,
objectInfoService: objectInfoService,
userCommon: userCommon,
questionRepo: questionRepo,
answerRepo: answerRepo,
userRoleService: userRoleService,
externalNotificationQueueService: externalNotificationQueueService,
tagCommon: tagCommon,
notificationQueueService: notificationQueueService,
}
}
@@ -199,9 +212,19 @@ func (cs *ReviewService) updateObjectStatus(ctx context.Context, review *entity.
} else {
question.Status = entity.QuestionStatusDeleted
}
return cs.questionRepo.UpdateQuestionStatus(ctx, question.ID, question.Status)
if err := cs.questionRepo.UpdateQuestionStatus(ctx, question.ID, question.Status); err != nil {
return err
}
if isApprove {
tags, err := cs.tagCommon.GetObjectEntityTag(ctx, question.ID)
if err != nil {
log.Errorf("get question tags failed, err: %v", err)
}
cs.externalNotificationQueueService.Send(ctx,
schema.CreateNewQuestionNotificationMsg(question.ID, question.Title, question.UserID, tags))
}
case constant.AnswerObjectType:
answer, exist, err := cs.answerRepo.GetAnswer(ctx, review.ObjectID)
answerInfo, exist, err := cs.answerRepo.GetAnswer(ctx, review.ObjectID)
if err != nil {
return err
}
@@ -209,14 +232,72 @@ func (cs *ReviewService) updateObjectStatus(ctx context.Context, review *entity.
return errors.BadRequest(reason.ObjectNotFound)
}
if isApprove {
answer.Status = entity.AnswerStatusAvailable
answerInfo.Status = entity.AnswerStatusAvailable
} else {
answer.Status = entity.AnswerStatusDeleted
answerInfo.Status = entity.AnswerStatusDeleted
}
if err := cs.answerRepo.UpdateAnswerStatus(ctx, answerInfo.ID, answerInfo.Status); err != nil {
return err
}
questionInfo, exist, err := cs.questionRepo.GetQuestion(ctx, answerInfo.QuestionID)
if err != nil {
return err
}
if !exist {
return errors.BadRequest(reason.ObjectNotFound)
}
if isApprove {
cs.notificationAnswerTheQuestion(ctx, questionInfo.UserID, questionInfo.ID, answerInfo.ID,
answerInfo.UserID, questionInfo.Title, answerInfo.OriginalText)
}
return cs.answerRepo.UpdateAnswerStatus(ctx, answer.ID, answer.Status)
}
return
}
func (cs *ReviewService) notificationAnswerTheQuestion(ctx context.Context,
questionUserID, questionID, answerID, answerUserID, questionTitle, answerSummary string) {
// If the question is answered by me, there is no notification for myself.
if questionUserID == answerUserID {
return
}
msg := &schema.NotificationMsg{
TriggerUserID: answerUserID,
ReceiverUserID: questionUserID,
Type: schema.NotificationTypeInbox,
ObjectID: answerID,
}
msg.ObjectType = constant.AnswerObjectType
msg.NotificationAction = constant.NotificationAnswerTheQuestion
cs.notificationQueueService.Send(ctx, msg)
receiverUserInfo, exist, err := cs.userRepo.GetByUserID(ctx, questionUserID)
if err != nil {
log.Error(err)
return
}
if !exist {
log.Warnf("user %s not found", questionUserID)
return
}
externalNotificationMsg := &schema.ExternalNotificationMsg{
ReceiverUserID: receiverUserInfo.ID,
ReceiverEmail: receiverUserInfo.EMail,
ReceiverLang: receiverUserInfo.Language,
}
rawData := &schema.NewAnswerTemplateRawData{
QuestionTitle: questionTitle,
QuestionID: questionID,
AnswerID: answerID,
AnswerSummary: answerSummary,
UnsubscribeCode: token.GenerateToken(),
}
answerUser, _, _ := cs.userCommon.GetUserBasicInfoByID(ctx, answerUserID)
if answerUser != nil {
rawData.AnswerUserDisplayName = answerUser.DisplayName
}
externalNotificationMsg.NewAnswerTemplateRawData = rawData
cs.externalNotificationQueueService.Send(ctx, externalNotificationMsg)
}
// GetReviewPendingCount get review pending count
@@ -227,10 +308,11 @@ func (cs *ReviewService) GetReviewPendingCount(ctx context.Context) (count int64
// GetUnreviewedPostPage get review page
func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.GetUnreviewedPostPageReq) (
pageModel *pager.PageModel, err error) {
reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, &entity.Review{
cond := &entity.Review{
ObjectID: req.ObjectID,
Status: entity.ReviewStatusPending,
})
}
reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, cond)
if err != nil {
return
}