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.
fix(answer): fix incorrect notification's triggerUserID when cancel accepted answer
LinkinStarse75142a55546
diff --git a/internal/base/middleware/auth.go b/internal/base/middleware/auth.goindex 5532a479..a51b44de 100644--- a/internal/base/middleware/auth.go+++ b/internal/base/middleware/auth.go@@ -126,7 +126,7 @@ func (am *AuthUserMiddleware) AdminAuth() gin.HandlerFunc {return}userInfo, err := am.authService.GetAdminUserCacheInfo(ctx, token)- if err != nil {+ if err != nil || userInfo == nil {handler.HandleResponse(ctx, errors.Forbidden(reason.UnauthorizedError), nil)ctx.Abort()returndiff --git a/internal/repo/activity/answer_repo.go b/internal/repo/activity/answer_repo.goindex fa4aacd0..02ae66f0 100644--- a/internal/repo/activity/answer_repo.go+++ b/internal/repo/activity/answer_repo.go@@ -55,7 +55,6 @@ func (ar *AnswerActivityRepo) SaveAcceptAnswerActivity(ctx context.Context, op *return nil}- ar.data.DB.ShowSQL(true)// save activity_, err = ar.data.DB.Transaction(func(session *xorm.Session) (result any, err error) {session = session.Context(ctx)@@ -311,12 +310,11 @@ func (ar *AnswerActivityRepo) sendAcceptAnswerNotification(Type: schema.NotificationTypeAchievement,ObjectID: op.AnswerObjectID,ReceiverUserID: act.ActivityUserID,+ TriggerUserID: act.TriggerUserID,}if act.ActivityUserID == op.QuestionUserID {- msg.TriggerUserID = op.AnswerUserIDmsg.ObjectType = constant.AnswerObjectType} else {- msg.TriggerUserID = op.QuestionUserIDmsg.ObjectType = constant.AnswerObjectType}if msg.TriggerUserID != msg.ReceiverUserID {@@ -329,9 +327,9 @@ func (ar *AnswerActivityRepo) sendAcceptAnswerNotification(ReceiverUserID: act.ActivityUserID,Type: schema.NotificationTypeInbox,ObjectID: op.AnswerObjectID,+ TriggerUserID: op.TriggerUserID,}if act.ActivityUserID != op.QuestionUserID {- msg.TriggerUserID = op.QuestionUserIDmsg.ObjectType = constant.AnswerObjectTypemsg.NotificationAction = constant.NotificationAcceptAnswerar.notificationQueueService.Send(ctx, msg)@@ -343,15 +341,14 @@ func (ar *AnswerActivityRepo) sendCancelAcceptAnswerNotification(ctx context.Context, op *schema.AcceptAnswerOperationInfo) {for _, act := range op.Activities {msg := &schema.NotificationMsg{+ TriggerUserID: act.TriggerUserID,ReceiverUserID: act.ActivityUserID,Type: schema.NotificationTypeAchievement,ObjectID: op.AnswerObjectID,}if act.ActivityUserID == op.QuestionObjectID {- msg.TriggerUserID = op.AnswerObjectIDmsg.ObjectType = constant.QuestionObjectType} else {- msg.TriggerUserID = op.QuestionObjectIDmsg.ObjectType = constant.AnswerObjectType}if msg.TriggerUserID != msg.ReceiverUserID {