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

fix(answer): fix incorrect cancel answer activity

This commit is contained in:
LinkinStars 2023-08-29 15:22:35 +08:00
parent 3d032a7f48
commit a6b6545089
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
internal/repo/activity/answer_repo.go
View File

@ -46,15 +46,6 @@ func NewAnswerActivityRepo(
func (ar *AnswerActivityRepo) SaveAcceptAnswerActivity(ctx context.Context, op *schema.AcceptAnswerOperationInfo) ( func (ar *AnswerActivityRepo) SaveAcceptAnswerActivity(ctx context.Context, op *schema.AcceptAnswerOperationInfo) (
err error) { err error) {
// pre check
noNeedToDo, err := ar.activityPreCheck(ctx, op)
if err != nil {
return err
}
if noNeedToDo {
return nil
}
// save activity // save activity
_, err = ar.data.DB.Transaction(func(session *xorm.Session) (result any, err error) { _, err = ar.data.DB.Transaction(func(session *xorm.Session) (result any, err error) {
session = session.Context(ctx) session = session.Context(ctx)
@ -131,21 +122,6 @@ func (ar *AnswerActivityRepo) SaveCancelAcceptAnswerActivity(ctx context.Context
return nil return nil
} }
func (ar *AnswerActivityRepo) activityPreCheck(ctx context.Context, op *schema.AcceptAnswerOperationInfo) (
noNeedToDo bool, err error) {
activities, err := ar.getExistActivity(ctx, op)
if err != nil {
return false, err
}
done := 0
for _, act := range activities {
if act.Cancelled == entity.ActivityAvailable {
done++
}
}
return done == len(op.Activities), nil
}
func (ar *AnswerActivityRepo) acquireUserInfo(session *xorm.Session, userIDs []string) (map[string]*entity.User, error) { func (ar *AnswerActivityRepo) acquireUserInfo(session *xorm.Session, userIDs []string) (map[string]*entity.User, error) {
us := make([]*entity.User, 0) us := make([]*entity.User, 0)
err := session.In("id", userIDs).ForUpdate().Find(&us) err := session.In("id", userIDs).ForUpdate().Find(&us)
@ -286,18 +262,17 @@ func (ar *AnswerActivityRepo) rollbackUserRank(ctx context.Context, session *xor
func (ar *AnswerActivityRepo) getExistActivity(ctx context.Context, op *schema.AcceptAnswerOperationInfo) ([]*entity.Activity, error) { func (ar *AnswerActivityRepo) getExistActivity(ctx context.Context, op *schema.AcceptAnswerOperationInfo) ([]*entity.Activity, error) {
var activities []*entity.Activity var activities []*entity.Activity
for _, action := range op.Activities { for _, action := range op.Activities {
t := &entity.Activity{} var t []*entity.Activity
exist, err := ar.data.DB.Context(ctx). err := ar.data.DB.Context(ctx).
Where(builder.Eq{"user_id": action.ActivityUserID}). Where(builder.Eq{"user_id": action.ActivityUserID}).
And(builder.Eq{"trigger_user_id": action.TriggerUserID}).
And(builder.Eq{"activity_type": action.ActivityType}). And(builder.Eq{"activity_type": action.ActivityType}).
And(builder.Eq{"object_id": op.AnswerObjectID}). And(builder.Eq{"object_id": op.AnswerObjectID}).
Get(t) Find(&t)
if err != nil { if err != nil {
return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack() return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
} }
if exist { if len(t) > 0 {
activities = append(activities, t) activities = append(activities, t...)
} }
} }
return activities, nil return activities, nil

3
internal/service/activity/answer_activity_service.go
View File

@ -34,6 +34,9 @@ func NewAnswerActivityService(
// AcceptAnswer accept answer change activity // AcceptAnswer accept answer change activity
func (as *AnswerActivityService) AcceptAnswer(ctx context.Context, func (as *AnswerActivityService) AcceptAnswer(ctx context.Context,
loginUserID, answerObjID, questionObjID, questionUserID, answerUserID string, isSelf bool) (err error) { loginUserID, answerObjID, questionObjID, questionUserID, answerUserID string, isSelf bool) (err error) {
log.Debugf("user %s want to accept answer %s[%s] for question %s[%s]", loginUserID,
answerObjID, answerUserID,
questionObjID, questionUserID)
operationInfo := as.createAcceptAnswerOperationInfo(ctx, loginUserID, operationInfo := as.createAcceptAnswerOperationInfo(ctx, loginUserID,
answerObjID, questionObjID, questionUserID, answerUserID, isSelf) answerObjID, questionObjID, questionUserID, answerUserID, isSelf)
return as.answerActivityRepo.SaveAcceptAnswerActivity(ctx, operationInfo) return as.answerActivityRepo.SaveAcceptAnswerActivity(ctx, operationInfo)