cms

pkg/common/db/mysql_model/im_mysql_model/demo_model.go

@@ -28,3 +28,38 @@ func ResetPassword(account, password string) error {
 	}
 	return db.DB.MysqlDB.DefaultGormDB().Table("registers").Where("account = ?", account).Updates(&r).Error
 }
+
+func GetRegisterAddFriendList(showNumber, pageNumber int32) ([]string, error) {
+	var IDList []string
+	var err error
+	model := db.DB.MysqlDB.DefaultGormDB().Model(&db.RegisterAddFriend{})
+	if showNumber == 0 {
+		err = model.Pluck("user_id", &IDList).Error
+	} else {
+		err = model.Limit(int(showNumber)).Offset(int(showNumber*(pageNumber-1))).Pluck("user_id", &IDList).Error
+	}
+	return IDList, err
+}
+
+func AddUserRegisterAddFriendIDList(userIDList ...string) error {
+	var list []db.RegisterAddFriend
+	for _, v := range userIDList {
+		list = append(list, db.RegisterAddFriend{UserID: v})
+	}
+	err := db.DB.MysqlDB.DefaultGormDB().Create(list).Error
+	return err
+}
+
+func ReduceUserRegisterAddFriendIDList(userIDList ...string) error {
+	var list []db.RegisterAddFriend
+	for _, v := range userIDList {
+		list = append(list, db.RegisterAddFriend{UserID: v})
+	}
+	err := db.DB.MysqlDB.DefaultGormDB().Delete(list).Error
+	return err
+}
+
+func DeleteAllRegisterAddFriendIDList() error {
+	err := db.DB.MysqlDB.DefaultGormDB().Where("1 = 1").Delete(&db.RegisterAddFriend{}).Error
+	return err
+}

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

@@ -140,14 +140,6 @@ func IsExistGroupMember(groupID, userID string) bool {
 	return true
 }
 
-func RemoveGroupMember(groupID string, UserID string) error {
-	return DeleteGroupMemberByGroupIDAndUserID(groupID, UserID)
-}
-
-func GetMemberInfoByID(groupID string, userID string) (*db.GroupMember, error) {
-	return GetGroupMemberInfoByGroupIDAndUserID(groupID, userID)
-}
-
 func GetGroupMemberByGroupID(groupID string, filter int32, begin int32, maxNumber int32) ([]db.GroupMember, error) {
 	var memberList []db.GroupMember
 	var err error

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

@@ -1,12 +1,9 @@
 package im_mysql_model
 
 import (
-	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/utils"
-	"errors"
 	"fmt"
-	"gorm.io/gorm"
 	"time"
 )
 
@@ -36,32 +33,35 @@ func InsertIntoGroup(groupInfo db.Group) error {
 	if err != nil {
 		return err
 	}
-
 	return nil
 }
 
-func GetGroupInfoByGroupID(groupId string) (*db.Group, error) {
+func GetGroupInfoByGroupID(groupID string) (*db.Group, error) {
 	var groupInfo db.Group
-	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id=?", groupId).Take(&groupInfo).Error
-	if err != nil {
-		return nil, err
-	}
-	return &groupInfo, nil
+	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id=?", groupID).Take(&groupInfo).Error
+	return &groupInfo, err
 }
 
 func SetGroupInfo(groupInfo db.Group) error {
 	return db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id=?", groupInfo.GroupID).Updates(&groupInfo).Error
 }
 
-func GetGroupsByName(groupName string, pageNumber, showNumber int32) ([]db.Group, error) {
-	var groups []db.Group
-	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where(fmt.Sprintf(" name like '%%%s%%' ", groupName)).Limit(int(showNumber)).Offset(int(showNumber * (pageNumber - 1))).Find(&groups).Error
+type GroupWithNum struct {
+	db.Group
+	MemberCount int `gorm:"column:num"`
+}
+
+func GetGroupsByName(groupName string, pageNumber, showNumber int32) ([]GroupWithNum, error) {
+	var groups []GroupWithNum
+	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Select("groups.*, (select count(*) from group_members where group_members.group_id=groups.group_id) as num").
+		Where(fmt.Sprintf(" name like '%%%s%%' ", groupName)).Limit(int(showNumber)).Offset(int(showNumber * (pageNumber - 1))).Find(&groups).Error
 	return groups, err
 }
 
-func GetGroups(pageNumber, showNumber int) ([]db.Group, error) {
-	var groups []db.Group
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&groups).Error; err != nil {
+func GetGroups(pageNumber, showNumber int) ([]GroupWithNum, error) {
+	var groups []GroupWithNum
+	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Select("groups.*, (select count(*) from group_members where group_members.group_id=groups.group_id) as num").
+		Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&groups).Error; err != nil {
 		return groups, err
 	}
 	return groups, nil
@@ -78,77 +78,6 @@ func OperateGroupStatus(groupId string, groupStatus int32) error {
 	return nil
 }
 
-func DeleteGroup(groupId string) error {
-	var group db.Group
-	var groupMembers []db.GroupMember
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id=?", groupId).Delete(&group).Error; err != nil {
-		return err
-	}
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("group_id=?", groupId).Delete(groupMembers).Error; err != nil {
-		return err
-	}
-	return nil
-}
-
-func OperateGroupRole(userId, groupId string, roleLevel int32) (string, string, error) {
-	groupMember := db.GroupMember{
-		UserID:  userId,
-		GroupID: groupId,
-	}
-	updateInfo := db.GroupMember{
-		RoleLevel: roleLevel,
-	}
-	groupMaster := db.GroupMember{}
-	var err error
-	switch roleLevel {
-	case constant.GroupOwner:
-		err = db.DB.MysqlDB.DefaultGormDB().Transaction(func(tx *gorm.DB) error {
-			result := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("group_id = ? and role_level = ?", groupId, constant.GroupOwner).First(&groupMaster).Updates(&db.GroupMember{
-				RoleLevel: constant.GroupOrdinaryUsers,
-			})
-			if result.Error != nil {
-				return result.Error
-			}
-			if result.RowsAffected == 0 {
-				return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId))
-			}
-
-			result = db.DB.MysqlDB.DefaultGormDB().Table("group_members").First(&groupMember).Updates(updateInfo)
-			if result.Error != nil {
-				return result.Error
-			}
-			if result.RowsAffected == 0 {
-				return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId))
-			}
-			return nil
-		})
-
-	case constant.GroupOrdinaryUsers:
-		err = db.DB.MysqlDB.DefaultGormDB().Transaction(func(tx *gorm.DB) error {
-			result := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("group_id = ? and role_level = ?", groupId, constant.GroupOwner).First(&groupMaster)
-			if result.Error != nil {
-				return result.Error
-			}
-			if result.RowsAffected == 0 {
-				return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId))
-			}
-			if groupMaster.UserID == userId {
-				return errors.New(fmt.Sprintf("user %s is master of %s, cant set to ordinary user", userId, groupId))
-			} else {
-				result = db.DB.MysqlDB.DefaultGormDB().Table("group_members").Find(&groupMember).Updates(updateInfo)
-				if result.Error != nil {
-					return result.Error
-				}
-				if result.RowsAffected == 0 {
-					return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId))
-				}
-			}
-			return nil
-		})
-	}
-	return "", "", err
-}
-
 func GetGroupsCountNum(group db.Group) (int32, error) {
 	var count int64
 	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where(fmt.Sprintf(" name like '%%%s%%' ", group.GroupName)).Count(&count).Error; err != nil {
@@ -157,34 +86,10 @@ func GetGroupsCountNum(group db.Group) (int32, error) {
 	return int32(count), nil
 }
 
-func GetGroupById(groupId string) (db.Group, error) {
-	group := db.Group{
-		GroupID: groupId,
-	}
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Find(&group).Error; err != nil {
-		return group, err
-	}
-	return group, nil
-}
-
-func GetGroupMaster(groupId string) (db.GroupMember, error) {
-	groupMember := db.GroupMember{}
-	if err := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("role_level=? and group_id=?", constant.GroupOwner, groupId).Find(&groupMember).Error; err != nil {
-		return groupMember, err
-	}
-	return groupMember, nil
-}
-
 func UpdateGroupInfoDefaultZero(groupID string, args map[string]interface{}) error {
 	return db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id = ? ", groupID).Updates(args).Error
 }
 
-func GetAllGroupIDList() ([]string, error) {
-	var groupIDList []string
-	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Pluck("group_id", &groupIDList).Error
-	return groupIDList, err
-}
-
 func GetGroupIDListByGroupType(groupType int) ([]string, error) {
 	var groupIDList []string
 	if err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_type = ? ", groupType).Pluck("group_id", &groupIDList).Error; err != nil {

pkg/common/db/mysql_model/im_mysql_model/user_model.go

@@ -72,6 +72,12 @@ func GetUserByUserID(userID string) (*db.User, error) {
 	return &user, nil
 }
 
+func GetUsersByUserIDList(userIDList []string) ([]*db.User, error) {
+	var userList []*db.User
+	err := db.DB.MysqlDB.DefaultGormDB().Table("users").Where("user_id in (?)", userIDList).Find(&userList).Error
+	return userList, err
+}
+
 func GetUserNameByUserID(userID string) (string, error) {
 	var user db.User
 	err := db.DB.MysqlDB.DefaultGormDB().Table("users").Select("name").Where("user_id=?", userID).First(&user).Error