blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangchuxiao 2022-06-08 16:46:21 +08:00
parent fa5f234a38
commit a4f69351ce
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rpc/group/super_group.go
View File

@ -40,7 +40,7 @@ func (s *groupServer) GetJoinedSuperGroupList(ctx context.Context, req *pbGroup.
groupInfo.MemberCount = uint32(len(group.MemberIDList)) groupInfo.MemberCount = uint32(len(group.MemberIDList))
resp.GroupList = append(resp.GroupList, groupInfo) resp.GroupList = append(resp.GroupList, groupInfo)
} }
log.NewError(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
return resp, nil return resp, nil
} }

19
pkg/common/db/mongoModel.go
View File

@ -964,9 +964,6 @@ func (d *DataBases) CreateSuperGroup(groupID string, initMemberIDList []string,
} }
defer session.EndSession(ctx) defer session.EndSession(ctx)
sCtx := mongo.NewSessionContext(ctx, session) sCtx := mongo.NewSessionContext(ctx, session)
if err != nil {
return utils.Wrap(err, "start transaction failed")
}
superGroup := SuperGroup{ superGroup := SuperGroup{
GroupID: groupID, GroupID: groupID,
MemberIDList: initMemberIDList, MemberIDList: initMemberIDList,
@ -987,12 +984,10 @@ func (d *DataBases) CreateSuperGroup(groupID string, initMemberIDList []string,
Upsert: &upsert, Upsert: &upsert,
} }
c = d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cUserToSuperGroup) c = d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cUserToSuperGroup)
for _, userID := range initMemberIDList { _, err = c.UpdateMany(sCtx, bson.M{"user_id": bson.M{"$in": initMemberIDList}}, bson.M{"$addToSet": bson.M{"group_id_list": groupID}}, opts)
_, err = c.UpdateOne(sCtx, bson.M{"user_id": userID}, bson.M{"$addToSet": bson.M{"group_id_list": groupID}}, opts) if err != nil {
if err != nil { session.AbortTransaction(ctx)
session.AbortTransaction(ctx) return utils.Wrap(err, "transaction failed")
return utils.Wrap(err, "transaction failed")
}
} }
session.CommitTransaction(ctx) session.CommitTransaction(ctx)
return err return err
@ -1099,15 +1094,15 @@ func (d *DataBases) DeleteSuperGroup(groupID string) error {
return nil return nil
} }
func (d *DataBases) RemoveGroupFromUser(ctx, sCtx context.Context, groupID string, userID []string) error { func (d *DataBases) RemoveGroupFromUser(ctx, sCtx context.Context, groupID string, userIDList []string) error {
var users []UserToSuperGroup var users []UserToSuperGroup
for _, v := range userID { for _, v := range userIDList {
users = append(users, UserToSuperGroup{ users = append(users, UserToSuperGroup{
UserID: v, UserID: v,
}) })
} }
c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cUserToSuperGroup) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cUserToSuperGroup)
_, err := c.UpdateOne(sCtx, bson.M{"user_id": bson.M{"$in": userID}}, bson.M{"$pull": bson.M{"group_id_list": groupID}}) _, err := c.UpdateOne(sCtx, bson.M{"user_id": bson.M{"$in": userIDList}}, bson.M{"$pull": bson.M{"group_id_list": groupID}})
if err != nil { if err != nil {
return utils.Wrap(err, "UpdateOne transaction failed") return utils.Wrap(err, "UpdateOne transaction failed")
} }