Skip to content

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): accept own answer does not produce achievement

LinkinStars8431f9ab1332
diff --git a/internal/repo/activity/answer_repo.go b/internal/repo/activity/answer_repo.go
index b13d4cb9..6ed8bad4 100644
--- a/internal/repo/activity/answer_repo.go
+++ b/internal/repo/activity/answer_repo.go
@@ -150,6 +150,7 @@ func (ar *AnswerActivityRepo) AcceptAnswer(ctx context.Context,
}
if isSelf {
addActivity.Rank = 0
+ addActivity.HasRank = 0
}
addActivityList = append(addActivityList, addActivity)
}
@@ -166,13 +167,16 @@ func (ar *AnswerActivityRepo) AcceptAnswer(ctx context.Context,
continue
}
- reachStandard, e := ar.userRankRepo.TriggerUserRank(
- ctx, session, addActivity.UserID, addActivity.Rank, addActivity.ActivityType)
- if e != nil {
- return nil, errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
- }
- if reachStandard {
- addActivity.Rank = 0
+ // trigger user rank and send notification
+ if addActivity.Rank != 0 {
+ reachStandard, e := ar.userRankRepo.TriggerUserRank(
+ ctx, session, addActivity.UserID, addActivity.Rank, addActivity.ActivityType)
+ if e != nil {
+ return nil, errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
+ }
+ if reachStandard {
+ addActivity.Rank = 0
+ }
}
if exists {
@@ -267,10 +271,12 @@ func (ar *AnswerActivityRepo) CancelAcceptAnswer(ctx context.Context,
continue
}
- _, e = ar.userRankRepo.TriggerUserRank(
- ctx, session, addActivity.UserID, addActivity.Rank, addActivity.ActivityType)
- if e != nil {
- return nil, errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
+ if existsActivity.Rank != 0 {
+ _, e = ar.userRankRepo.TriggerUserRank(
+ ctx, session, addActivity.UserID, addActivity.Rank, addActivity.ActivityType)
+ if e != nil {
+ return nil, errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
+ }
}
if _, e := session.Where("id = ?", existsActivity.ID).Cols("cancelled", "cancelled_at").
@@ -296,7 +302,9 @@ func (ar *AnswerActivityRepo) CancelAcceptAnswer(ctx context.Context,
msg.TriggerUserID = questionUserID
msg.ObjectType = constant.AnswerObjectType
}
- notice_queue.AddNotification(msg)
+ if msg.TriggerUserID != msg.ReceiverUserID {
+ notice_queue.AddNotification(msg)
+ }
}
return err
}