feat: Remove MySQL and implement it all with Mongo (#1508)

* fix: GetUserReqApplicationList error when there is a disbanded group chat * fix: error when querying some information about disbanded group * fix: GetUserReqApplicationList dismissed group error * fix: the original message referenced by the pull message processing is withdrawn * fix: the original message referenced by the pull message processing is withdrawn * fix: the original message referenced by the pull message processing is withdrawn * fix: the original message referenced by the pull message processing is withdrawn * fix: the original message referenced by the pull message processing is withdrawn * fix: the original message referenced by the pull message processing is withdrawn * fix: the original message referenced by the pull message processing is withdrawn * fix: the original message referenced by the pull message processing is withdrawn * fix: the original message referenced by the pull message processing is withdrawn * merge * cicd: robot automated Change * sdkws.MsgData * user * interface{} -> any * user * third * group * group * group * group * group * group * conversation * standalone mysql db model * tx * s3 * group * mongo * group * group * group * group * group * group * refactor: add openim mysql to mongo refactor Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * refactor: add openim mysql to mongo refactor Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * remove mysql * remove mysql * friend * friend * friend * friend * friend * friend * group * convert * index * index * all * all * mysql2mongo * data conversion * up35 * up35 * feat: add format set Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * fix: fix scripts Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * merge main * merge main * Update init-config.sh * fix: user args check --------- Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> Co-authored-by: withchao <withchao@users.noreply.github.com> Co-authored-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> Co-authored-by: Xinwei Xiong <3293172751@qq.com>
2026-05-10 12:05:58 +08:00 · 2023-12-05 20:53:02 +08:00
parent 1c1322e3d2
commit c0194f6ef4
141 changed files with 4273 additions and 4858 deletions
@@ -16,6 +16,7 @@ package convert

 import (
 	"context"
+	"fmt"

 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/utils"
@@ -31,23 +32,22 @@ func FriendPb2DB(friend *sdkws.FriendInfo) *relation.FriendModel {
 	return dbFriend
 }

-func FriendDB2Pb(
-	ctx context.Context,
-	friendDB *relation.FriendModel,
+func FriendDB2Pb(ctx context.Context, friendDB *relation.FriendModel,
 	getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 ) (*sdkws.FriendInfo, error) {
-	pbfriend := &sdkws.FriendInfo{FriendUser: &sdkws.UserInfo{}}
-	utils.CopyStructFields(pbfriend, friendDB)
 	users, err := getUsers(ctx, []string{friendDB.FriendUserID})
 	if err != nil {
 		return nil, err
 	}
-	pbfriend.FriendUser.UserID = users[friendDB.FriendUserID].UserID
-	pbfriend.FriendUser.Nickname = users[friendDB.FriendUserID].Nickname
-	pbfriend.FriendUser.FaceURL = users[friendDB.FriendUserID].FaceURL
-	pbfriend.FriendUser.Ex = users[friendDB.FriendUserID].Ex
-	pbfriend.CreateTime = friendDB.CreateTime.Unix()
-	return pbfriend, nil
+	user, ok := users[friendDB.FriendUserID]
+	if !ok {
+		return nil, fmt.Errorf("user not found: %s", friendDB.FriendUserID)
+	}
+
+	return &sdkws.FriendInfo{
+		FriendUser: user,
+		CreateTime: friendDB.CreateTime.Unix(),
+	}, nil
 }

 func FriendsDB2Pb(
@@ -118,3 +118,37 @@ func FriendRequestDB2Pb(
 	}
 	return res, nil
 }
+
+// FriendPb2DBMap converts a FriendInfo protobuf object to a map suitable for database operations.
+// It only includes non-zero or non-empty fields in the map.
+func FriendPb2DBMap(friend *sdkws.FriendInfo) map[string]any {
+	if friend == nil {
+		return nil
+	}
+
+	val := make(map[string]any)
+
+	// Assuming FriendInfo has similar fields to those in FriendModel.
+	// Add or remove fields based on your actual FriendInfo and FriendModel structures.
+	if friend.FriendUser != nil {
+		if friend.FriendUser.UserID != "" {
+			val["friend_user_id"] = friend.FriendUser.UserID
+		}
+		if friend.FriendUser.Nickname != "" {
+			val["nickname"] = friend.FriendUser.Nickname
+		}
+		if friend.FriendUser.FaceURL != "" {
+			val["face_url"] = friend.FriendUser.FaceURL
+		}
+		if friend.FriendUser.Ex != "" {
+			val["ex"] = friend.FriendUser.Ex
+		}
+	}
+	if friend.CreateTime != 0 {
+		val["create_time"] = friend.CreateTime // You might need to convert this to a proper time format.
+	}
+
+	// Include other fields from FriendInfo as needed, similar to the above pattern.
+
+	return val
+}
@@ -16,32 +16,58 @@ package convert

 import (
 	"github.com/OpenIMSDK/protocol/sdkws"
+	"time"

 	relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )

-func UsersDB2Pb(users []*relationtb.UserModel) (result []*sdkws.UserInfo) {
+func UsersDB2Pb(users []*relationtb.UserModel) []*sdkws.UserInfo {
+	result := make([]*sdkws.UserInfo, 0, len(users))
 	for _, user := range users {
-		var userPb sdkws.UserInfo
-		userPb.UserID = user.UserID
-		userPb.Nickname = user.Nickname
-		userPb.FaceURL = user.FaceURL
-		userPb.Ex = user.Ex
-		userPb.CreateTime = user.CreateTime.UnixMilli()
-		userPb.AppMangerLevel = user.AppMangerLevel
-		userPb.GlobalRecvMsgOpt = user.GlobalRecvMsgOpt
-		result = append(result, &userPb)
+		userPb := &sdkws.UserInfo{
+			UserID:           user.UserID,
+			Nickname:         user.Nickname,
+			FaceURL:          user.FaceURL,
+			Ex:               user.Ex,
+			CreateTime:       user.CreateTime.UnixMilli(),
+			AppMangerLevel:   user.AppMangerLevel,
+			GlobalRecvMsgOpt: user.GlobalRecvMsgOpt,
+		}
+		result = append(result, userPb)
 	}
 	return result
 }

 func UserPb2DB(user *sdkws.UserInfo) *relationtb.UserModel {
-	var userDB relationtb.UserModel
-	userDB.UserID = user.UserID
-	userDB.Nickname = user.Nickname
-	userDB.FaceURL = user.FaceURL
-	userDB.Ex = user.Ex
-	userDB.AppMangerLevel = user.AppMangerLevel
-	userDB.GlobalRecvMsgOpt = user.GlobalRecvMsgOpt
-	return &userDB
+	return &relationtb.UserModel{
+		UserID:           user.UserID,
+		Nickname:         user.Nickname,
+		FaceURL:          user.FaceURL,
+		Ex:               user.Ex,
+		CreateTime:       time.UnixMilli(user.CreateTime),
+		AppMangerLevel:   user.AppMangerLevel,
+		GlobalRecvMsgOpt: user.GlobalRecvMsgOpt,
+	}
+}
+
+func UserPb2DBMap(user *sdkws.UserInfo) map[string]any {
+	if user == nil {
+		return nil
+	}
+	val := make(map[string]any)
+	fields := map[string]any{
+		"nickname":            user.Nickname,
+		"face_url":            user.FaceURL,
+		"ex":                  user.Ex,
+		"app_manager_level":   user.AppMangerLevel,
+		"global_recv_msg_opt": user.GlobalRecvMsgOpt,
+	}
+	for key, value := range fields {
+		if v, ok := value.(string); ok && v != "" {
+			val[key] = v
+		} else if v, ok := value.(int32); ok && v != 0 {
+			val[key] = v
+		}
+	}
+	return val
 }
@@ -0,0 +1,87 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package convert
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/OpenIMSDK/protocol/sdkws"
+
+	relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
+)
+
+func TestUsersDB2Pb(t *testing.T) {
+	type args struct {
+		users []*relationtb.UserModel
+	}
+	tests := []struct {
+		name       string
+		args       args
+		wantResult []*sdkws.UserInfo
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if gotResult := UsersDB2Pb(tt.args.users); !reflect.DeepEqual(gotResult, tt.wantResult) {
+				t.Errorf("UsersDB2Pb() = %v, want %v", gotResult, tt.wantResult)
+			}
+		})
+	}
+}
+
+func TestUserPb2DB(t *testing.T) {
+	type args struct {
+		user *sdkws.UserInfo
+	}
+	tests := []struct {
+		name string
+		args args
+		want *relationtb.UserModel
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := UserPb2DB(tt.args.user); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("UserPb2DB() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestUserPb2DBMap(t *testing.T) {
+	user := &sdkws.UserInfo{
+		Nickname:         "TestUser",
+		FaceURL:          "http://openim.io/logo.jpg",
+		Ex:               "Extra Data",
+		AppMangerLevel:   1,
+		GlobalRecvMsgOpt: 2,
+	}
+
+	expected := map[string]any{
+		"nickname":            "TestUser",
+		"face_url":            "http://openim.io/logo.jpg",
+		"ex":                  "Extra Data",
+		"app_manager_level":   int32(1),
+		"global_recv_msg_opt": int32(2),
+	}
+
+	result := UserPb2DBMap(user)
+	if !reflect.DeepEqual(result, expected) {
+		t.Errorf("UserPb2DBMap returned unexpected map. Got %v, want %v", result, expected)
+	}
+}