|
|
@ -63,6 +63,7 @@ func (s *groupServer) GetIncrementalGroupMember(ctx context.Context, req *pbgrou
|
|
|
|
if group.Status == constant.GroupStatusDismissed {
|
|
|
|
if group.Status == constant.GroupStatusDismissed {
|
|
|
|
return nil, servererrs.ErrDismissedAlready.Wrap()
|
|
|
|
return nil, servererrs.ErrDismissedAlready.Wrap()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
var hasGroupUpdate bool
|
|
|
|
opt := incrversion.Option[*sdkws.GroupMemberFullInfo, pbgroup.GetIncrementalGroupMemberResp]{
|
|
|
|
opt := incrversion.Option[*sdkws.GroupMemberFullInfo, pbgroup.GetIncrementalGroupMemberResp]{
|
|
|
|
Ctx: ctx,
|
|
|
|
Ctx: ctx,
|
|
|
|
VersionKey: req.GroupID,
|
|
|
|
VersionKey: req.GroupID,
|
|
|
@ -73,17 +74,14 @@ func (s *groupServer) GetIncrementalGroupMember(ctx context.Context, req *pbgrou
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
var ok bool
|
|
|
|
|
|
|
|
vl.Logs = slices.DeleteFunc(vl.Logs, func(elem model.VersionLogElem) bool {
|
|
|
|
vl.Logs = slices.DeleteFunc(vl.Logs, func(elem model.VersionLogElem) bool {
|
|
|
|
if elem.EID == "" {
|
|
|
|
if elem.EID == "" {
|
|
|
|
ok = true
|
|
|
|
vl.LogLen--
|
|
|
|
|
|
|
|
hasGroupUpdate = true
|
|
|
|
return true
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
return false
|
|
|
|
})
|
|
|
|
})
|
|
|
|
if !ok {
|
|
|
|
|
|
|
|
group = nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return vl, nil
|
|
|
|
return vl, nil
|
|
|
|
},
|
|
|
|
},
|
|
|
|
CacheMaxVersion: s.db.FindMaxGroupMemberVersionCache,
|
|
|
|
CacheMaxVersion: s.db.FindMaxGroupMemberVersionCache,
|
|
|
@ -106,7 +104,7 @@ func (s *groupServer) GetIncrementalGroupMember(ctx context.Context, req *pbgrou
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if group != nil {
|
|
|
|
if resp.Full || hasGroupUpdate {
|
|
|
|
count, err := s.db.FindGroupMemberNum(ctx, group.GroupID)
|
|
|
|
count, err := s.db.FindGroupMemberNum(ctx, group.GroupID)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|