Merge branch 'fix/1.2.1/user' into test

apache · Dec 7, 2023 · 6f55ff7 · 6f55ff7
2 parents 7d28759 + f0ebcaf
commit 6f55ff7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/internal/repo/activity/answer_repo.go b/internal/repo/activity/answer_repo.go
@@ -306,11 +306,7 @@ func (ar *AnswerActivityRepo) sendAcceptAnswerNotification(
 			ReceiverUserID: act.ActivityUserID,
 			TriggerUserID:  act.TriggerUserID,
 		}
-		if act.ActivityUserID == op.QuestionUserID {
-			msg.ObjectType = constant.AnswerObjectType
-		} else {
-			msg.ObjectType = constant.AnswerObjectType
-		}
+		msg.ObjectType = constant.AnswerObjectType
 		if msg.TriggerUserID != msg.ReceiverUserID {
 			ar.notificationQueueService.Send(ctx, msg)
 		}

diff --git a/internal/service/user_service.go b/internal/service/user_service.go
@@ -877,7 +877,7 @@ func (us *UserService) warpStatRankingResp(
 		if stat.Rank <= 0 {
 			continue
 		}
-		if userInfo := userInfoMapping[stat.UserID]; userInfo != nil {
+		if userInfo := userInfoMapping[stat.UserID]; userInfo != nil && userInfo.Status != entity.UserStatusDeleted {
 			resp.UsersWithTheMostReputation = append(resp.UsersWithTheMostReputation, &schema.UserRankingSimpleInfo{
 				Username:    userInfo.Username,
 				Rank:        stat.Rank,
@@ -890,7 +890,7 @@ func (us *UserService) warpStatRankingResp(
 		if stat.VoteCount <= 0 {
 			continue
 		}
-		if userInfo := userInfoMapping[stat.UserID]; userInfo != nil {
+		if userInfo := userInfoMapping[stat.UserID]; userInfo != nil && userInfo.Status != entity.UserStatusDeleted {
 			resp.UsersWithTheMostVote = append(resp.UsersWithTheMostVote, &schema.UserRankingSimpleInfo{
 				Username:    userInfo.Username,
 				VoteCount:   stat.VoteCount,
@@ -900,7 +900,7 @@ func (us *UserService) warpStatRankingResp(
 		}
 	}
 	for _, rel := range userRoleRels {
-		if userInfo := userInfoMapping[rel.UserID]; userInfo != nil {
+		if userInfo := userInfoMapping[rel.UserID]; userInfo != nil && userInfo.Status != entity.UserStatusDeleted {
 			resp.Staffs = append(resp.Staffs, &schema.UserRankingSimpleInfo{
 				Username:    userInfo.Username,
 				Rank:        userInfo.Rank,