db model update

src/common/db/mysql_model/im_mysql_model/group_member_model.go

@@ -139,6 +139,23 @@ func GetOwnerManagerByGroupId(groupId string) ([]GroupMember, error) {
 	return groupMemberList, nil
 }
 
+func IsExistGroupMember(groupId, uid string) bool {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return false
+	}
+	var number int32
+	err = dbConn.Raw("select count(*) from `group_member` where group_id = ? and uid = ?", groupId, uid).Count(&number).Error
+	if err != nil {
+		return false
+	}
+
+	if number != 1 {
+		return false
+	}
+	return true
+}
+
 func RemoveGroupMember(groupId string, memberId string) error {
 	return DeleteGroupMemberByGroupIdAndUserId(groupId, memberId)
 }

src/common/db/mysql_model/im_mysql_model/group_model.go

@@ -95,7 +95,8 @@ func GetGroupApplicationList(uid string) (*group.GetGroupApplicationListResp, er
 		return &group.GetGroupApplicationListResp{}, nil
 	}
 
-	sql := "select group_id, from_user_id, to_user_id, flag, req_msg, handled_msg, create_time, from_user_nickname, from_user_face_url, handled_user  from `group_request` where  group_id in ( "
+	sql := "select id, group_id, from_user_id, to_user_id, flag, req_msg, handled_msg, create_time, " +
+		"from_user_nickname, to_user_nickname, from_user_face_url, to_user_face_url, handled_user  from `group_request` where  group_id in ( "
 	for i := 0; i < len(gIDs); i++ {
 		if i == len(gIDs)-1 {
 			sql = sql + "\"" + gIDs[i] + "\"" + " )"
@@ -113,8 +114,9 @@ func GetGroupApplicationList(uid string) (*group.GetGroupApplicationListResp, er
 		return nil, err
 	}
 	for rows.Next() {
-		rows.Scan(&groupRequest.GroupID, &groupRequest.FromUserID, &groupRequest.ToUserID, &groupRequest.Flag, &groupRequest.ReqMsg,
-			&groupRequest.HandledMsg, &groupRequest.CreateTime, &groupRequest.FromUserNickname, &groupRequest.FromUserFaceUrl, &groupRequest.HandledUser)
+		rows.Scan(&groupRequest.ID, &groupRequest.GroupID, &groupRequest.FromUserID, &groupRequest.ToUserID, &groupRequest.Flag, &groupRequest.ReqMsg,
+			&groupRequest.HandledMsg, &groupRequest.CreateTime, &groupRequest.FromUserNickname, &groupRequest.ToUserNickname,
+			&groupRequest.FromUserFaceUrl, &groupRequest.ToUserFaceUrl, &groupRequest.HandledUser)
 		groupRequests = append(groupRequests, groupRequest)
 	}
 
@@ -123,14 +125,19 @@ func GetGroupApplicationList(uid string) (*group.GetGroupApplicationListResp, er
 	reply.Data.Count = int32(len(groupRequests))
 	for i := 0; i < int(reply.Data.Count); i++ {
 		addUser := group.GetGroupApplicationList_Data_User{
+			ID:               groupRequests[i].ID,
 			GroupID:          groupRequests[i].GroupID,
 			FromUserID:       groupRequests[i].FromUserID,
-			FromUserNickName: groupRequests[i].FromUserNickname,
+			FromUserNickname: groupRequests[i].FromUserNickname,
 			FromUserFaceUrl:  groupRequests[i].FromUserFaceUrl,
 			ToUserID:         groupRequests[i].ToUserID,
 			AddTime:          groupRequests[i].CreateTime.Unix(),
 			RequestMsg:       groupRequests[i].ReqMsg,
 			HandledMsg:       groupRequests[i].HandledMsg,
+			Flag:             groupRequests[i].Flag,
+			ToUserNickname:   groupRequests[i].ToUserNickname,
+			ToUserFaceUrl:    groupRequests[i].ToUserFaceUrl,
+			HandledUser:      groupRequests[i].HandledUser,
 			Type:             0,
 			HandleStatus:     0,
 			HandleResult:     0,

src/common/db/mysql_model/im_mysql_model/group_request_model.go

@@ -11,14 +11,14 @@ func InsertIntoGroupRequest(groupId, fromUserId, toUserId, reqMsg, fromUserNickN
 		return err
 	}
 	toInsertInfo := GroupRequest{GroupID: groupId, FromUserID: fromUserId, ToUserID: toUserId, ReqMsg: reqMsg, FromUserNickname: fromUserNickName, FromUserFaceUrl: fromUserFaceUrl, CreateTime: time.Now()}
-	err = dbConn.Table("group_request").Create(toInsertInfo).Error
+	err = dbConn.Table("group_request").Create(&toInsertInfo).Error
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func FindGroupRequestUserInfoByUidAndGroupID(groupId, uid string) (*GroupRequest, error) {
+func FindGroupRequestUserInfoByGroupIDAndUid(groupId, uid string) (*GroupRequest, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err

src/common/db/mysql_model/im_mysql_model/model_struct.go

@@ -54,6 +54,7 @@ type GroupMember struct {
 }
 
 type GroupRequest struct {
+	ID               string    `gorm:"column:id"`
 	GroupID          string    `gorm:"column:group_id"`
 	FromUserID       string    `gorm:"column:from_user_id"`
 	ToUserID         string    `gorm:"column:to_user_id"`