Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

# Conflicts:
#	pkg/common/db/model/group.go
This commit is contained in:
wangchuxiao
2023-01-17 16:39:12 +08:00
14 changed files with 130 additions and 137 deletions
+10 -1
View File
@@ -39,7 +39,16 @@ func (g *GroupModel) Create(ctx context.Context, groups []*mysql.Group) error {
}
func (g *GroupModel) Delete(ctx context.Context, groupIDs []string) error {
return g.cache.DelGroupsInfoFromCache(ctx, groupIDs)
err := g.db.DB.Transaction(func(tx *gorm.DB) error {
if err := g.db.Delete(ctx, groupIDs, tx); err != nil {
return err
}
if err := g.cache.DelGroupsInfoFromCache(ctx, groupIDs); err != nil {
return err
}
return nil
})
return err
}
func (g *GroupModel) Take(ctx context.Context, groupID string) (group *mysql.Group, err error) {