Browse Source

fix transFromDb test error

pull/44/head
yedf2 4 years ago
parent
commit
7baf6f1b4b
  1. 8
      dtmsvr/api_http.go
  2. 5
      dtmsvr/utils_test.go

8
dtmsvr/api_http.go

@ -7,7 +7,6 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/yedf/dtm/common" "github.com/yedf/dtm/common"
"github.com/yedf/dtm/dtmcli" "github.com/yedf/dtm/dtmcli"
"gorm.io/gorm"
) )
func addRoute(engine *gin.Engine) { func addRoute(engine *gin.Engine) {
@ -62,13 +61,8 @@ func query(c *gin.Context) (interface{}, error) {
if gid == "" { if gid == "" {
return nil, errors.New("no gid specified") return nil, errors.New("no gid specified")
} }
trans := TransGlobal{}
db := dbGet() db := dbGet()
db.Begin() trans := transFromDb(db, gid)
dbr := db.Must().Where("gid", gid).First(&trans)
if dbr.Error == gorm.ErrRecordNotFound {
return M{"transaction": nil, "branches": [0]int{}}, nil
}
branches := []TransBranch{} branches := []TransBranch{}
db.Must().Where("gid", gid).Find(&branches) db.Must().Where("gid", gid).Find(&branches)
return M{"transaction": trans, "branches": branches}, nil return M{"transaction": trans, "branches": branches}, nil

5
dtmsvr/utils_test.go

@ -43,8 +43,3 @@ func TestSetNextCron(t *testing.T) {
tg.setNextCron(cronBackoff) tg.setNextCron(cronBackoff)
assert.Equal(t, config.RetryInterval*2, tg.NextCronInterval) assert.Equal(t, config.RetryInterval*2, tg.NextCronInterval)
} }
func TestTransFromDB(t *testing.T) {
db := dbGet()
trans := transFromDb(db, "-1")
assert.Nil(t, trans)
}

Loading…
Cancel
Save