dtmcli 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca04845a2b93dbc30e9bb867b5f53cd8e138ea21a1cd78cc0357b343a647ff52
-  data.tar.gz: dafae1ed914de83ed5b20c2228e130ed87a4310c5d40e5f9cc9ef03c64fc59f9
+  metadata.gz: bc819432a1d2b76dcf9081bad4b185394857bafdb9a658b54e5d3798de909636
+  data.tar.gz: 0e2fb36a0b38c4ecbaf9a96b40ee3b7ace2716b41ba8e54f4a5c171fd36bf7b6
 SHA512:
-  metadata.gz: d984c3dbf11d79094a34e5995c81435ac6f378405dea8d28e8d19d842d6c0eee18326b26e3e107da7c7f25565e18be25d8646d45f9d92d55da86fcd8ac31d5d9
-  data.tar.gz: f970309417c4c5f555b63bccfb23854fff1f7f5dffb83c10d7b53e0abca0122648a0fe76464fa335b2ff95539f021283011390a1cc8f22820e1bd984492f7afc
+  metadata.gz: d674552f78936d9f1e04f3c86ca407f70577d789222544c579b08e8bba6efbd6cebff9bc3eedf5aa1a80387284c5d1911490d9d4f770a6c3eb8f110e52b3974e
+  data.tar.gz: 12732c4356bdc4b2e7ba801f438f87a295fb74a525d792914c09febb19f03a0fe39a15985e4ad329116038e4be92cfc6577b248e51fc6b80b3e737b80c092415

data/README.md

@@ -15,7 +15,7 @@ gem install dtmcli
 dtm_url = '127.0.0.1:8080/api/dtm'
 biz_url = '127.0.0.1:3000/api/biz'
 
-# TCC version
+# Model TCC
 res = Dtmcli::Tcc.tcc_global_transaction(dtm_url) do |tcc|
   body = {amount: 30}
   print "calling trans out\n"
@@ -23,4 +23,18 @@ res = Dtmcli::Tcc.tcc_global_transaction(dtm_url) do |tcc|
   print "calling trans in\n"
   tcc.call_branch(body, biz_url + '/TransInTry', biz_url + '/TransInConfirm', biz_url + '/TransInCancel')
 end
+
+# Model Saga
+saga = Dtmcli::Saga.new(dtm_url)
+saga.gen_gid
+
+post_data = {
+  amount:         30,
+  transInResult:  "SUCCESS",
+  transOutResult: "SUCCESS",
+}
+saga.add(biz_url + '/TransOut', biz_url + '/TransOutRevert', post_data)
+saga.add(biz_url + '/TransIn', biz_url + '/TransInRevert', post_data)
+
+saga.submit
 ```

data/lib/dtmcli.rb

@@ -1,7 +1,10 @@
 require 'faraday'
 
+require_relative 'dtmcli/dtm'
+require_relative 'dtmcli/errors'
 require_relative 'dtmcli/id_generator'
 require_relative 'dtmcli/proxy'
+require_relative 'dtmcli/saga'
 require_relative 'dtmcli/tcc'
 require_relative 'dtmcli/version'
 

data/lib/dtmcli/dtm.rb

@@ -0,0 +1,52 @@
+module Dtmcli
+  class Dtm
+    attr_reader :dtm_url
+
+    class << self
+      def succ?(data)
+        data['dtm_result'] == 'SUCCESS'
+      end
+
+      def parse
+        lambda do |resp|
+          body = JSON.parse(resp.body)
+          raise DtmSvrError, "dtm server error: data = #{body}" if !succ?(body)
+          body
+        end
+      end
+
+      def new_gid(dtm_url)
+        data = Proxy.execute(:get, dtm_url + '/newGid', {}, &parse)
+        return data["gid"]
+      end
+    end
+
+    def initialize(dtm_url)
+      @dtm_url = dtm_url
+    end
+
+    def prepare(body)
+      Proxy.execute(:post, dtm_url + '/prepare', {body: body}, &Dtm::parse)
+    end
+
+    def submit(body)
+      Proxy.execute(:post, dtm_url + '/submit', {body: body}, &Dtm::parse)
+    end
+
+    def abort(body)
+      Proxy.execute(:post, dtm_url + '/abort', {body: body}, &Dtm::parse)
+    end
+
+    def register_xa_branch(body)
+      Proxy.execute(:post, dtm_url + '/registerXaBranch',{body: body}, &Dtm::parse)
+    end
+
+    def register_tcc_branch(body)
+      Proxy.execute(:post, dtm_url + '/registerTccBranch',{body: body}, &Dtm::parse)
+    end
+
+    def query(params)
+      Proxy.execute(:get, dtm_url + '/query',{params: params}, &Dtm::parse)
+    end
+  end
+end

data/lib/dtmcli/errors.rb

@@ -0,0 +1,3 @@
+module Dtmcli
+  DtmSvrError = Class.new(StandardError)
+end

data/lib/dtmcli/id_generator.rb

@@ -4,11 +4,8 @@ module Dtmcli
     attr_accessor :parent_id, :branch_id
 
     class << self
-      def gen_gid(dtmUrl)
-        body = Proxy.execute(:get, dtmUrl + '/newGid') do |resp|
-          JSON.parse(resp.body)
-        end
-        return body["gid"]
+      def gen_gid(dtm_url)
+        return Dtm.new_gid(dtm_url)
       end
     end
 

data/lib/dtmcli/saga.rb

@@ -0,0 +1,36 @@
+module Dtmcli
+  class Saga
+    attr_accessor :gid, :steps
+    attr_reader :dtm, :dtm_url
+
+    TRANS_TYPE = 'saga'
+
+    def initialize(dtm_url)
+      @dtm_url = dtm_url
+      @dtm = Dtm.new(dtm_url)
+      @steps = []
+    end
+
+    def gen_gid
+      @gid = IdGenerator.gen_gid(dtm_url)
+    end
+
+    def add(action, compensate, post_data)
+      step = {
+        action:     action,
+        compensate: compensate,
+        data:       post_data.to_json,
+      }
+      @steps << step
+    end
+
+    def submit
+      tbody = {
+        gid: gid,
+        trans_type: TRANS_TYPE,
+        steps: steps
+      }
+      dtm.submit(tbody)
+    end
+  end
+end

data/lib/dtmcli/tcc.rb

@@ -1,7 +1,7 @@
 module Dtmcli
   class Tcc
-    attr_accessor :id_gen
-    attr_accessor :dtm_url, :gid
+    attr_accessor :id_gen, :gid
+    attr_reader :dtm, :dtm_url
 
     TRANS_TYPE = 'tcc'
 
@@ -16,12 +16,13 @@ module Dtmcli
         }
 
         begin
-          Proxy.execute(:post, dtm_url + '/prepare', {body: tbody})
+          tcc.dtm.prepare(tbody)
+
           yield tcc if block
 
-          Proxy.execute(:post, dtm_url + '/submit', {body: tbody})
+          tcc.dtm.submit(tbody)
         rescue => e
-          Proxy.execute(:post, dtm_url + '/abort', {body: tbody})
+          tcc.dtm.abort(tbody)
           return ''
         end
 
@@ -33,27 +34,22 @@ module Dtmcli
       @dtm_url = dtm_url
       @gid = gid
       @id_gen = IdGenerator.new
+      @dtm = Dtm.new(dtm_url)
     end
 
     def call_branch(body, try_url, confirm_url, cancel_url)
       branch_id = id_gen.gen_branch_id
 
-      Proxy.execute(
-        :post,
-        dtm_url + '/registerTccBranch',
-        {
-          body: {
-            gid: gid,
-            branch_id: branch_id,
-            trans_type: TRANS_TYPE,
-            status: 'prepared',
-            data: body.to_json,
-            try: try_url,
-            confirm: confirm_url,
-            cancel: cancel_url
-          }
-        }
-      )
+      dtm.register_tcc_branch({
+        gid: gid,
+        branch_id: branch_id,
+        trans_type: TRANS_TYPE,
+        status: 'prepared',
+        data: body.to_json,
+        try: try_url,
+        confirm: confirm_url,
+        cancel: cancel_url
+      })
 
       Proxy.execute(
         :post,

data/lib/dtmcli/version.rb

@@ -1,3 +1,3 @@
 module Dtmcli
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/test_id_generator.rb

@@ -65,4 +65,14 @@ class TestIdGenerator < Minitest::Test
       Dtmcli::IdGenerator.gen_gid(@dtm_url)
     }
   end
+
+  def test_gen_gid_fail3
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(status: 200, body: {dtm_result: 'FAILURE', gid: ''}.to_json)
+    
+    assert_raises(Dtmcli::DtmSvrError) {
+      Dtmcli::IdGenerator.gen_gid(@dtm_url)
+    }
+  end
 end

data/test/test_saga.rb

@@ -0,0 +1,136 @@
+require 'helper'
+
+class TestSaga < Minitest::Test
+  def setup
+    mocking!
+  end
+
+  def test_initialize
+    saga = Dtmcli::Saga.new('dtmurl')
+    assert_equal 'dtmurl', saga.dtm_url
+    assert_equal [], saga.steps
+  end
+
+  def test_gen_gid_succ
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+        headers: {}
+      )
+
+    saga = Dtmcli::Saga.new(@dtm_url)
+    saga.gen_gid
+    assert_equal 'test_gid', saga.gid
+  end
+
+  def test_gen_gid_fail
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(status: 200, body: {dtm_result: 'FAILURE', gid: ''}.to_json)
+
+    saga = Dtmcli::Saga.new(@dtm_url)
+    assert_raises(Dtmcli::DtmSvrError) {
+      saga.gen_gid
+    }
+  end
+
+  def test_add_succ
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+        headers: {}
+      )
+
+    saga = Dtmcli::Saga.new(@dtm_url)
+    assert_equal [], saga.steps
+    saga.gen_gid
+
+    post_data = {
+      amount:         30,
+      transInResult:  "SUCCESS",
+      transOutResult: "SUCCESS",
+    }
+    saga.add(@host + '/TransOut1', @host + '/TransOutRevert1', post_data)
+    assert_equal 1, saga.steps.size
+    step1 = saga.steps[0]
+    assert_equal @host + '/TransOut1', step1[:action]
+    assert_equal @host + '/TransOutRevert1', step1[:compensate]
+    assert step1[:data].include?('SUCCESS')
+
+    saga.add(@host + '/TransOut2', @host + '/TransOutRevert2', post_data)
+    assert_equal 2, saga.steps.size
+    step2 = saga.steps[1]
+    assert_equal @host + '/TransOut2', step2[:action]
+    assert_equal @host + '/TransOutRevert2', step2[:compensate]
+    assert step1[:data].include?('SUCCESS')
+  end
+
+  def test_submit_succ
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+        headers: {}
+      )
+
+    stub_request(:post, @dtm_url + "/submit").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+      )
+
+    saga = Dtmcli::Saga.new(@dtm_url)
+    assert_equal [], saga.steps
+    saga.gen_gid
+
+    post_data = {
+      amount:         30,
+      transInResult:  "SUCCESS",
+      transOutResult: "SUCCESS",
+    }
+    saga.add(@host + '/TransOut', @host + '/TransOutRevert', post_data)
+    assert_equal 1, saga.steps.size
+
+    res = saga.submit
+    assert_equal 'SUCCESS', res['dtm_result']
+  end
+
+  def test_submit_succ
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+        headers: {}
+      )
+
+    stub_request(:post, @dtm_url + "/submit").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'FAILURE', gid: ''}.to_json,
+      )
+
+    saga = Dtmcli::Saga.new(@dtm_url)
+    assert_equal [], saga.steps
+    saga.gen_gid
+
+    post_data = {
+      amount:         30,
+      transInResult:  "SUCCESS",
+      transOutResult: "SUCCESS",
+    }
+    saga.add(@host + '/TransOut', @host + '/TransOutRevert', post_data)
+    assert_equal 1, saga.steps.size
+
+    assert_raises(Dtmcli::DtmSvrError) {
+      saga.submit
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtmcli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - jedhu0
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -85,12 +85,16 @@ files:
 - README.md
 - dtmcli.gemspec
 - lib/dtmcli.rb
+- lib/dtmcli/dtm.rb
+- lib/dtmcli/errors.rb
 - lib/dtmcli/id_generator.rb
 - lib/dtmcli/proxy.rb
+- lib/dtmcli/saga.rb
 - lib/dtmcli/tcc.rb
 - lib/dtmcli/version.rb
 - test/helper.rb
 - test/test_id_generator.rb
+- test/test_saga.rb
 - test/test_tcc.rb
 homepage: https://github.com/jedhu0/dtmcli
 licenses:
@@ -118,4 +122,5 @@ summary: client for dtm
 test_files:
 - test/helper.rb
 - test/test_id_generator.rb
+- test/test_saga.rb
 - test/test_tcc.rb