From 0c7f7e32fe035c3e4fb5f2c35f41dfe9ca1963b4 Mon Sep 17 00:00:00 2001
From: AndrewZuo01 <andrew.zuo@wustl.edu>
Date: Thu, 7 Dec 2023 15:27:44 +0800
Subject: [PATCH] fix bugs

---
 go.mod                                 | 2 +-
 internal/api/user.go                   | 2 ++
 internal/rpc/group/callback.go         | 8 ++++----
 pkg/common/db/mgo/generic_operation.go | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 pkg/common/db/mgo/generic_operation.go

diff --git a/go.mod b/go.mod
index 1ffe6e2df..a306b1cfc 100644
--- a/go.mod
+++ b/go.mod
@@ -174,4 +174,4 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
 
-replace github.com/OpenIMSDK/protocol v0.0.31 =>  github.com/AndrewZuo01/protocol v0.0.0-20231206072854-a6bf6e46efff
+replace github.com/OpenIMSDK/protocol v0.0.31 => github.com/AndrewZuo01/protocol v0.0.0-20231207064545-868d0e9c70a6
diff --git a/internal/api/user.go b/internal/api/user.go
index 86b7c0b0b..b2aca8e11 100644
--- a/internal/api/user.go
+++ b/internal/api/user.go
@@ -199,3 +199,5 @@ func (u *UserApi) GetUserStatus(c *gin.Context) {
 func (u *UserApi) GetSubscribeUsersStatus(c *gin.Context) {
 	a2r.Call(user.UserClient.GetSubscribeUsersStatus, u.Client, c)
 }
+
+// Get
diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go
index 1599cc7b4..d7a4c9919 100644
--- a/internal/rpc/group/callback.go
+++ b/internal/rpc/group/callback.go
@@ -326,8 +326,6 @@ func CallbackBeforeInviteUserToGroup(ctx context.Context, req *group.InviteUserT
 		// Handle the scenario where certain members are refused
 		// You might want to update the req.Members list or handle it as per your business logic
 	}
-	utils.StructFieldNotNilReplace(req, resp)
-
 	return nil
 }
 
@@ -394,7 +392,10 @@ func CallbackBeforeSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq)
 	if resp.ApplyMemberFriend != nil {
 		req.GroupInfoForSet.ApplyMemberFriend = wrapperspb.Int32(*resp.ApplyMemberFriend)
 	}
-	utils.StructFieldNotNilReplace(req, resp)
+	utils.NotNilReplace(&req.GroupInfoForSet.GroupID, &resp.GroupID)
+	utils.NotNilReplace(&req.GroupInfoForSet.GroupName, &resp.GroupName)
+	utils.NotNilReplace(&req.GroupInfoForSet.FaceURL, &resp.FaceURL)
+	utils.NotNilReplace(&req.GroupInfoForSet.Introduction, &resp.Introduction)
 	return nil
 }
 func CallbackAfterSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq) error {
@@ -425,6 +426,5 @@ func CallbackAfterSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq)
 	if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, callbackReq, resp, config.Config.Callback.CallbackAfterSetGroupInfo); err != nil {
 		return err
 	}
-	utils.StructFieldNotNilReplace(req, resp)
 	return nil
 }
diff --git a/pkg/common/db/mgo/generic_operation.go b/pkg/common/db/mgo/generic_operation.go
new file mode 100644
index 000000000..8b8fddc54
--- /dev/null
+++ b/pkg/common/db/mgo/generic_operation.go
@@ -0,0 +1 @@
+package mgo