Refactor code

internal/rpc/group/group.go

@@ -489,7 +489,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
 	groupRequest.ReqMsg = req.ReqMessage
 	groupRequest.GroupID = req.GroupID
 
-	err = imdb.UpdateGroupRequest(groupRequest)
+	err = imdb.InsertIntoGroupRequest(groupRequest)
 	if err != nil {
 		log.NewError(req.OperationID, "UpdateGroupRequest ", err.Error(), groupRequest)
 		return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil

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

@@ -27,13 +27,7 @@ func UpdateGroupRequest(groupRequest GroupRequest) error {
 	if groupRequest.HandledTime.Unix() < 0 {
 		groupRequest.HandledTime = utils.UnixSecondToTime(0)
 	}
-	t := dbConn.Table("group_request").Where("group_id=? and user_id=?", groupRequest.GroupID, groupRequest.UserID).Update(&groupRequest)
+	return dbConn.Table("group_request").Where("group_id=? and user_id=?", groupRequest.GroupID, groupRequest.UserID).Update(&groupRequest).Error
-	//RowsAffected
-	if t.RowsAffected == 0 {
-		return InsertIntoGroupRequest(groupRequest)
-	} else {
-		return t.Error
-	}
 }
 
 func InsertIntoGroupRequest(toInsertInfo GroupRequest) error {