From 717a409aaa1111d711aabd84e0ff59c85d231ae5 Mon Sep 17 00:00:00 2001
From: Monet Lee <monet_lee@163.com>
Date: Thu, 19 Sep 2024 14:45:25 +0800
Subject: [PATCH] add groupName Condition

---
 internal/rpc/group/db_map.go | 9 +++++----
 internal/rpc/group/group.go  | 6 +++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/internal/rpc/group/db_map.go b/internal/rpc/group/db_map.go
index cc7c7fa71..2f6791d5e 100644
--- a/internal/rpc/group/db_map.go
+++ b/internal/rpc/group/db_map.go
@@ -20,6 +20,7 @@ import (
 
 	pbgroup "github.com/openimsdk/protocol/group"
 	"github.com/openimsdk/protocol/sdkws"
+	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/mcontext"
 )
 
@@ -54,11 +55,11 @@ func UpdateGroupInfoMap(ctx context.Context, group *sdkws.GroupInfoForSet) map[s
 	return m
 }
 
-func UpdateGroupInfoExMap(ctx context.Context, group *pbgroup.SetGroupInfoExReq) map[string]any {
+func UpdateGroupInfoExMap(ctx context.Context, group *pbgroup.SetGroupInfoExReq) (map[string]any, error) {
 	m := make(map[string]any)
 
-	if group.GroupName != nil {
-		m["group_name"] = group.GroupName
+	if group.GroupName != nil && group.GroupName.Value != "" {
+		return nil, errs.ErrArgs.WrapMsg("group name is empty")
 	}
 	if group.Notification != nil {
 		m["notification"] = group.Notification.Value
@@ -84,7 +85,7 @@ func UpdateGroupInfoExMap(ctx context.Context, group *pbgroup.SetGroupInfoExReq)
 		m["ex"] = group.Ex.Value
 	}
 
-	return m
+	return m, nil
 }
 
 func UpdateGroupStatusMap(status int) map[string]any {
diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index dc5fcc80f..bb0783460 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -1104,11 +1104,15 @@ func (g *groupServer) SetGroupInfoEx(ctx context.Context, req *pbgroup.SetGroupI
 		return nil, err
 	}
 
-	updatedData := UpdateGroupInfoExMap(ctx, req)
+	updatedData, err := UpdateGroupInfoExMap(ctx, req)
 	if len(updatedData) == 0 {
 		return &pbgroup.SetGroupInfoExResp{}, nil
 	}
 
+	if err != nil {
+		return nil, err
+	}
+
 	if err := g.db.UpdateGroup(ctx, group.GroupID, updatedData); err != nil {
 		return nil, err
 	}