From 03539186cb73e3c853417568ca70bff59fa83795 Mon Sep 17 00:00:00 2001
From: yedf2 <120050102@qq.com>
Date: Fri, 25 Feb 2022 16:01:10 +0800
Subject: [PATCH] jrpc seems ok

---
 dtmsvr/api_json_rpc.go | 11 +++++----
 test/msg_jrpc_test.go  | 55 ++++++++++++++++++++++++++++++++++++++++++
 test/tcc_jrpc_test.go  | 28 +++++++++++++++++++++
 3 files changed, 89 insertions(+), 5 deletions(-)
 create mode 100644 test/tcc_jrpc_test.go

diff --git a/dtmsvr/api_json_rpc.go b/dtmsvr/api_json_rpc.go
index d9f3936..e0ae3ea 100644
--- a/dtmsvr/api_json_rpc.go
+++ b/dtmsvr/api_json_rpc.go
@@ -71,11 +71,12 @@ func addJrpcRouter(engine *gin.Engine) {
 					"code":    jrpcCodeFailure,
 					"message": err.Error(),
 				}
-			} else if errors.Is(err, dtmcli.ErrOngoing) {
-				jerr = map[string]interface{}{
-					"code":    jrpcCodeOngoing,
-					"message": err.Error(),
-				}
+				//// following is commented for server
+				// } else if errors.Is(err, dtmcli.ErrOngoing) {
+				// 	jerr = map[string]interface{}{
+				// 		"code":    jrpcCodeOngoing,
+				// 		"message": err.Error(),
+				// 	}
 			} else if jerr == nil {
 				jerr = map[string]interface{}{
 					"code":    -32603,
diff --git a/test/msg_jrpc_test.go b/test/msg_jrpc_test.go
index f94c2c8..88438fc 100644
--- a/test/msg_jrpc_test.go
+++ b/test/msg_jrpc_test.go
@@ -7,6 +7,8 @@
 package test
 
 import (
+	"database/sql"
+	"errors"
 	"testing"
 
 	"github.com/dtm-labs/dtm/dtmcli"
@@ -25,6 +27,37 @@ func TestMsgJrpcNormal(t *testing.T) {
 	assert.Equal(t, StatusSucceed, getTransStatus(msg.Gid))
 }
 
+func TestMsgJrpcDoAndSubmit(t *testing.T) {
+	before := getBeforeBalances("mysql")
+	gid := dtmimp.GetFuncName()
+	req := busi.GenTransReq(30, false, false)
+	msg := dtmcli.NewMsg(dtmutil.DefaultJrpcServer, gid).
+		Add(busi.Busi+"/SagaBTransIn", req)
+	msg.Protocol = "json-rpc"
+	err := msg.DoAndSubmitDB(Busi+"/QueryPreparedB", dbGet().ToSQLDB(), func(tx *sql.Tx) error {
+		return busi.SagaAdjustBalance(tx, busi.TransOutUID, -req.Amount, "SUCCESS")
+	})
+	assert.Nil(t, err)
+	waitTransProcessed(msg.Gid)
+	assert.Equal(t, []string{StatusSucceed}, getBranchesStatus(msg.Gid))
+	assert.Equal(t, StatusSucceed, getTransStatus(msg.Gid))
+	assertNotSameBalance(t, before, "mysql")
+}
+
+func TestMsgJrpcDoAndSubmitBusiFailed(t *testing.T) {
+	before := getBeforeBalances("mysql")
+	gid := dtmimp.GetFuncName()
+	req := busi.GenTransReq(30, false, false)
+	msg := dtmcli.NewMsg(dtmutil.DefaultJrpcServer, gid).
+		Add(busi.Busi+"/SagaBTransIn", req)
+	msg.Protocol = "json-rpc"
+	err := msg.DoAndSubmitDB(Busi+"/QueryPreparedB", dbGet().ToSQLDB(), func(tx *sql.Tx) error {
+		return errors.New("an error")
+	})
+	assert.Error(t, err)
+	assertSameBalance(t, before, "mysql")
+}
+
 func TestMsgJrpcRepeated(t *testing.T) {
 	msg := genJrpcMsg(dtmimp.GetFuncName())
 	msg.Submit()
@@ -35,12 +68,16 @@ func TestMsgJrpcRepeated(t *testing.T) {
 	err := msg.Submit()
 	assert.Error(t, err)
 }
+
 func TestMsgJprcAbnormal(t *testing.T) {
 	id := "no-use"
 	resp, err := dtmcli.GetRestyClient().R().SetBody("hello").Post(dtmutil.DefaultJrpcServer)
 	assert.Nil(t, err)
 	assert.Contains(t, resp.String(), "-32700")
 
+	resp, err = dtmcli.GetRestyClient().R().SetBody("hello").Post("http://localhost:1001")
+	assert.Error(t, err)
+
 	resp, err = dtmcli.GetRestyClient().R().SetBody(map[string]string{
 		"jsonrpc": "1.0",
 		"method":  "newGid",
@@ -58,6 +95,24 @@ func TestMsgJprcAbnormal(t *testing.T) {
 	}).Post(dtmutil.DefaultJrpcServer)
 	assert.Nil(t, err)
 	assert.Contains(t, resp.String(), "-32601")
+
+	resp, err = dtmcli.GetRestyClient().R().SetBody(map[string]interface{}{
+		"jsonrpc": "2.0",
+		"method":  "registerBranch",
+		"params": map[string]string{
+			"trans_type": "not-exists",
+		},
+		"id": id,
+	}).Post(dtmutil.DefaultJrpcServer)
+	assert.Nil(t, err)
+	assert.Contains(t, resp.String(), "-32603")
+}
+
+func TestMsgJprcAbnormal2(t *testing.T) {
+	tb := dtmimp.NewTransBase(dtmimp.GetFuncName(), "msg", dtmutil.DefaultJrpcServer, "01")
+	tb.Protocol = "json-rpc"
+	err := dtmimp.TransCallDtm(tb, "", "newGid")
+	assert.Nil(t, err)
 }
 
 func genJrpcMsg(gid string) *dtmcli.Msg {
diff --git a/test/tcc_jrpc_test.go b/test/tcc_jrpc_test.go
new file mode 100644
index 0000000..d219b28
--- /dev/null
+++ b/test/tcc_jrpc_test.go
@@ -0,0 +1,28 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/dtm-labs/dtm/dtmcli"
+	"github.com/dtm-labs/dtm/dtmcli/dtmimp"
+	"github.com/dtm-labs/dtm/dtmutil"
+	"github.com/dtm-labs/dtm/test/busi"
+	"github.com/go-resty/resty/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTccJrpcNormal(t *testing.T) {
+	req := busi.GenTransReq(30, false, false)
+	gid := dtmimp.GetFuncName()
+	err := dtmcli.TccGlobalTransaction2(dtmutil.DefaultJrpcServer, gid, func(tcc *dtmcli.Tcc) {
+		tcc.Protocol = "json-rpc"
+	}, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
+		_, err := tcc.CallBranch(req, Busi+"/TransOut", Busi+"/TransOutConfirm", Busi+"/TransOutRevert")
+		assert.Nil(t, err)
+		return tcc.CallBranch(req, Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransInRevert")
+	})
+	assert.Nil(t, err)
+	waitTransProcessed(gid)
+	assert.Equal(t, StatusSucceed, getTransStatus(gid))
+	assert.Equal(t, []string{StatusPrepared, StatusSucceed, StatusPrepared, StatusSucceed}, getBranchesStatus(gid))
+}