IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-05 01:25:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	pkg/common/db/controller/group.go
	pkg/common/db/relation/group_model_k.go
This commit is contained in:
wangchuxiao
2023-01-29 10:37:59 +08:00
parent 68d595b558 5bf8f6728e
commit 5e4e960524
3 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/db/relation/group_model_k.go
+17 -14
View File
@@ -28,14 +28,16 @@ type Group struct {
}
func NewGroupDB(db *gorm.DB) *Group {
return &Group{DB: db}
var group Group
group.DB = db
return &group
}
func (g *Group) Create(ctx context.Context, groups []*Group) (err error) {
func (g *Group) Create(ctx context.Context, groups []*Group, tx ...*gorm.DB) (err error) {
defer func() {
trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groups", groups)
}()
err = utils.Wrap(g.DB.Create(&groups).Error, "")
err = utils.Wrap(getDBConn(g.DB, tx).Create(&groups).Error, "")
return err
}
@@ -43,39 +45,40 @@ func (g *Group) Delete(ctx context.Context, groupIDs []string, tx ...*gorm.DB) (
defer func() {
trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupIDs", groupIDs)
}()
return utils.Wrap(getDBConn(g.DB, tx...).Where("group_id in (?)", groupIDs).Delete(&Group{}).Error, "")
return utils.Wrap(getDBConn(g.DB, tx).Where("group_id in (?)", groupIDs).Delete(&Group{}).Error, "")
}
func (g *Group) UpdateByMap(ctx context.Context, groupID string, args map[string]interface{}) (err error) {
func (g *Group) UpdateByMap(ctx context.Context, groupID string, args map[string]interface{}, tx ...*gorm.DB) (err error) {
defer func() {
trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "args", args)
}()
return utils.Wrap(g.DB.Where("group_id = ?", groupID).Updates(args).Error, "")
return utils.Wrap(getDBConn(g.DB, tx).Where("group_id = ?", groupID).Model(g).Updates(args).Error, "")
}
func (g *Group) Update(ctx context.Context, groups []*Group, tx ...*gorm.DB) (err error) {
defer func() {
trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groups", groups)
}()
return utils.Wrap(getDBConn(g.DB, tx...).Updates(&groups).Error, "")
return utils.Wrap(getDBConn(g.DB, tx).Updates(&groups).Error, "")
}
func (g *Group) Find(ctx context.Context, groupIDs []string) (groups []*Group, err error) {
func (g *Group) Find(ctx context.Context, groupIDs []string, tx ...*gorm.DB) (groups []*Group, err error) {
defer func() {
trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupIDs", groupIDs, "groups", groups)
}()
err = utils.Wrap(g.DB.Where("group_id in (?)", groupIDs).Find(&groups).Error, "")
err = utils.Wrap(getDBConn(g.DB, tx).Where("group_id in (?)", groupIDs).Find(&groups).Error, "")
return groups, err
}
func (g *Group) Take(ctx context.Context, groupID string) (group *Group, err error) {
func (g *Group) Take(ctx context.Context, groupID string, tx ...*gorm.DB) (group *Group, err error) {
group = &Group{}
defer func() {
trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "group", *group)
}()
err = utils.Wrap(g.DB.Where("group_id = ?", groupID).Take(group).Error, "")
err = utils.Wrap(getDBConn(g.DB, tx).Where("group_id = ?", groupID).Take(group).Error, "")
return group, err
}
func (g *Group) DeleteTx(ctx context.Context, groupIDs []string) error {
return nil
}
//func (g *Group) DeleteTx(ctx context.Context, groupIDs []string) error {
// return nil
//}
pkg/common/db/relation/init_mysql.go
+1 -1
View File
@@ -87,7 +87,7 @@ func (w Writer) Printf(format string, args ...interface{}) {
fmt.Printf(format, args...)
}
func getDBConn(db *gorm.DB, tx ...*gorm.DB) *gorm.DB {
func getDBConn(db *gorm.DB, tx []*gorm.DB) *gorm.DB {
if len(tx) > 0 {
return tx[0]
}