Refactor code

cmd/open_im_api/main.go

@@ -26,7 +26,7 @@ func main() {
 	userRouterGroup := r.Group("/user")
 	{
 		userRouterGroup.POST("/update_user_info", user.UpdateUserInfo)    //1
-		userRouterGroup.POST("/get_user_info", user.GetUsersInfo)         //1
+		userRouterGroup.POST("/get_users_info", user.GetUsersInfo)        //1
 		userRouterGroup.POST("/get_self_user_info", user.GetSelfUserInfo) //1
 	}
 	//friend routing group
@@ -34,17 +34,19 @@ func main() {
 	{
 		//	friendRouterGroup.POST("/get_friends_info", friend.GetFriendsInfo)
 		friendRouterGroup.POST("/add_friend", friend.AddFriend)                     //1
+		friendRouterGroup.POST("/delete_friend", friend.DeleteFriend)               //1
 		friendRouterGroup.POST("/get_friend_apply_list", friend.GetFriendApplyList) //1
 		friendRouterGroup.POST("/get_self_apply_list", friend.GetSelfApplyList)     //1
 		friendRouterGroup.POST("/get_friend_list", friend.GetFriendList)            //1
-		friendRouterGroup.POST("/add_blacklist", friend.AddBlacklist)               //1
-		friendRouterGroup.POST("/get_blacklist", friend.GetBlacklist)               //1
-		friendRouterGroup.POST("/remove_blacklist", friend.RemoveBlacklist)         //1
-		friendRouterGroup.POST("/delete_friend", friend.DeleteFriend)               //1
 		friendRouterGroup.POST("/add_friend_response", friend.AddFriendResponse)    //1
 		friendRouterGroup.POST("/set_friend_remark", friend.SetFriendRemark)        //1
-		friendRouterGroup.POST("/is_friend", friend.IsFriend)                       //1
-		friendRouterGroup.POST("/import_friend", friend.ImportFriend)               //1
+
+		friendRouterGroup.POST("/add_black", friend.AddBlack)          //1
+		friendRouterGroup.POST("/get_black_list", friend.GetBlacklist) //1
+		friendRouterGroup.POST("/remove_black", friend.RemoveBlack)    //1
+
+		friendRouterGroup.POST("/import_friend", friend.ImportFriend) //1
+		friendRouterGroup.POST("/is_friend", friend.IsFriend)         //1
 	}
 	//group related routing group
 	groupRouterGroup := r.Group("/group")

internal/api/friend/friend.go

@@ -16,7 +16,7 @@ import (
 	"strings"
 )
 
-func AddBlacklist(c *gin.Context) {
+func AddBlack(c *gin.Context) {
 	params := api.AddBlacklistReq{}
 	if err := c.BindJSON(&params); err != nil {
 		log.NewError("0", "BindJSON failed ", err.Error())
@@ -257,7 +257,7 @@ func SetFriendRemark(c *gin.Context) {
 	c.JSON(http.StatusOK, resp)
 }
 
-func RemoveBlacklist(c *gin.Context) {
+func RemoveBlack(c *gin.Context) {
 	params := api.RemoveBlackListReq{}
 	if err := c.BindJSON(&params); err != nil {
 		log.NewError("0", "BindJSON failed ", err.Error())

internal/rpc/group/group.go

@@ -407,8 +407,21 @@ func (s *groupServer) GetGroupApplicationList(_ context.Context, req *pbGroup.Ge
 	log.NewDebug(req.OperationID, "GetGroupApplicationList reply ", reply)
 	resp := pbGroup.GetGroupApplicationListResp{}
 	for _, v := range reply {
-		var node open_im_sdk.GroupRequest
+		node := open_im_sdk.GroupRequest{UserInfo: &open_im_sdk.PublicUserInfo{}, GroupInfo: &open_im_sdk.GroupInfo{}}
+		group, err := imdb.GetGroupInfoByGroupID(v.GroupID)
+		if err != nil {
+			log.Error(req.OperationID, "GetGroupInfoByGroupID failed ", err.Error(), v.GroupID)
+			continue
+		}
+		user, err := imdb.GetUserByUserID(v.UserID)
+		if err != nil {
+			log.Error(req.OperationID, "GetUserByUserID failed ", err.Error(), v.UserID)
+			continue
+		}
+
 		cp.GroupRequestDBCopyOpenIM(&node, &v)
+		cp.UserDBCopyOpenIMPublic(node.UserInfo, user)
+		cp.GroupDBCopyOpenIM(node.GroupInfo, group)
 		log.NewDebug(req.OperationID, "node ", node, "v ", v)
 		resp.GroupRequestList = append(resp.GroupRequestList, &node)
 	}

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

@@ -2,6 +2,7 @@ package im_mysql_model
 
 import (
 	"Open_IM/pkg/common/db"
+	"Open_IM/pkg/utils"
 	"time"
 )
 
@@ -37,7 +38,7 @@ func InsertIntoGroup(groupInfo db.Group) error {
 func GetGroupInfoByGroupID(groupId string) (*db.Group, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
-		return nil, err
+		return nil, utils.Wrap(err, "")
 	}
 	var groupInfo db.Group
 	err = dbConn.Table("groups").Where("group_id=?", groupId).Find(&groupInfo).Error

pkg/common/utils/utils.go

@@ -114,6 +114,10 @@ func BlackDBCopyOpenIM(dst *open_im_sdk.BlackInfo, src *db.Black) {
 	}
 }
 
+func UserDBCopyOpenIMPublic(dst *open_im_sdk.PublicUserInfo, src *db.User) {
+	utils.CopyStructFields(dst, src)
+}
+
 //
 //func PublicUserDBCopyOpenIM(dst *open_im_sdk.PublicUserInfo, src *db.User){
 //

pkg/proto/group/group.proto

@@ -16,7 +16,7 @@ message GroupAddMemberInfo{
 
 message CreateGroupReq{
   repeated GroupAddMemberInfo InitMemberList = 1;
-  open_im_sdk.GroupInfo GroupInfo = 2;
+  server_api_params.GroupInfo GroupInfo = 2;
   string OperationID = 3;
   string OpUserID = 4;  //app manager or group owner
   string OwnerUserID = 5; //owner
@@ -24,7 +24,7 @@ message CreateGroupReq{
 message CreateGroupResp{
   int32   ErrCode = 1;
   string  ErrMsg = 2;
-  open_im_sdk.GroupInfo GroupInfo = 3;
+  server_api_params.GroupInfo GroupInfo = 3;
 }
 
 
@@ -36,12 +36,12 @@ message GetGroupsInfoReq{
 message GetGroupsInfoResp{
   int32   ErrCode = 1;
   string  ErrMsg = 2;
-  repeated open_im_sdk.GroupInfo GroupInfoList = 3;
+  repeated server_api_params.GroupInfo GroupInfoList = 3;
 }
 
 
 message SetGroupInfoReq{
-  open_im_sdk.GroupInfo GroupInfo = 1;
+  server_api_params.GroupInfo GroupInfo = 1;
   string OpUserID = 2; //app manager or group owner
   string OperationID = 3;
 }
@@ -58,7 +58,7 @@ message GetGroupApplicationListReq {
 message GetGroupApplicationListResp {
   int32   ErrCode = 1;
   string  ErrMsg = 2;
-  repeated open_im_sdk.GroupRequest GroupRequestList = 3;
+  repeated server_api_params.GroupRequest GroupRequestList = 3;
 }
 
 
@@ -120,7 +120,7 @@ message GetGroupMemberListReq {
 message GetGroupMemberListResp {
   int32   ErrCode = 1;
   string  ErrMsg = 2;
-  repeated open_im_sdk.GroupMemberFullInfo memberList = 3;
+  repeated server_api_params.GroupMemberFullInfo memberList = 3;
   int32 nextSeq = 4;
 }
 
@@ -135,7 +135,7 @@ message GetGroupMembersInfoReq {
 message GetGroupMembersInfoResp {
   int32   ErrCode = 1;
   string  ErrMsg = 2;
-  repeated open_im_sdk.GroupMemberFullInfo memberList = 3;
+  repeated server_api_params.GroupMemberFullInfo memberList = 3;
 }
 
 message KickGroupMemberReq {
@@ -166,7 +166,7 @@ message GetJoinedGroupListReq {
 message GetJoinedGroupListResp{
   int32   ErrCode = 1;
   string  ErrMsg = 2;
-  repeated  open_im_sdk.GroupInfo GroupList = 3;
+  repeated  server_api_params.GroupInfo GroupList = 3;
 }
 
 
@@ -192,7 +192,7 @@ message GetGroupAllMemberReq {
 message GetGroupAllMemberResp {
   int32   ErrCode = 1;
   string  ErrMsg = 2;
-  repeated open_im_sdk.GroupMemberFullInfo memberList = 3;
+  repeated server_api_params.GroupMemberFullInfo memberList = 3;
 }