Merge pull request 'by Robin at 20240509' (#415) from BUG-RELATION-Robin into test

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/415

app/mix/controller/accountrelation_api.go

@@ -174,7 +174,7 @@ func ApiGetAbleToAccessWeixinOfAccountRelationList(ctx *gin.Context) {
 
 func ApiGetAccountRelationCount(ctx *gin.Context) {
 	req := ctx.MustGet("client_req").(*accountrelationproto.ApiCountReq)
-	countMap, ec := service.DefaultService.ApiGetAccountRelationCount(ctx, req)
+	followCount, isfollowedCount, ec := service.DefaultService.ApiGetAccountRelationCount(ctx, req)
 	if ec != errcode.ErrCodeAccountRelationSrvOk {
 		logger.Error("ApiGetAccountRelationCount fail, req: %v, ec: %v", util.ToJson(req), ec)
 		ReplyErrCodeMsg(ctx, ec)
@@ -182,9 +182,8 @@ func ApiGetAccountRelationCount(ctx *gin.Context) {
 	}
 
 	data := &accountrelationproto.ApiCountData{
-		FollowCount:     countMap[consts.Follow],
+		FollowCount:     followCount,
-		IsFollowedCount: countMap[consts.IsFollowed],
+		IsFollowedCount: isfollowedCount,
-		FriendCount:     countMap[consts.Friend],
 	}
 	ReplyOk(ctx, data)
 }

app/mix/controller/accountrelation_op.go

@@ -138,7 +138,7 @@ func OpGetAbleToAccessWeixinOfAccountRelationList(ctx *gin.Context) {
 
 func OpGetAccountRelationCount(ctx *gin.Context) {
 	req := ctx.MustGet("client_req").(*accountrelationproto.OpCountReq)
-	countMap, ec := service.DefaultService.OpGetAccountRelationCount(ctx, req)
+	followCount, isfollowedCount, ec := service.DefaultService.OpGetAccountRelationCount(ctx, req)
 	if ec != errcode.ErrCodeAccountRelationSrvOk {
 		logger.Error("OpGetAccountRelationCount fail, req: %v, ec: %v", util.ToJson(req), ec)
 		ReplyErrCodeMsg(ctx, ec)
@@ -146,9 +146,8 @@ func OpGetAccountRelationCount(ctx *gin.Context) {
 	}
 
 	data := &accountrelationproto.OpCountData{
-		FollowCount:     countMap[consts.Follow],
+		FollowCount:     followCount,
-		IsFollowedCount: countMap[consts.IsFollowed],
+		IsFollowedCount: isfollowedCount,
-		FriendCount:     countMap[consts.Friend],
 	}
 	ReplyOk(ctx, data)
 }

app/mix/dao/mongo.go

@@ -1999,80 +1999,29 @@ func (m *Mongo) GetFriendAccountRelationList(ctx *gin.Context, req *accountrelat
 	return
 }
 
-func (m *Mongo) GetFriendAccountRelationCount(ctx *gin.Context, req *accountrelationproto.OpCountReq) (results []map[string]interface{}, err error) {
+func (m *Mongo) GetAccountRelationCount(ctx *gin.Context, req *accountrelationproto.OpCountReq) (followCount, isfollowedCount int64, err error) {
 	col := m.getColAccountRelation()
 
-	matchClause := bson.D{{
+	// 关注
-		Key: "$match", Value: bson.M{
+	filterFollow := qmgo.M{
-			"sub_mid": util.DerefInt64(req.Mid),
+		"sub_mid":   util.DerefInt64(req.Mid),
-			"predicate": bson.M{
+		"predicate": consts.Follow,
-				"$in": [2]int{consts.Follow, consts.IsFollowed},
+		"del_flag":  0,
-			},
-			"del_flag": 0,
-		},
-	}}
-
-	groupClause := bson.D{
-		{Key: "$group", Value: bson.D{
-			{Key: "_id", Value: "$obj_mid"},
-			{Key: "relation_count", Value: bson.M{
-				"$sum": 1,
-			}},
-		},
-		},
 	}
 
-	havingClause := bson.D{{
+	filterIsFollowed := qmgo.M{
-		Key: "$match", Value: bson.M{
+		"sub_mid":   util.DerefInt64(req.Mid),
-			"relation_count": 2,
+		"predicate": consts.IsFollowed,
-		},
+		"del_flag":  0,
-	}}
-
-	secondOrderGroupClause := bson.D{
-		{Key: "$group", Value: bson.D{
-			{Key: "_id", Value: "$relation_count"},
-			{Key: "count", Value: bson.M{
-				"$sum": 1,
-			}},
-		}},
 	}
 
-	pipeline := qmgo.Pipeline{matchClause, groupClause, havingClause, secondOrderGroupClause}
+	followCount, err = col.Find(ctx, filterFollow).Count()
-
-	err = col.Aggregate(ctx, pipeline).All(&results)
 	if err != nil {
 		logger.Error("err : %v", err)
 		return
 	}
 
-	return
+	isfollowedCount, err = col.Find(ctx, filterIsFollowed).Count()
-}
-
-func (m *Mongo) GetAccountRelationCount(ctx *gin.Context, req *accountrelationproto.OpCountReq) (results []map[string]interface{}, err error) {
-	col := m.getColAccountRelation()
-	matchClause := bson.D{{
-		Key: "$match", Value: bson.M{
-			"sub_mid": util.DerefInt64(req.Mid),
-			"predicate": bson.M{
-				"$in": [2]int{consts.Follow, consts.IsFollowed},
-			},
-			"del_flag": 0,
-		},
-	}}
-
-	groupClause := bson.D{
-		{Key: "$group", Value: bson.D{
-			{Key: "_id", Value: "$predicate"},
-			{Key: "count", Value: bson.M{
-				"$sum": 1,
-			}},
-		},
-		},
-	}
-
-	pipeline := qmgo.Pipeline{matchClause, groupClause}
-
-	err = col.Aggregate(ctx, pipeline).All(&results)
 	if err != nil {
 		logger.Error("err : %v", err)
 		return

app/mix/service/apiservice.go

@@ -920,14 +920,14 @@ func (s *Service) ApiGetAbleToAccessWeixinOfAccountRelationList(ctx *gin.Context
 }
 
 // 查询关注、被关注数量
-func (s *Service) ApiGetAccountRelationCount(ctx *gin.Context, req *accountrelationproto.ApiCountReq) (countMap map[int64]int64, ec errcode.ErrCode) {
+func (s *Service) ApiGetAccountRelationCount(ctx *gin.Context, req *accountrelationproto.ApiCountReq) (followCount, isfollowedCount int64, ec errcode.ErrCode) {
 	ec = errcode.ErrCodeAccountRelationSrvOk
 
 	if ec = s.ApiGetAccountRelationCountBusinessValidate(ctx, req); ec != errcode.ErrCodeAccountRelationSrvOk {
 		return
 	}
 
-	countMap, err := _DefaultAccountRelation.OpCount(ctx, &accountrelationproto.OpCountReq{
+	followCount, isfollowedCount, err := _DefaultAccountRelation.OpCount(ctx, &accountrelationproto.OpCountReq{
 		Mid: req.Mid,
 	})
 	if err != nil {

app/mix/service/logic/accountrelation.go

@@ -137,38 +137,14 @@ func (p *AccountRelation) OpListFriend(ctx *gin.Context, req *accountrelationpro
 	return list, err
 }
 
-func (p *AccountRelation) OpCount(ctx *gin.Context, req *accountrelationproto.OpCountReq) (map[int64]int64, error) {
+func (p *AccountRelation) OpCount(ctx *gin.Context, req *accountrelationproto.OpCountReq) (followCount, isfollowedCount int64, err error) {
-	countMap := make(map[int64]int64)
+	followCount, isfollowedCount, err = p.store.GetAccountRelationCount(ctx, req)
-	mapList, err := p.store.GetAccountRelationCount(ctx, req)
 	if err != nil {
 		logger.Error("GetAccountRelationCount fail, err: %v", err)
-		return nil, err
+		return
-	}
-	friendMapList, err := p.store.GetFriendAccountRelationCount(ctx, req)
-	if err != nil {
-		logger.Error("GetFriendAccountRelationCount fail, err: %v", err)
-		return nil, err
-	}
-	for _, _map := range mapList {
-		id, ok1 := _map["_id"].(int64)
-		count, ok2 := _map["count"].(int32)
-		if ok1 && ok2 {
-			countMap[id] = int64(count)
-		} else {
-			logger.Error("assertion err")
-			return nil, fmt.Errorf("assertion err")
-		}
-	}
-	if len(friendMapList) > 0 {
-		if count, ok := friendMapList[0]["count"].(int32); ok {
-			countMap[consts.Friend] = int64(count)
-		} else {
-			logger.Error("assertion err")
-			return nil, fmt.Errorf("assertion err")
-		}
 	}
 
-	return countMap, nil
+	return
 }
 
 func (p *AccountRelation) OpIsFollowedCount(ctx *gin.Context) ([]int64, []int64, error) {

app/mix/service/service.go

@@ -1592,14 +1592,14 @@ func (s *Service) OpGetAbleToAccessWeixinOfAccountRelationList(ctx *gin.Context,
 	return
 }
 
-func (s *Service) OpGetAccountRelationCount(ctx *gin.Context, req *accountrelationproto.OpCountReq) (countMap map[int64]int64, ec errcode.ErrCode) {
+func (s *Service) OpGetAccountRelationCount(ctx *gin.Context, req *accountrelationproto.OpCountReq) (followCount, isfollowedCount int64, ec errcode.ErrCode) {
 	ec = errcode.ErrCodeAccountRelationSrvOk
 
 	if ec = s.OpGetAccountRelationCountBusinessValidate(ctx, req); ec != errcode.ErrCodeAccountRelationSrvOk {
 		return
 	}
 
-	countMap, err := _DefaultAccountRelation.OpCount(ctx, req)
+	followCount, isfollowedCount, err := _DefaultAccountRelation.OpCount(ctx, req)
 	if err != nil {
 		logger.Error("OpCount fail, req: %v, err: %v", util.ToJson(req), err)
 		ec = errcode.ErrCodeAccountRelationSrvFail