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(timeline): fix the wrong TriggerUserID when accept answer
LinkinStarsa3b033b9df8e
diff --git a/internal/schema/answer_activity_schema.go b/internal/schema/answer_activity_schema.goindex 747f7754..3bf7b39b 100644--- a/internal/schema/answer_activity_schema.go+++ b/internal/schema/answer_activity_schema.go@@ -2,6 +2,7 @@ package schema// AcceptAnswerOperationInfo accept answer operation infotype AcceptAnswerOperationInfo struct {+ TriggerUserID stringQuestionObjectID stringQuestionUserID stringAnswerObjectID stringdiff --git a/internal/service/activity/answer_activity_service.go b/internal/service/activity/answer_activity_service.goindex 56b09676..daab2bf7 100644--- a/internal/service/activity/answer_activity_service.go+++ b/internal/service/activity/answer_activity_service.go@@ -33,23 +33,24 @@ func NewAnswerActivityService(// AcceptAnswer accept answer change activityfunc (as *AnswerActivityService) AcceptAnswer(ctx context.Context,- answerObjID, questionObjID, questionUserID, answerUserID string, isSelf bool) (err error) {- operationInfo := as.createAcceptAnswerOperationInfo(ctx,+ loginUserID, answerObjID, questionObjID, questionUserID, answerUserID string, isSelf bool) (err error) {+ operationInfo := as.createAcceptAnswerOperationInfo(ctx, loginUserID,answerObjID, questionObjID, questionUserID, answerUserID, isSelf)return as.answerActivityRepo.SaveAcceptAnswerActivity(ctx, operationInfo)}// CancelAcceptAnswer cancel accept answer change activityfunc (as *AnswerActivityService) CancelAcceptAnswer(ctx context.Context,- answerObjID, questionObjID, questionUserID, answerUserID string) (err error) {- operationInfo := as.createAcceptAnswerOperationInfo(ctx,+ loginUserID, answerObjID, questionObjID, questionUserID, answerUserID string) (err error) {+ operationInfo := as.createAcceptAnswerOperationInfo(ctx, loginUserID,answerObjID, questionObjID, questionUserID, answerUserID, false)return as.answerActivityRepo.SaveCancelAcceptAnswerActivity(ctx, operationInfo)}-func (as *AnswerActivityService) createAcceptAnswerOperationInfo(ctx context.Context,+func (as *AnswerActivityService) createAcceptAnswerOperationInfo(ctx context.Context, loginUserID,answerObjID, questionObjID, questionUserID, answerUserID string, isSelf bool) *schema.AcceptAnswerOperationInfo {operationInfo := &schema.AcceptAnswerOperationInfo{+ TriggerUserID: loginUserID,QuestionObjectID: questionObjID,QuestionUserID: questionUserID,AnswerObjectID: answerObjID,@@ -79,11 +80,11 @@ func (as *AnswerActivityService) getActivities(ctx context.Context, op *schema.Aif action == activity_type.AnswerAccept {t.ActivityUserID = op.QuestionUserID- t.TriggerUserID = op.AnswerUserID+ t.TriggerUserID = op.TriggerUserIDt.OriginalObjectID = op.QuestionObjectID // if activity is 'accept' means this question is accept the answer.} else {t.ActivityUserID = op.AnswerUserID- t.TriggerUserID = op.AnswerUserID+ t.TriggerUserID = op.TriggerUserIDt.OriginalObjectID = op.AnswerObjectID // if activity is 'accepted' means this answer was accepted.}activities = append(activities, t)diff --git a/internal/service/answer_service.go b/internal/service/answer_service.goindex 81276951..b8462551 100644--- a/internal/service/answer_service.go+++ b/internal/service/answer_service.go@@ -390,15 +390,15 @@ func (as *AnswerService) updateAnswerRank(ctx context.Context, userID string,) {// if this question is already been answered, should cancel old answer rankif oldAnswerInfo != nil {- err := as.answerActivityService.CancelAcceptAnswer(- ctx, questionInfo.AcceptedAnswerID, questionInfo.ID, questionInfo.UserID, oldAnswerInfo.UserID)+ err := as.answerActivityService.CancelAcceptAnswer(ctx, userID,+ questionInfo.AcceptedAnswerID, questionInfo.ID, questionInfo.UserID, oldAnswerInfo.UserID)if err != nil {log.Error(err)}}if newAnswerInfo.ID != "" {- err := as.answerActivityService.AcceptAnswer(- ctx, newAnswerInfo.ID, questionInfo.ID, questionInfo.UserID, newAnswerInfo.UserID, newAnswerInfo.UserID == userID)+ err := as.answerActivityService.AcceptAnswer(ctx, userID, newAnswerInfo.ID,+ questionInfo.ID, questionInfo.UserID, newAnswerInfo.UserID, newAnswerInfo.UserID == userID)if err != nil {log.Error(err)}