From aab6ad96ebad7229085f4c6ee5372e0b8a2a0bde Mon Sep 17 00:00:00 2001
From: wenxu12345 <44203734@qq.com>
Date: Fri, 31 Dec 2021 09:04:04 +0800
Subject: [PATCH] Refactor code

---
 internal/api/group/group.go       | 30 ++++++++++++------------------
 pkg/base_info/group_api_struct.go | 19 ++++++++++++-------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/internal/api/group/group.go b/internal/api/group/group.go
index d72d1c08f..2fa527e67 100644
--- a/internal/api/group/group.go
+++ b/internal/api/group/group.go
@@ -91,10 +91,8 @@ func GetGroupMembersInfo(c *gin.Context) {
 		return
 	}
 
-	memberListResp := api.GetGroupMembersInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, Data: RpcResp.MemberList}
-	if len(RpcResp.MemberList) == 0 {
-		memberListResp.Data = []*open_im_sdk.GroupMemberFullInfo{}
-	}
+	memberListResp := api.GetGroupMembersInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, MemberList: RpcResp.MemberList}
+	memberListResp.Data = jsonData.JsonDataList(RpcResp.MemberList)
 	log.NewInfo(req.OperationID, "GetGroupMembersInfo api return ", memberListResp)
 	c.JSON(http.StatusOK, memberListResp)
 }
@@ -128,9 +126,7 @@ func GetGroupMemberList(c *gin.Context) {
 	}
 
 	memberListResp := api.GetGroupMemberListResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, MemberList: RpcResp.MemberList, NextSeq: RpcResp.NextSeq}
-	if len(memberListResp.MemberList) == 0 {
-		memberListResp.MemberList = []*open_im_sdk.GroupMemberFullInfo{}
-	}
+	memberListResp.Data = jsonData.JsonDataList(memberListResp.MemberList)
 
 	log.NewInfo(req.OperationID, "GetGroupMemberList api return ", memberListResp)
 	c.JSON(http.StatusOK, memberListResp)
@@ -164,12 +160,7 @@ func GetGroupAllMemberList(c *gin.Context) {
 	}
 
 	memberListResp := api.GetGroupAllMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, MemberList: RpcResp.MemberList}
-	if len(memberListResp.MemberList) == 0 {
-		memberListResp.MemberList = []*open_im_sdk.GroupMemberFullInfo{}
-	}
-
-	memberListResp.Test = jsonData.JsonDataList(memberListResp.MemberList)
-
+	memberListResp.Data = jsonData.JsonDataList(memberListResp.MemberList)
 	log.NewInfo(req.OperationID, "GetGroupAllMember api return ", memberListResp)
 	c.JSON(http.StatusOK, memberListResp)
 }
@@ -202,11 +193,9 @@ func GetJoinedGroupList(c *gin.Context) {
 	}
 
 	GroupListResp := api.GetJoinedGroupListResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, GroupInfoList: RpcResp.GroupList}
-	if len(RpcResp.GroupList) == 0 {
-		GroupListResp.GroupInfoList = []*open_im_sdk.GroupInfo{}
-	}
-	c.JSON(http.StatusOK, GroupListResp)
+	GroupListResp.Data = jsonData.JsonDataList(GroupListResp.GroupInfoList)
 	log.NewInfo(req.OperationID, "GetJoinedGroupList api return ", GroupListResp)
+	c.JSON(http.StatusOK, GroupListResp)
 }
 
 func InviteUserToGroup(c *gin.Context) {
@@ -240,8 +229,13 @@ func InviteUserToGroup(c *gin.Context) {
 	for _, v := range RpcResp.Id2ResultList {
 		resp.UserIDResultList = append(resp.UserIDResultList, api.UserIDResult{UserID: v.UserID, Result: v.Result})
 	}
-	c.JSON(http.StatusOK, resp)
+
+	if len(resp.UserIDResultList) == 0 {
+		resp.UserIDResultList = []api.UserIDResult{}
+	}
+
 	log.NewInfo(req.OperationID, "InviteUserToGroup api return ", resp)
+	c.JSON(http.StatusOK, resp)
 }
 
 func CreateGroup(c *gin.Context) {
diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go
index d3c6d09b6..4817d2669 100644
--- a/pkg/base_info/group_api_struct.go
+++ b/pkg/base_info/group_api_struct.go
@@ -28,7 +28,8 @@ type GetGroupMembersInfoReq struct {
 }
 type GetGroupMembersInfoResp struct {
 	CommResp
-	Data []*open_im_sdk.GroupMemberFullInfo `json:"data"`
+	MemberList []*open_im_sdk.GroupMemberFullInfo
+	Data       []map[string]interface{} `json:"data"`
 }
 
 type InviteUserToGroupReq struct {
@@ -48,7 +49,8 @@ type GetJoinedGroupListReq struct {
 }
 type GetJoinedGroupListResp struct {
 	CommResp
-	GroupInfoList []*open_im_sdk.GroupInfo `json:"data"`
+	GroupInfoList []*open_im_sdk.GroupInfo
+	Data          []map[string]interface{} `json:"data"`
 }
 
 type GetGroupMemberListReq struct {
@@ -59,8 +61,9 @@ type GetGroupMemberListReq struct {
 }
 type GetGroupMemberListResp struct {
 	CommResp
-	NextSeq    int32                              `json:"nextSeq"`
-	MemberList []*open_im_sdk.GroupMemberFullInfo `json:"data"`
+	NextSeq    int32 `json:"nextSeq"`
+	MemberList []*open_im_sdk.GroupMemberFullInfo
+	Data       []map[string]interface{} `json:"data"`
 }
 
 type GetGroupAllMemberReq struct {
@@ -71,7 +74,7 @@ type GetGroupAllMemberResp struct {
 	CommResp
 	MemberList []*open_im_sdk.GroupMemberFullInfo
 
-	Test []map[string]interface{} `json:"data"`
+	Data []map[string]interface{} `json:"data"`
 }
 
 type CreateGroupReq struct {
@@ -93,7 +96,8 @@ type GetGroupApplicationListReq struct {
 }
 type GetGroupApplicationListResp struct {
 	CommResp
-	GroupRequestList []*open_im_sdk.GroupRequest `json:"data"`
+	GroupRequestList []*open_im_sdk.GroupRequest
+	Data             []map[string]interface{} `json:"data"`
 }
 
 type GetGroupInfoReq struct {
@@ -102,7 +106,8 @@ type GetGroupInfoReq struct {
 }
 type GetGroupInfoResp struct {
 	CommResp
-	GroupInfoList []*open_im_sdk.GroupInfo `json:"data"`
+	GroupInfoList []*open_im_sdk.GroupInfo
+	Data          []map[string]interface{} `json:"data"`
 }
 
 type ApplicationGroupResponseReq struct {