|
|
@ -91,12 +91,6 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
|
|
|
|
log.NewError(req.OperationID, "CheckAccess false ", req.OpUserID, req.OwnerUserID)
|
|
|
|
log.NewError(req.OperationID, "CheckAccess false ", req.OpUserID, req.OwnerUserID)
|
|
|
|
return &pbGroup.CreateGroupResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil
|
|
|
|
return &pbGroup.CreateGroupResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
canCreate, err := callbackBeforeCreateGroup(req)
|
|
|
|
|
|
|
|
if err != nil || !canCreate {
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
log.NewError(req.OperationID, utils.GetSelfFuncName(), "callbackBeforeCreateGroup failed")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
groupId := req.GroupInfo.GroupID
|
|
|
|
groupId := req.GroupInfo.GroupID
|
|
|
|
if groupId == "" {
|
|
|
|
if groupId == "" {
|
|
|
@ -107,11 +101,14 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
|
|
|
|
utils.CopyStructFields(&groupInfo, req.GroupInfo)
|
|
|
|
utils.CopyStructFields(&groupInfo, req.GroupInfo)
|
|
|
|
groupInfo.CreatorUserID = req.OpUserID
|
|
|
|
groupInfo.CreatorUserID = req.OpUserID
|
|
|
|
groupInfo.GroupID = groupId
|
|
|
|
groupInfo.GroupID = groupId
|
|
|
|
err = imdb.InsertIntoGroup(groupInfo)
|
|
|
|
err := imdb.InsertIntoGroup(groupInfo)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
log.NewError(req.OperationID, "InsertIntoGroup failed, ", err.Error(), groupInfo)
|
|
|
|
log.NewError(req.OperationID, "InsertIntoGroup failed, ", err.Error(), groupInfo)
|
|
|
|
return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, http.WrapError(constant.ErrDB)
|
|
|
|
return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, http.WrapError(constant.ErrDB)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
var okUserIDList []string
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if req.GroupInfo.GroupType == constant.NormalGroup {
|
|
|
|
groupMember := db.GroupMember{}
|
|
|
|
groupMember := db.GroupMember{}
|
|
|
|
us := &db.User{}
|
|
|
|
us := &db.User{}
|
|
|
|
if req.OwnerUserID == "" {
|
|
|
|
if req.OwnerUserID == "" {
|
|
|
@ -174,6 +171,13 @@ initMemberList:
|
|
|
|
resp.GroupInfo.OwnerUserID = req.OwnerUserID
|
|
|
|
resp.GroupInfo.OwnerUserID = req.OwnerUserID
|
|
|
|
okUserIDList = append(okUserIDList, req.OwnerUserID)
|
|
|
|
okUserIDList = append(okUserIDList, req.OwnerUserID)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if req.GroupInfo.GroupType == constant.SuperGroup {
|
|
|
|
|
|
|
|
for _, v := range req.InitMemberList {
|
|
|
|
|
|
|
|
okUserIDList = append(okUserIDList, v.UserID)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
//memberCount := len(okUserIDList)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if len(okUserIDList) != 0 {
|
|
|
|
if len(okUserIDList) != 0 {
|
|
|
|
addGroupMemberToCacheReq := &pbCache.AddGroupMemberToCacheReq{
|
|
|
|
addGroupMemberToCacheReq := &pbCache.AddGroupMemberToCacheReq{
|
|
|
|