From 4e515c0a865b10762b2bc138729348b99e7ab1f1 Mon Sep 17 00:00:00 2001
From: AndrewZuo01 <andrew.zuo@wustl.edu>
Date: Wed, 22 Nov 2023 11:42:00 +0800
Subject: [PATCH] test

---
 config/config.yaml                | 3 ---
 deployments/templates/openim.yaml | 5 ++++-
 internal/rpc/group/callback.go    | 4 ++--
 internal/rpc/group/group.go       | 1 -
 internal/rpc/msg/callback.go      | 2 ++
 pkg/callbackstruct/constant.go    | 4 ++--
 pkg/callbackstruct/group.go       | 2 --
 pkg/callbackstruct/message.go     | 2 ++
 pkg/common/config/config.go       | 8 ++++----
 9 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/config/config.yaml b/config/config.yaml
index c67b5bc11..2813fed8e 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -368,13 +368,10 @@ callback:
     enable: false
     timeout: 5
     failedContinue: true
-
-  ##TODO CALLBACK/
   beforeInviteUserToGroup:
     enable: true
     timeout: 5
     failedContinue: true
-
   beforeSetGroupMemberInfo:
     enable: false
     timeout: 5
diff --git a/deployments/templates/openim.yaml b/deployments/templates/openim.yaml
index a3433233d..f0daaa934 100644
--- a/deployments/templates/openim.yaml
+++ b/deployments/templates/openim.yaml
@@ -392,11 +392,12 @@ callback:
     enable: false
     timeout: 5
     failedContinue: true
-  ##TODO CALLBACK
+
   joinGroupAfter:
     enable: false
     timeout: 5
     failedContinue: true
+    ##TODO CALLBACK TEST
   setGroupInfoAfter:
     enable: false
     timeout: 5
@@ -405,6 +406,8 @@ callback:
     enable: true
     timeout: 5
     failedContinue: true
+
+
 ###################### Prometheus ######################
 # Prometheus configuration for various services
 # The number of Prometheus ports per service needs to correspond to rpcPort
diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go
index 015215a84..73ce6d080 100644
--- a/internal/rpc/group/callback.go
+++ b/internal/rpc/group/callback.go
@@ -278,7 +278,7 @@ func CallbackBeforeSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq)
 	if resp.ApplyMemberFriend != nil {
 		req.GroupInfoForSet.ApplyMemberFriend = wrapperspb.Int32(*resp.ApplyMemberFriend)
 	}
-
+	utils.StructFieldNotNilReplace(req, resp)
 	return nil
 }
 func CallbackAfterSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq) error {
@@ -313,7 +313,7 @@ func CallbackAfterSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq)
 		}
 		return err
 	}
-
+	utils.StructFieldNotNilReplace(req, resp)
 	return nil
 }
 
diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index a7b36ab4d..85a98f89b 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -856,7 +856,6 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq)
 			return nil, err
 		}
 		s.Notification.MemberEnterNotification(ctx, req.GroupID, req.InviterUserID)
-		//TODO CALLBACK1
 		if err = CallbackAfterJoinGroup(ctx, req); err != nil {
 			return nil, err
 		}
diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go
index 68586ba85..ab2c082aa 100644
--- a/internal/rpc/msg/callback.go
+++ b/internal/rpc/msg/callback.go
@@ -177,3 +177,5 @@ func callbackMsgModify(ctx context.Context, msg *pbchat.SendMsgReq) error {
 	log.ZDebug(ctx, "callbackMsgModify", "msg", msg.MsgData)
 	return nil
 }
+
+//TODO CALLBACK
diff --git a/pkg/callbackstruct/constant.go b/pkg/callbackstruct/constant.go
index 80427bde3..9ce0f8656 100644
--- a/pkg/callbackstruct/constant.go
+++ b/pkg/callbackstruct/constant.go
@@ -1,8 +1,8 @@
 package callbackstruct
 
 const CallbackBeforeInviteJoinGroupCommand = "CallbackBeforeInviteJoinGroupCommand"
-
-// TODO CALLBACK
 const CallbackAfterJoinGroupCommand = "CallbackAfterJoinGroupCommand"
 const CallbackAfterSetGroupInfoCommand = "CallbackAfterSetGroupInfoCommand"
 const CallbackBeforeSetGroupInfoCommand = "CallbackBeforeSetGroupInfoCommand"
+
+// TODO CALLBACK
diff --git a/pkg/callbackstruct/group.go b/pkg/callbackstruct/group.go
index 30f8701e9..659bda56e 100644
--- a/pkg/callbackstruct/group.go
+++ b/pkg/callbackstruct/group.go
@@ -157,5 +157,3 @@ type CallbackAfterSetGroupInfoReq struct {
 type CallbackAfterSetGroupInfoResp struct {
 	CommonCallbackResp
 }
-
-// TODO CALLBACK 2
diff --git a/pkg/callbackstruct/message.go b/pkg/callbackstruct/message.go
index f404088e8..de8bae2c5 100644
--- a/pkg/callbackstruct/message.go
+++ b/pkg/callbackstruct/message.go
@@ -79,3 +79,5 @@ type CallbackMsgModifyCommandResp struct {
 	AttachedInfo     *string                `json:"attachedInfo"`
 	Ex               *string                `json:"ex"`
 }
+
+// TODO CALLBACK 2
diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go
index 0e81c150d..3a59a4213 100644
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@@ -263,11 +263,11 @@ type configStruct struct {
 		CallbackBeforeCreateGroup          CallBackConfig `yaml:"beforeCreateGroup"`
 		CallbackBeforeMemberJoinGroup      CallBackConfig `yaml:"beforeMemberJoinGroup"`
 		CallbackBeforeSetGroupMemberInfo   CallBackConfig `yaml:"beforeSetGroupMemberInfo"`
+		CallbackBeforeInviteUserToGroup    CallBackConfig `yaml:"beforeInviteUserToGroup"`
+		CallbackAfterJoinGroup             CallBackConfig `yaml:"joinGroupAfter"`
+		CallbackAfterSetGroupInfo          CallBackConfig `yaml:"setGroupInfoAfter"`
+		CallbackBeforeSetGroupInfo         CallBackConfig `yaml:"setGroupInfoBefore"`
 		//TODO CALLBACK/
-		CallbackBeforeInviteUserToGroup CallBackConfig `yaml:"beforeInviteUserToGroup"`
-		CallbackAfterJoinGroup          CallBackConfig `yaml:"joinGroupAfter"`
-		CallbackAfterSetGroupInfo       CallBackConfig `yaml:"setGroupInfoAfter"`
-		CallbackBeforeSetGroupInfo      CallBackConfig `yaml:"setGroupInfoBefore"`
 	} `yaml:"callback"`
 
 	Prometheus struct {