Skip to content

Commit 29a6bbc

Browse files
RanchoCooperRanchoCooper
authored
Merge pull request #9 from RanchoCooper/feat/repo-transaction
improve transaction implement
2 parents b7d8614 + 92d0a05 commit 29a6bbc

File tree

8 files changed

+140
-186
lines changed

8 files changed

+140
-186
lines changed

‎internal/adapter/repository/mysql.go

+29-33
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package repository
33
import (
44
"context"
55
"fmt"
6-
buitin_log "log"
6+
builtinLog "log"
77
"os"
88
"time"
99

@@ -23,30 +23,18 @@ import (
2323
* @date 2021/12/21
2424
*/
2525

26-
func buildGormConfig() *gorm.Config {
27-
logger := gormLogger.New(
28-
buitin_log.New(os.Stdout, "\r\n", buitin_log.LstdFlags), // io writer
29-
gormLogger.Config{
30-
SlowThreshold: time.Second, // Slow SQL threshold
31-
LogLevel: gormLogger.Info, // Log level
32-
IgnoreRecordNotFoundError: false, // Ignore ErrRecordNotFound error for logger
33-
Colorful: true, // Disable color
34-
},
35-
)
36-
// logger := zapgorm2.New(log.Logger)
37-
// logger.SetAsDefault()
38-
// logger.LogMode(gormLogger.Info)
39-
40-
return &gorm.Config{
41-
NamingStrategy: schema.NamingStrategy{SingularTable: true},
42-
Logger: logger,
43-
}
44-
}
45-
4626
type MySQL struct {
4727
db *gorm.DB
4828
}
4929

30+
func NewMySQLClient() *MySQL {
31+
db, err := openGormDB()
32+
if err != nil {
33+
panic(err)
34+
}
35+
return &MySQL{db: db}
36+
}
37+
5038
func (c *MySQL) GetDB(ctx context.Context) *gorm.DB {
5139
return c.db.WithContext(ctx)
5240
}
@@ -60,24 +48,24 @@ func (c *MySQL) Close(ctx context.Context) {
6048
if sqlDB != nil {
6149
err := sqlDB.Close()
6250
if err != nil {
63-
log.SugaredLogger.Errorf("close mysql client fail. err: %v", err)
51+
log.SugaredLogger.Errorf("close MySQL fail. err: %v", err)
6452
}
6553
}
66-
log.Logger.Info("mysql client closed")
54+
log.Logger.Info("MySQL closed")
6755
}
6856

6957
func (c *MySQL) MockClient() (*gorm.DB, sqlmock.Sqlmock) {
7058
sqlDB, mock, err := sqlmock.New()
7159
if err != nil {
7260
panic("mock MySQL fail, err: " + err.Error())
7361
}
74-
dialector := driver.New(driver.Config{
62+
dialect := driver.New(driver.Config{
7563
Conn: sqlDB,
7664
DriverName: "mysql-mock",
7765
SkipInitializeWithVersion: true,
7866
})
7967

80-
c.db, err = gorm.Open(dialector, buildGormConfig())
68+
c.db, err = gorm.Open(dialect, buildGormConfig())
8169

8270
return c.db, mock
8371
}
@@ -93,7 +81,7 @@ func openGormDB() (*gorm.DB, error) {
9381
config.Config.MySQL.ParseTime,
9482
config.Config.MySQL.TimeZone,
9583
)
96-
dialector = driver.New(driver.Config{
84+
dialect = driver.New(driver.Config{
9785
DSN: dsn,
9886
DriverName: "mysql",
9987
DefaultStringSize: 255,
@@ -111,8 +99,7 @@ func openGormDB() (*gorm.DB, error) {
11199
})
112100
)
113101

114-
db, err := gorm.Open(dialector, buildGormConfig())
115-
102+
db, err := gorm.Open(dialect, buildGormConfig())
116103
if err != nil {
117104
return nil, err
118105
}
@@ -129,10 +116,19 @@ func openGormDB() (*gorm.DB, error) {
129116
return db, nil
130117
}
131118

132-
func NewMySQLClient() *MySQL {
133-
db, err := openGormDB()
134-
if err != nil {
135-
panic(err)
119+
func buildGormConfig() *gorm.Config {
120+
logger := gormLogger.New(
121+
builtinLog.New(os.Stdout, "\r\n", builtinLog.LstdFlags),
122+
gormLogger.Config{
123+
SlowThreshold: time.Second, // Slow SQL threshold
124+
LogLevel: gormLogger.Info, // Log level
125+
IgnoreRecordNotFoundError: false, // Ignore ErrRecordNotFound error for logger
126+
Colorful: true, // Disable color
127+
},
128+
)
129+
130+
return &gorm.Config{
131+
NamingStrategy: schema.NamingStrategy{SingularTable: true},
132+
Logger: logger,
136133
}
137-
return &MySQL{db: db}
138134
}

‎internal/adapter/repository/mysql/entity/example.go

+14-46
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"gorm.io/gorm"
1111

1212
"go-hexagonal/internal/adapter/repository"
13-
"go-hexagonal/internal/adapter/repository/mysql"
1413
"go-hexagonal/internal/domain/model"
1514
"go-hexagonal/internal/domain/repo"
1615
)
@@ -25,14 +24,13 @@ func NewExample() *Example {
2524
}
2625

2726
type Example struct {
28-
mysql.TransactionImpl `structs:"-"` // inheritance mysql transaction implement
29-
Id int `json:"id" gorm:"primarykey" structs:",omitempty,underline"`
30-
Name string `json:"name" structs:",omitempty,underline"`
31-
Alias string `json:"alias" structs:",omitempty,underline"`
32-
CreatedAt time.Time `json:"created_at" structs:",omitempty,underline"`
33-
UpdatedAt time.Time `json:"updated_at" structs:",omitempty,underline"`
34-
DeletedAt gorm.DeletedAt `json:"deleted_at" structs:",omitempty,underline"`
35-
ChangeMap map[string]interface{} `json:"-" gorm:"-" structs:"-"`
27+
Id int `json:"id" gorm:"primarykey" structs:",omitempty,underline"`
28+
Name string `json:"name" structs:",omitempty,underline"`
29+
Alias string `json:"alias" structs:",omitempty,underline"`
30+
CreatedAt time.Time `json:"created_at" structs:",omitempty,underline"`
31+
UpdatedAt time.Time `json:"updated_at" structs:",omitempty,underline"`
32+
DeletedAt gorm.DeletedAt `json:"deleted_at" structs:",omitempty,underline"`
33+
ChangeMap map[string]interface{} `json:"-" gorm:"-" structs:"-"`
3634
}
3735

3836
func (e Example) TableName() string {
@@ -52,13 +50,7 @@ func (e *Example) Create(ctx context.Context, tr *repository.Transaction, model
5250
return nil, errors.Wrap(err, "copier fail")
5351
}
5452

55-
// conn db
56-
db, err := e.ConnDB(ctx, tr)
57-
if err != nil {
58-
return nil, err
59-
}
60-
61-
// handle sql
53+
db := tr.Conn(ctx)
6254
err = db.Create(entity).Error
6355
if err != nil {
6456
return nil, err
@@ -75,13 +67,7 @@ func (e *Example) Create(ctx context.Context, tr *repository.Transaction, model
7567
func (e *Example) Delete(ctx context.Context, tr *repository.Transaction, id int) (err error) {
7668
entity := &Example{}
7769

78-
// conn db
79-
db, err := e.ConnDB(ctx, tr)
80-
if err != nil {
81-
return err
82-
}
83-
84-
// handle sql
70+
db := tr.Conn(ctx)
8571
err = db.Delete(entity, id).Error
8672
// hard delete
8773
// err := tx.Unscoped().Delete(entity, Id).Error
@@ -97,29 +83,17 @@ func (e *Example) Update(ctx context.Context, tr *repository.Transaction, model
9783
entity.ChangeMap = structs.Map(entity)
9884
entity.ChangeMap["updated_at"] = time.Now()
9985

100-
// conn db
101-
db, err := e.ConnDB(ctx, tr)
102-
if err != nil {
103-
return err
104-
}
105-
106-
// handle sql
107-
db.Table(entity.TableName()).Where("id = ? AND deleted_at IS NULL", entity.Id).Updates(entity.ChangeMap)
86+
db := tr.Conn(ctx)
87+
db = db.Table(entity.TableName()).Where("id = ? AND deleted_at IS NULL", entity.Id).Updates(entity.ChangeMap)
10888

10989
return db.Error
11090
}
11191

11292
func (e *Example) GetByID(ctx context.Context, tr *repository.Transaction, id int) (domain *model.Example, err error) {
11393
entity := &Example{}
11494

115-
// conn db
116-
db, err := e.ConnDB(ctx, tr)
117-
if err != nil {
118-
return nil, err
119-
}
120-
121-
// handle sql
122-
db.Table(entity.TableName()).Find(entity, id)
95+
db := tr.Conn(ctx)
96+
db = db.Table(entity.TableName()).Find(entity, id)
12397

12498
if db.Error != nil {
12599
return nil, err
@@ -136,13 +110,7 @@ func (e *Example) GetByID(ctx context.Context, tr *repository.Transaction, id in
136110
func (e *Example) FindByName(ctx context.Context, tr *repository.Transaction, name string) (model *model.Example, err error) {
137111
entity := &Example{}
138112

139-
// conn db
140-
db, err := e.ConnDB(ctx, tr)
141-
if err != nil {
142-
return nil, err
143-
}
144-
145-
// handle sql
113+
db := tr.Conn(ctx)
146114
db.Table(entity.TableName()).Where("name = ?", name).Last(entity)
147115
if db.Error != nil {
148116
return nil, err

‎internal/adapter/repository/mysql/entity/example_test.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010

1111
"go-hexagonal/api/dto"
1212
"go-hexagonal/internal/adapter/repository"
13-
"go-hexagonal/internal/adapter/repository/mysql"
1413
"go-hexagonal/internal/domain/model"
1514
)
1615

@@ -48,10 +47,13 @@ func TestExample_Create(t *testing.T) {
4847
Name: "rancho",
4948
Alias: "cooper",
5049
}
51-
tr := mysql.NewTransaction(ctx, &sql.TxOptions{
52-
Isolation: sql.LevelReadUncommitted,
53-
ReadOnly: false,
54-
})
50+
tr := repository.NewTransaction(ctx,
51+
repository.MySQLStore,
52+
&sql.TxOptions{
53+
Isolation: sql.LevelReadUncommitted,
54+
ReadOnly: false,
55+
},
56+
)
5557
example, err := exampleRepo.Create(ctx, tr, e)
5658
assert.NoError(t, err)
5759
assert.NotEmpty(t, example.Id)

‎internal/adapter/repository/mysql/entity/main_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestMain(m *testing.M) {
2222
config.Init()
2323
log.Init()
2424

25-
repository.Clients.MySQL = repository.NewMySQLClient()
25+
repository.Init(repository.WithMySQL())
2626
_ = repository.Clients.MySQL.GetDB(ctx).AutoMigrate(&Example{})
2727
m.Run()
2828
}

‎internal/adapter/repository/mysql/transaction.go

-78
This file was deleted.

‎internal/adapter/repository/redis.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ type Redis struct {
2424
db *redis.Client
2525
}
2626

27+
func NewRedisClient() *Redis {
28+
return &Redis{db: newRedisConn()}
29+
}
30+
2731
func (r *Redis) GetClient() *redis.Client {
2832
return r.db
2933
}
@@ -36,8 +40,7 @@ func (r *Redis) Close(ctx context.Context) {
3640
log.Logger.Info("redis client closed")
3741
}
3842

39-
func (r *Redis) MockClient() redismock.ClusterClientMock {
40-
// FIXME unverified
43+
func (r *Redis) MockClient() redismock.ClientMock {
4144
db, mock := redismock.NewClientMock()
4245
r.db = db
4346
return mock
@@ -54,7 +57,3 @@ func newRedisConn() *redis.Client {
5457
IdleTimeout: time.Duration(config.Config.Redis.IdleTimeout) * time.Second,
5558
})
5659
}
57-
58-
func NewRedisClient() *Redis {
59-
return &Redis{db: newRedisConn()}
60-
}

0 commit comments

Comments
 (0)