From 89d69a8fb60a95030edae1900633c95932246165 Mon Sep 17 00:00:00 2001
From: wenxu12345 <44203734@qq.com>
Date: Thu, 30 Dec 2021 12:27:26 +0800
Subject: [PATCH] Refactor code

---
 internal/api/group/group.go |  2 ++
 internal/rpc/group/group.go | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/internal/api/group/group.go b/internal/api/group/group.go
index c7297e083..a7a7b86a3 100644
--- a/internal/api/group/group.go
+++ b/internal/api/group/group.go
@@ -3,6 +3,8 @@ package group
 import (
 	api "Open_IM/pkg/base_info"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 306c409d1..8599ee6c2 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -447,6 +447,28 @@ func (s *groupServer) GroupApplicationResponse(_ context.Context, req *pbGroup.G
 	}
 	chat.ApplicationProcessedNotification(req)
 	if req.HandleResult == constant.GroupResponseAgree {
+
+		if req.HandleResult == constant.GroupResponseAgree {
+			user, err := imdb.GetUserByUserID(req.FromUserID)
+			if err != nil {
+				log.NewError(req.OperationID, "GroupApplicationResponse failed ", err.Error(), req.FromUserID)
+				return &pbGroup.GroupApplicationResponseResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
+			}
+			member := imdb.GroupMember{}
+			member.GroupID = req.GroupID
+			member.UserID = req.FromUserID
+			member.RoleLevel = constant.GroupOrdinaryUsers
+			member.OperatorUserID = req.OpUserID
+			member.FaceUrl = user.FaceUrl
+			member.Nickname = user.Nickname
+
+			err = imdb.InsertIntoGroupMember(member)
+			if err != nil {
+				log.NewError(req.OperationID, "GroupApplicationResponse failed ", err.Error(), req.FromUserID)
+				return &pbGroup.GroupApplicationResponseResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
+			}
+		}
+
 		chat.MemberEnterNotification(req)
 	}