tidy code

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

@@ -33,7 +33,7 @@ func GetFriendRelationshipFromFriend(OwnerUserID, FriendUserID string) (*Friend,
 	return &friend, err
 }
 
-func GetUserInfoFromFriend(OwnerUserID string) ([]Friend, error) {
+func GetFriendListByUserID(OwnerUserID string) ([]Friend, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err

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

@@ -44,14 +44,14 @@ func GetSendFriendApplicationListByUserID(FromUserID string) ([]FriendRequest, e
 	return usersInfo, nil
 }
 
-//reqId apply to add userId already
-func GetFriendApplicationByBothUserID(FromUserId, ToUserID string) (*FriendRequest, error) {
+//FromUserId apply to add ToUserID
+func GetFriendApplicationByBothUserID(FromUserID, ToUserID string) (*FriendRequest, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
 	var friendRequest FriendRequest
-	err = dbConn.Table("friend_request").Where("from_user_id=? and to_user_id=?", FromUserId, ToUserID).Find(&friendRequest).Error
+	err = dbConn.Table("friend_request").Where("from_user_id=? and to_user_id=?", FromUserID, ToUserID).Find(&friendRequest).Error
 	if err != nil {
 		return nil, err
 	}
@@ -63,9 +63,22 @@ func UpdateFriendApplication(friendRequest *FriendRequest) error {
 	if err != nil {
 		return err
 	}
+	friendRequest.CreateTime = time.Now()
 	err = dbConn.Table("friend_request").Where("from_user_id=? and to_user_id=?", friendRequest.FromUserID, friendRequest.ToUserID).Update(&friendRequest).Error
 	if err != nil {
 		return err
 	}
 	return nil
 }
+
+func InsertFriendApplication(friendRequest *FriendRequest) error {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return err
+	}
+	err = dbConn.Table("friend_request").Create(friendRequest).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}

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

@@ -172,7 +172,7 @@ func GetGroupMemberByGroupID(groupID string, filter int32, begin int32, maxNumbe
 	var memberList []GroupMember
 	var err error
 	if filter >= 0 {
-		memberList, err = GetGroupMemberListByGroupIDAndFilter(groupID, filter) //sorted by join time
+		memberList, err = GetGroupMemberListByGroupIDAndRoleLevel(groupID, filter) //sorted by join time
 	} else {
 		memberList, err = GetGroupMemberListByGroupID(groupID)
 	}