Merge remote-tracking branch 'origin/superGroup' into superGroup

internal/rpc/group/group.go

@@ -107,19 +107,15 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 		return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, http.WrapError(constant.ErrDB)
 	}
 	var okUserIDList []string
-
+	resp := &pbGroup.CreateGroupResp{GroupInfo: &open_im_sdk.GroupInfo{}}
-	if req.GroupInfo.GroupType == constant.NormalGroup {
 	groupMember := db.GroupMember{}
 	us := &db.User{}
-		if req.OwnerUserID == "" {
+	if req.OwnerUserID != "" {
-			goto initMemberList
-		}
 		us, err = imdb.GetUserByUserID(req.OwnerUserID)
 		if err != nil {
 			log.NewError(req.OperationID, "GetUserByUserID failed ", err.Error(), req.OwnerUserID)
 			return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, http.WrapError(constant.ErrDB)
 		}
-
 		//to group member
 		groupMember = db.GroupMember{GroupID: groupId, RoleLevel: constant.GroupOwner, OperatorUserID: req.OpUserID}
 		utils.CopyStructFields(&groupMember, us)
@@ -128,9 +124,8 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 			log.NewError(req.OperationID, "InsertIntoGroupMember failed ", err.Error(), groupMember)
 			return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, http.WrapError(constant.ErrDB)
 		}
-
+	}
-	initMemberList:
+	if req.GroupInfo.GroupType != constant.SuperGroup {
-		var okUserIDList []string
 		//to group member
 		for _, user := range req.InitMemberList {
 			us, err := imdb.GetUserByUserID(user.UserID)
@@ -151,7 +146,6 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 			}
 			okUserIDList = append(okUserIDList, user.UserID)
 		}
-		resp := &pbGroup.CreateGroupResp{GroupInfo: &open_im_sdk.GroupInfo{}}
 		group, err := imdb.GetGroupInfoByGroupID(groupId)
 		if err != nil {
 			log.NewError(req.OperationID, "GetGroupInfoByGroupID failed ", err.Error(), groupId)
@@ -171,12 +165,15 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 			resp.GroupInfo.OwnerUserID = req.OwnerUserID
 			okUserIDList = append(okUserIDList, req.OwnerUserID)
 		}
-	} else if req.GroupInfo.GroupType == constant.SuperGroup {
+	} else {
 		for _, v := range req.InitMemberList {
 			okUserIDList = append(okUserIDList, v.UserID)
 		}
-		//memberCount := len(okUserIDList)
+		if err := db.DB.CreateSuperGroup(groupId, okUserIDList, len(okUserIDList)); err != nil {
-
+			log.NewError(req.OperationID, "GetGroupMemberNumByGroupID failed ", err.Error(), groupId)
+			resp.ErrCode = constant.ErrDB.ErrCode
+			resp.ErrMsg = err.Error() + ": CreateSuperGroup failed"
+		}
 	}
 
 	if len(okUserIDList) != 0 {
@@ -198,7 +195,9 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 		}
 
 		log.NewInfo(req.OperationID, "rpc CreateGroup return ", resp.String())
+		if req.GroupInfo.GroupType != constant.SuperGroup {
 			chat.GroupCreatedNotification(req.OperationID, req.OpUserID, groupId, okUserIDList)
+		}
 		return resp, nil
 	} else {
 		log.NewInfo(req.OperationID, "rpc CreateGroup return ", resp.String())
@@ -261,8 +260,9 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 	//
 	//from User:  invite: applicant
 	//to user:  invite: invited
-	var resp pbGroup.InviteUserToGroupResp
 	var okUserIDList []string
+	if groupInfo.GroupType != constant.SuperGroup {
+		var resp pbGroup.InviteUserToGroupResp
 		for _, v := range req.InvitedUserIDList {
 			var resultNode pbGroup.Id2Result
 			resultNode.UserID = v
@@ -302,6 +302,9 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 		}
 		var haveConUserID []string
 		conversations, err := imdb.GetConversationsByConversationIDMultipleOwner(okUserIDList, utils.GetConversationIDBySessionType(req.GroupID, constant.GroupChatType))
+		if err != nil {
+			log.NewError(req.OperationID, "GetConversationsByConversationIDMultipleOwner failed ", err.Error(), req.GroupID, constant.GroupChatType)
+		}
 		for _, v := range conversations {
 			haveConUserID = append(haveConUserID, v.OwnerUserID)
 		}
@@ -347,7 +350,14 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 				log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "SetConversation success", respPb.String(), v)
 			}
 		}
+	} else {
+		okUserIDList = req.InvitedUserIDList
+		if err := db.DB.AddUserToSuperGroup(req.GroupID, req.InvitedUserIDList); err != nil {
+			log.NewError(req.OperationID, "AddUserToSuperGroup failed ", req.GroupID, err)
+			return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: err.Error()}, nil
+		}
 
+	}
 	addGroupMemberToCacheReq := &pbCache.AddGroupMemberToCacheReq{
 		UserIDList:  okUserIDList,
 		GroupID:     req.GroupID,
@@ -365,15 +375,25 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 		return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
 	}
 
+	if groupInfo.GroupType != constant.SuperGroup {
 		chat.MemberInvitedNotification(req.OperationID, req.GroupID, req.OpUserID, req.Reason, okUserIDList)
-	resp.ErrCode = 0
+	}
-	log.NewInfo(req.OperationID, "InviteUserToGroup rpc return ", resp.String())
+
-	return &resp, nil
+	log.NewInfo(req.OperationID, "InviteUserToGroup rpc return ")
+	return &pbGroup.InviteUserToGroupResp{}, nil
 }
 
 func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGroupAllMemberReq) (*pbGroup.GetGroupAllMemberResp, error) {
 	log.NewInfo(req.OperationID, "GetGroupAllMember, args ", req.String())
 	var resp pbGroup.GetGroupAllMemberResp
+	groupInfo, err := imdb.GetGroupInfoByGroupID(req.GroupID)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+		resp.ErrCode = constant.ErrDB.ErrCode
+		resp.ErrMsg = constant.ErrDB.ErrMsg
+		return &resp, nil
+	}
+	if groupInfo.GroupType != constant.SuperGroup {
 		memberList, err := imdb.GetGroupMemberListByGroupID(req.GroupID)
 		if err != nil {
 			resp.ErrCode = constant.ErrDB.ErrCode
@@ -390,6 +410,21 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGro
 			//log.Debug(req.OperationID, "cp value: ", node)
 			resp.MemberList = append(resp.MemberList, &node)
 		}
+	} else {
+		groupInfo, err := db.DB.GetSuperGroup(req.GroupID)
+		if err != nil {
+			resp.ErrCode = constant.ErrDB.ErrCode
+			resp.ErrMsg = constant.ErrDB.ErrMsg
+			log.NewError(req.OperationID, "GetSuperGroup failed,", err.Error(), req.GroupID)
+			return &resp, nil
+		}
+		for _, userID := range groupInfo.MemberIDList {
+			var node open_im_sdk.GroupMemberFullInfo
+			node.UserID = userID
+			resp.MemberList = append(resp.MemberList, &node)
+		}
+	}
+
 	log.NewInfo(req.OperationID, "GetGroupAllMember rpc return ", resp.String())
 	return &resp, nil
 }
@@ -424,6 +459,14 @@ func (s *groupServer) GetGroupMemberList(ctx context.Context, req *pbGroup.GetGr
 
 func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGroupMemberReq) (*pbGroup.KickGroupMemberResp, error) {
 	log.NewInfo(req.OperationID, "KickGroupMember args ", req.String())
+	groupInfo, err := imdb.GetGroupInfoByGroupID(req.GroupID)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupInfoByGroupID", req.GroupID, err.Error())
+		return &pbGroup.KickGroupMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
+	}
+	var okUserIDList []string
+	var resp pbGroup.KickGroupMemberResp
+	if groupInfo.GroupType != constant.SuperGroup {
 		ownerList, err := imdb.GetOwnerManagerByGroupID(req.GroupID)
 		if err != nil {
 			log.NewError(req.OperationID, "GetOwnerManagerByGroupId failed ", err.Error(), req.GroupID)
@@ -463,10 +506,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
 				groupOwnerUserID = v.UserID
 			}
 		}
-
-	var okUserIDList []string
 		//remove
-	var resp pbGroup.KickGroupMemberResp
 		for _, v := range req.KickedUserIDList {
 			//owner can‘t kicked
 			if v == groupOwnerUserID {
@@ -508,6 +548,15 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
 				log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "SetConversation success", respPb.String(), v)
 			}
 		}
+	} else {
+		okUserIDList = req.KickedUserIDList
+		if err := db.DB.RemoverUserFromSuperGroup(req.GroupID, okUserIDList); err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), req.GroupID, req.KickedUserIDList, err.Error())
+			resp.ErrCode = constant.ErrDB.ErrCode
+			resp.ErrMsg = constant.ErrDB.ErrMsg
+			return &resp, nil
+		}
+	}
 
 	reduceGroupMemberFromCacheReq := &pbCache.ReduceGroupMemberFromCacheReq{
 		UserIDList:  okUserIDList,
@@ -525,8 +574,9 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
 		log.NewError(req.OperationID, "ReduceGroupMemberFromCache rpc logic call failed ", cacheResp.String())
 		return &pbGroup.KickGroupMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
 	}
-
+	if groupInfo.GroupType != constant.SuperGroup {
 		chat.MemberKickedNotification(req, okUserIDList)
+	}
 	log.NewInfo(req.OperationID, "GetGroupMemberList rpc return ", resp.String())
 	return &resp, nil
 }
@@ -1265,6 +1315,12 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
 		log.NewError(req.OperationID, "OperateGroupStatus failed ", req.GroupID, constant.GroupStatusDismissed)
 		return &pbGroup.DismissGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
+	groupInfo, err := imdb.GetGroupInfoByGroupID(req.GroupID)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+		return &pbGroup.DismissGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
+	}
+	if groupInfo.GroupType != constant.SuperGroup {
 		memberList, err := imdb.GetGroupMemberListByGroupID(req.GroupID)
 		if err != nil {
 			log.NewError(req.OperationID, "GetGroupMemberListByGroupID failed,", err.Error(), req.GroupID)
@@ -1289,14 +1345,20 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
 				log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "SetConversation success", respPb.String(), v.UserID)
 			}
 		}
-	chat.GroupDismissedNotification(req)
 		err = imdb.DeleteGroupMemberByGroupID(req.GroupID)
+		if err != nil {
+			log.NewError(req.OperationID, "DeleteGroupMemberByGroupID failed ", req.GroupID)
+			return &pbGroup.DismissGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
+		}
+		chat.GroupDismissedNotification(req)
+	} else {
+		err = db.DB.DeleteSuperGroup(req.GroupID)
 		if err != nil {
 			log.NewError(req.OperationID, "DeleteGroupMemberByGroupID failed ", req.GroupID)
 			return &pbGroup.DismissGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 
 		}
-
+	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""})
 	return &pbGroup.DismissGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil
 }

pkg/common/db/mongoModel.go

@@ -29,6 +29,7 @@ const cTag = "tag"
 const cSendLog = "send_log"
 const cWorkMoment = "work_moment"
 const cCommentMsg = "comment_msg"
+const cSuperGroup = "super_group"
 const singleGocMsgNum = 5000
 
 func GetSingleGocMsgNum() int {
@@ -878,8 +879,51 @@ func (d *DataBases) GetUserFriendWorkMoments(showNumber, pageNumber int32, userI
 	return workMomentList, err
 }
 
-func (d *DataBases) CreateSuperGroup() {
+type SuperGroup struct {
+	GroupID        string   `bson:"group_id"`
+	MemberNumCount int      `bson:"member_num_count"`
+	MemberIDList   []string `bson:"member_id_list"`
+}
 
+func (d *DataBases) CreateSuperGroup(groupID string, initMemberIDList []string, memberNumCount int) error {
+	ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
+	c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSuperGroup)
+	superGroup := SuperGroup{
+		GroupID:        groupID,
+		MemberNumCount: memberNumCount,
+		MemberIDList:   initMemberIDList,
+	}
+	_, err := c.InsertOne(ctx, superGroup)
+	return err
+}
+
+func (d *DataBases) GetSuperGroup(groupID string) (SuperGroup, error) {
+	ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
+	c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSuperGroup)
+	superGroup := SuperGroup{}
+	err := c.FindOne(ctx, bson.M{"group_id": groupID}).Decode(&superGroup)
+	return superGroup, err
+}
+
+func (d *DataBases) AddUserToSuperGroup(groupID string, userIDList []string) error {
+	ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
+	c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSuperGroup)
+	_, err := c.UpdateOne(ctx, bson.M{"group_id": groupID}, bson.M{"$addToSet": bson.M{"member_id_list": bson.M{"$each": userIDList}}})
+	return err
+}
+
+func (d *DataBases) RemoverUserFromSuperGroup(groupID string, userIDList []string) error {
+	ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
+	c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSuperGroup)
+	_, err := c.UpdateOne(ctx, bson.M{"group_id": groupID}, bson.M{"$pull": bson.M{"member_id_list": bson.M{"$in": userIDList}}})
+	return err
+}
+
+func (d *DataBases) DeleteSuperGroup(groupID string) error {
+	ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
+	c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSuperGroup)
+	_, err := c.DeleteOne(ctx, bson.M{"group_id": groupID})
+	return err
 }
 
 func generateTagID(tagName, userID string) string {