diff --git a/dtmsvr/api_http.go b/dtmsvr/api_http.go index 7d2b5af..07aec3a 100644 --- a/dtmsvr/api_http.go +++ b/dtmsvr/api_http.go @@ -7,7 +7,6 @@ import ( "github.com/gin-gonic/gin" "github.com/yedf/dtm/common" "github.com/yedf/dtm/dtmcli" - "gorm.io/gorm" ) func addRoute(engine *gin.Engine) { @@ -62,13 +61,8 @@ func query(c *gin.Context) (interface{}, error) { if gid == "" { return nil, errors.New("no gid specified") } - trans := TransGlobal{} db := dbGet() - db.Begin() - dbr := db.Must().Where("gid", gid).First(&trans) - if dbr.Error == gorm.ErrRecordNotFound { - return M{"transaction": nil, "branches": [0]int{}}, nil - } + trans := transFromDb(db, gid) branches := []TransBranch{} db.Must().Where("gid", gid).Find(&branches) return M{"transaction": trans, "branches": branches}, nil diff --git a/dtmsvr/utils_test.go b/dtmsvr/utils_test.go index 7bf44bd..ede2ec6 100644 --- a/dtmsvr/utils_test.go +++ b/dtmsvr/utils_test.go @@ -43,8 +43,3 @@ func TestSetNextCron(t *testing.T) { tg.setNextCron(cronBackoff) assert.Equal(t, config.RetryInterval*2, tg.NextCronInterval) } -func TestTransFromDB(t *testing.T) { - db := dbGet() - trans := transFromDb(db, "-1") - assert.Nil(t, trans) -}