tsubaiso-sdk 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a427717922d3d59b6816207cffd61f417e78ddf
-  data.tar.gz: 93becc79ecf8a3cbb692707cdfa536f60c409b00
+  metadata.gz: 51bc572f3dcb791e79cb2f38327bd643137599be
+  data.tar.gz: 6f3ec294f25b4b37fad5f8e7d089907bd9e0fb6f
 SHA512:
-  metadata.gz: c2376f73fe25ff678949e42baf73c991d0dc21ee829d8ceb592a0c66010fcaec176fc62d024c0e80745ecc21b8f5717cb8bb2fe04988f7c285be99b002b0085f
-  data.tar.gz: fdf3f55f2847df47042ca9ef8f7badd9c032cc2f9781b42fba06394cacdea0da1a157a81625bbc06f7871b494bf22c7d875e1b73ac70535e670d2b756ee82817
+  metadata.gz: 0a03738989532ee52b04da7307da90f4229f859bbf6378447d3590a3e455c6bde2883f2a7e357757fa7e914f4adba1f2a26e8126f93a33ab8822fe7d425e0e84
+  data.tar.gz: cc316c260e39d0dea3976a452d8efcb55402ae3349e0fd397868704056bd7746da3ce9d52c939df9f15bf3de3447d2b42ddc4235a7e4d063880f165ccbeafaf0

data/lib/tsubaiso_sdk.rb

@@ -19,7 +19,7 @@ class TsubaisoSDK
   def list_sales_and_account_balances(year, month, options = {})
     params = { "year" => year,
                "month" => month,
-               "customer_master_code" => options[:customer_master_code],
+               "customer_master_id" => options[:customer_master_id],
                "ar_segment" => options[:ar_segment],
                "format" => "json"
     }
@@ -119,7 +119,7 @@ class TsubaisoSDK
                "start_created_at" => options[:start_created_at],
                "finish_created_at" => options[:finish_created_at],
                "timestamp_order" => options[:timestamp_order],
-               "account_code" => options[:account_code],
+               "account_codes" => options[:account_codes],
                "price" => options[:price],
                "memo" => options[:memo],
                "dept_code" => options[:dept_code],
@@ -429,39 +429,33 @@ class TsubaisoSDK
     api_request(uri, "POST", params)
   end
 
-  def update_sale(options)
-    params = { "price_including_tax" => options[:price_including_tax],
-               "realization_timestamp" => options[:realization_timestamp],
-               "customer_master_code" => options[:customer_master_code],
-               "dept_code" => options[:dept_code],
-               "reason_master_code" => options[:reason_master_code],
-               "dc" => options[:dc],
+  def create_journal_distribution(options)
+    params = { "format" => "json",
+               "search_conditions" => {
+                 "start_date" => options[:start_date],
+                 "finish_date" => options[:finish_date],
+                 "account_codes" => options[:account_codes],
+                 "dept_code" => options[:dept_code],
+                 "tag_list" => options[:tag_list]
+               },
+               "target_timestamp" => options[:target_timestamp],
                "memo" => options[:memo],
-               "tax_code" => options[:tax_code],
-               "sales_tax" => options[:sales_tax],
-               "scheduled_memo" => options[:scheduled_memo],
-               "scheduled_receive_timestamp" => options[:scheduled_receive_timestamp],
-               "tag_list" => options[:tag_list],
-               "data_partner" => options[:data_partner],
-               "format" => "json"
+               "criteria" => options[:criteria],
+               "distribution_conditions" => options[:distribution_conditions],
+               "title" => options[:title]
              }
+    uri = URI.parse(@base_url + '/journal_distributions/create/')
+    api_request(uri, "POST", params)
+  end
+
+  def update_sale(options)
+    params = options.merge({"format" => "json"})
     uri = URI.parse(@base_url + "/ar/update/#{options[:id]}")
     api_request(uri, "POST", params)
   end
 
   def update_purchase(options)
-    params = { "price_including_tax" => options[:price_including_tax],
-               "accrual_timestamp" => options[:accrual_timestamp],
-               "customer_master_code" => options[:customer_master_code],
-               "dept_code" => options[:dept_code],
-               "reason_master_code" => options[:reason_master_code],
-               "dc" => options[:dc],
-               "memo" => options[:memo],
-               "tax_code" => options[:tax_code],
-               "port_type" => options[:port_type],
-               "tag_list" => options[:tag_list],
-               "data_partner" => options[:data_partner],
-               "format" => "json"}
+    params = options.merge({"format" => "json"})
 
     uri = URI.parse(@base_url + "/ap_payments/update/#{options[:id]}")
     api_request(uri, "POST", params)
@@ -624,6 +618,12 @@ class TsubaisoSDK
     api_request(uri, "POST", params)
   end
 
+  def destroy_journal_distribution(journal_distribution_id)
+    params = { "format" => "json" }
+    uri = URI.parse(@base_url + "/journal_distributions/destroy/#{journal_distribution_id}")
+    api_request(uri, "POST", params)
+  end
+
   private
 
   def api_request(uri, http_verb, params)
@@ -642,10 +642,10 @@ class TsubaisoSDK
       begin
         {:status => response.code, :json => recursive_symbolize_keys(JSON.load(response.body))}
       rescue
-        response.body
+        {:status => response.code, :body => response.body}
       end
     else
-      response.code
+      {:status => response.code}
     end
   end
 

data/test/test_tsubaiso_sdk.rb

@@ -1,9 +1,41 @@
 # encoding: utf-8
-require 'minitest/autorun'
+require 'test/unit'
 require 'time'
 require './lib/tsubaiso_sdk'
 
-class TsubaisoSDKTest < MiniTest::Test
+class TsubaisoSDKTest < Test::Unit::TestCase
+
+  class <<self
+    def startup
+      @sdk = TsubaisoSDK.new({ base_url: ENV["SDK_BASE_URL"], access_token: ENV["SDK_ACCESS_TOKEN"] })
+
+      # Master data prepare
+
+      # Customer master
+      customer_101 = { name: "取引先１０１", name_kana: "イチマルイチ", code: "101",
+                     tax_type_for_remittance_charge: "3", used_in_ar: 1, used_in_ap: 1, is_valid: 1}
+                      # ar_account_code: "135~999" , ap_account_code: "310~999" }
+
+      customer_102 = { name: "取引先１０２", name_kana: "トリヒキサキニ", code: "102",
+                      tax_type_for_remittance_charge: "3", used_in_ar: 1, used_in_ap: 1, is_valid: 1}
+                      # ar_account_code: "135~999" , ap_account_code: "310~999" }
+
+      customer_105 = { name: "取引先１０５", name_kana: "トリヒキサキご", code: "105",
+                      tax_type_for_remittance_charge: "3", used_in_ar: 1, used_in_ap: 1, is_valid: 1}
+                      # ar_account_code: "135~999" , ap_account_code: "310~999" }
+
+      @res_101 = @sdk.create_customer(customer_101)
+      @res_102 = @sdk.create_customer(customer_102)
+      @res_105 = @sdk.create_customer(customer_105)
+
+    end
+
+    def shutdown
+      @sdk.destroy_customer(@res_101[:json][:id]) if @res_101 && @res_101[:status].to_i == 200
+      @sdk.destroy_customer(@res_102[:json][:id]) if @res_102 && @res_102[:status].to_i == 200
+      @sdk.destroy_customer(@res_105[:json][:id]) if @res_105 && @res_105[:status].to_i == 200
+    end
+  end
 
   def setup
     @api = TsubaisoSDK.new({ base_url: ENV["SDK_BASE_URL"], access_token: ENV["SDK_ACCESS_TOKEN"] })
@@ -18,21 +50,23 @@ class TsubaisoSDKTest < MiniTest::Test
 
     @customer_1000 = { name: "テスト株式会社", name_kana: "テストカブシキガイシャ", code: "10000", tax_type_for_remittance_charge: "3", used_in_ar: 1, used_in_ap: 1, is_valid: 1 }
     @staff_data_1 = { code: "QUALIFICATION", value: "TOEIC", start_timestamp: "2016-01-01", no_finish_timestamp: "1", memo: "First memo" }
-    @reimbursement_1 = { applicant: "Irfan", application_term: "2016-03-01", staff_code: "EP2000", memo: "aaaaaaaa" }
-    @reimbursement_2 = { applicant: "Matsuno", application_term: "2016-03-01", staff_code: "EP2000", memo: "aaaaaaaa" }
-    @reimbursement_tx_1 = { transaction_timestamp: "2016-03-01", price_value: 10000, dc:"c", reason_code:"SUPPLIES", brief:"everyting going well", memo:"easy", data_partner: { link_url: "www.example.com/5", id_code: "5"} }
-    @reimbursement_tx_2 = { transaction_timestamp: "2016-03-01", price_value: 20000, dc:"c", reason_code:"SUPPLIES", brief:"not well", memo:"hard", data_partner: { link_url: "www.example.com/6", id_code: "6"} }
+    @reimbursement_1 = { applicant: "Irfan", application_term: "2016-03-01", memo: "aaaaaaaa" }
+    @reimbursement_2 = { applicant: "Matsuno", application_term: "2016-03-01", memo: "aaaaaaaa" }
+    @reimbursement_tx_1 = { transaction_timestamp: "2016-03-01", price_value: 10000, dc:"c", reason_code:"MEETING", brief:"everyting going well", memo:"easy", data_partner: { link_url: "www.example.com/5", id_code: "5"} }
+    @reimbursement_tx_2 = { transaction_timestamp: "2016-03-01", price_value: 20000, dc:"c", reason_code:"MEETING", brief:"not well", memo:"hard", data_partner: { link_url: "www.example.com/6", id_code: "6"} }
     @manual_journal_1 = {journal_timestamp: "2016-04-01", journal_dcs: [
-                         debit:  {account_code: 100, price_including_tax: 1000, tax_type: 1, sales_tax: 100},
-                         credit: {account_code: 135, price_including_tax: 1000, tax_type: 1, sales_tax: 100} ], data_partner: { link_url: "www.example.com/7", id_code: "7"} }
+                         debit:  {account_code: 110, price_including_tax: 1000, tax_type: 1, sales_tax: 100},
+                         credit: {account_code: 130, price_including_tax: 1000, tax_type: 1, sales_tax: 100} ], data_partner: { link_url: "www.example.com/7", id_code: "7"} }
     @dept_1= {sort_no: 12345678, code: 'test_code', name: 'テスト部門', name_abbr: 'テストブモン', color: '#ffffff', memo: 'テストメモ', start_date: '2016-01-01', finish_date: '2016-01-02'}
     @tag_1 = {code: 'test_code', name: 'テストタグ', sort_no: 10000, tag_group_code: "DEFAULT", start_ymd: '2016-01-01', finish_ymd: '2016-12-31'}
+    @journal_distribution_1 = { start_date: "2016-09-01", finish_date: "2016-09-30", account_codes: ["135~999","604"], dept_code: "SETSURITSU", memo: "",
+                                title: "テスト表題" ,criteria: "dept", target_timestamp: "2017-02-01",
+                                distribution_conditions: { "SETSURITSU" => "1", "SYSTEM" => "1" } }
   end
 
   def test_failed_request
     @api_fail = TsubaisoSDK.new({ base_url: ENV["SDK_BASE_URL"], access_token: "fake token" })
     sale = @api_fail.create_sale(@sale_201608)
-
     assert_equal 401, sale[:status].to_i, sale.inspect
     assert_equal "Bad credentials", sale[:json][:error]
   end
@@ -44,7 +78,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal @customer_1000[:name], customer[:json][:name]
 
   ensure
-    @api.destroy_customer(customer[:json][:id]) if customer[:json][:id]
+    @api.destroy_customer(customer[:json][:id]) if successful?(customer)
   end
 
   def test_create_sale
@@ -55,7 +89,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal @sale_201608[:data_partner][:id_code], sale[:json][:data_partner][:id_code]
 
   ensure
-    @api.destroy_sale("AR#{sale[:json][:id]}") if sale[:json][:id]
+    @api.destroy_sale("AR#{sale[:json][:id]}") if successful?(sale)
   end
 
   def test_create_purchase
@@ -66,7 +100,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal @purchase_201608[:data_partner][:id_code], purchase[:json][:data_partner][:id_code]
 
   ensure
-    @api.destroy_purchase("AP#{purchase[:json][:id]}") if purchase[:json][:id]
+    @api.destroy_purchase("AP#{purchase[:json][:id]}") if successful?(purchase)
   end
 
   def test_create_staff_data
@@ -80,7 +114,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal @staff_data_1[:value], staff_data[:json][:value]
 
   ensure
-    @api.destroy_staff_data(staff_data[:json][:id]) if staff_data[:json][:id]
+    @api.destroy_staff_data(staff_data[:json][:id]) if successful?(staff_data)
   end
 
   def test_create_manual_journal
@@ -92,7 +126,7 @@ class TsubaisoSDKTest < MiniTest::Test
       assert_equal @manual_journal_1[:data_partner][:id_code], manual_journal[:json][:data_partner][:id_code]
 
     ensure
-      @api.destroy_manual_journal(manual_journal[:json][:id]) if successful?(manual_journal[:status])
+      @api.destroy_manual_journal(manual_journal[:json][:id]) if successful?(manual_journal)
     end
   end
 
@@ -102,7 +136,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal @reimbursement_1[:applicant], reimbursement[:json][:applicant]
 
     ensure
-    @api.destroy_reimbursement(reimbursement[:json][:id]) if reimbursement[:json][:id]
+    @api.destroy_reimbursement(reimbursement[:json][:id]) if successful?(reimbursement)
   end
 
   def test_create_reimbursement_transaction
@@ -114,8 +148,8 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal @reimbursement_tx_1[:data_partner][:id_code], reimbursement_transaction[:json][:data_partner][:id_code]
 
     ensure
-    @api.destroy_reimbursement_transaction(reimbursement_transaction[:json][:id]) if reimbursement_transaction[:json][:id]
-    @api.destroy_reimbursement(reimbursement[:json][:id]) if reimbursement[:json][:id]
+    @api.destroy_reimbursement_transaction(reimbursement_transaction[:json][:id]) if successful?(reimbursement_transaction)
+    @api.destroy_reimbursement(reimbursement[:json][:id]) if successful?(reimbursement)
   end
 
   def test_create_dept
@@ -124,7 +158,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal @dept_1[:code], dept[:json][:code]
 
     ensure
-    @api.destroy_dept(dept[:json][:id]) if dept[:json][:id]
+    @api.destroy_dept(dept[:json][:id]) if successful?(dept)
   end
 
   def test_create_tag
@@ -133,7 +167,31 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal @tag_1[:code], tag[:json][:code]
 
     ensure
-    @api.destroy_tag(tag[:json][:id]) if tag[:json][:id]
+    @api.destroy_tag(tag[:json][:id]) if successful?(tag)
+  end
+
+  def test_create_journal_distribution
+
+    sale = @api.create_sale(@sale_201609)
+
+    options = { start_date: @journal_distribution_1[:target_timestamp], finish_date: @journal_distribution_1[:target_timestamp] }
+
+    journals_list_before = @api.list_journals(options)
+    records_before_count = journals_list_before[:json][:records].count
+    assert_equal 200, journals_list_before[:status].to_i, journals_list_before.inspect
+
+    journal_distribution = @api.create_journal_distribution(@journal_distribution_1)
+    assert_equal 200, journal_distribution[:status].to_i, journal_distribution.inspect
+    assert_equal Time.parse(@journal_distribution_1[:target_timestamp]), Time.parse(journal_distribution[:json][:target_ym])
+
+    journals_list_after = @api.list_journals(options)
+    records_after_count = journals_list_after[:json][:records].count
+    assert_equal 200, journals_list_after[:status].to_i, journals_list_after.inspect
+    assert (records_before_count != records_after_count)
+
+  ensure
+    @api.destroy_journal_distribution(journal_distribution[:json][:id]) if successful?(journal_distribution)
+    @api.destroy_sale("AR#{sale[:json][:id]}") if successful?(sale)
   end
 
   def test_update_sale
@@ -144,16 +202,17 @@ class TsubaisoSDKTest < MiniTest::Test
                 data_partner: { id_code: "100" } }
 
     updated_sale = @api.update_sale(options)
-    assert_equal 200, updated_sale[:status].to_i
+    assert_equal 200, updated_sale[:status].to_i, updated_sale[:json]
     assert_equal options[:id], updated_sale[:json][:id]
     assert_equal options[:memo], updated_sale[:json][:memo]
     assert_equal options[:price_including_tax], updated_sale[:json][:price_including_tax]
     assert_equal options[:data_partner][:id_code], updated_sale[:json][:data_partner][:id_code]
 
   ensure
-    @api.destroy_sale("AP#{sale[:json][:id]}") if sale[:json][:id]
+    @api.destroy_sale("AP#{sale[:json][:id]}") if successful?(sale)
   end
 
+
   def test_update_purchase
     purchase = @api.create_purchase(@purchase_201608)
     options = { id: purchase[:json][:id],
@@ -169,7 +228,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal options[:data_partner][:id_code], updated_purchase[:json][:data_partner][:id_code]
 
   ensure
-    @api.destroy_purchase("AP#{purchase[:json][:id]}") if purchase[:json][:id]
+    @api.destroy_purchase("AP#{purchase[:json][:id]}") if successful?(purchase)
   end
 
   def test_update_customer
@@ -183,7 +242,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal "New Customer Name", updated_customer[:json][:name]
 
   ensure
-    @api.destroy_customer(customer[:json][:id]) if customer[:json][:id]
+    @api.destroy_customer(customer[:json][:id]) if successful?(customer)
   end
 
   def test_update_staff_data
@@ -202,7 +261,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal "Programmer", updated_staff_data[:json][:value]
 
   ensure
-    @api.destroy_staff_data(staff_data[:json][:id]) if staff_data[:json][:id]
+    @api.destroy_staff_data(staff_data[:json][:id]) if successful?(staff_data)
   end
 
   def test_update_reimbursement
@@ -217,14 +276,14 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal options[:dept_code], updated_reimbursement[:json][:dept_code]
 
   ensure
-    @api.destroy_reimbursement(updated_reimbursement[:json][:id] || reimbursement[:json][:id]) if updated_reimbursement[:json][:id] || reimbursement[:json][:id]
+    @api.destroy_reimbursement(updated_reimbursement[:json][:id] || reimbursement[:json][:id]) if successful?(updated_reimbursement) || successful?(reimbursement)
   end
 
   def test_update_reimbursement_transaction
     reimbursement = @api.create_reimbursement(@reimbursement_1)
     options = @reimbursement_tx_1.merge({ :reimbursement_id => reimbursement[:json][:id].to_i })
     reimbursement_transaction = @api.create_reimbursement_transaction(options)
-    updates = { :id => reimbursement_transaction[:json][:id], :price_value => 9999, :reason_code => "SUPPLIES", :data_partner => { :id_code => "500" } }
+    updates = { :id => reimbursement_transaction[:json][:id], :price_value => 9999, :reason_code => "RENTS", :data_partner => { :id_code => "500" } }
 
     updated_reimbursement_transaction = @api.update_reimbursement_transaction(updates)
     assert_equal 200, updated_reimbursement_transaction[:status].to_i, updated_reimbursement_transaction.inspect
@@ -234,8 +293,8 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal updates[:data_partner][:id_code], updated_reimbursement_transaction[:json][:data_partner][:id_code]
 
   ensure
-    @api.destroy_reimbursement_transaction(reimbursement_transaction[:json][:id]) if reimbursement_transaction[:json][:id]
-    @api.destroy_reimbursement(reimbursement[:json][:id]) if reimbursement[:json][:id]
+    @api.destroy_reimbursement_transaction(reimbursement_transaction[:json][:id]) if successful?(reimbursement_transaction)
+    @api.destroy_reimbursement(reimbursement[:json][:id]) if successful?(reimbursement)
   end
 
   def test_update_manual_journal
@@ -253,7 +312,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal options[:data_partner][:id_code], updated_manual_journal[:json][:data_partner][:id_code]
 
   ensure
-    @api.destroy_manual_journal(manual_journal[:json][:id]) if successful?(manual_journal[:status])
+    @api.destroy_manual_journal(manual_journal[:json][:id]) if successful?(manual_journal)
   end
 
   def test_update_dept
@@ -272,7 +331,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal options[:name_abbr], updated_dept[:json][:name_abbr]
 
   ensure
-    @api.destroy_dept(updated_dept[:json][:id] || dept[:json][:id]) if updated_dept[:json][:id] || dept[:json][:id]
+    @api.destroy_dept(updated_dept[:json][:id] || dept[:json][:id]) if successful?(updated_dept) || successful?(dept)
   end
 
   def test_update_tag
@@ -287,7 +346,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal options[:code], updated_tag[:json][:code]
 
   ensure
-    @api.destroy_tag(updated_tag[:json][:id] || tag[:json][:id]) if updated_tag[:json][:id] || tag[:json][:id]
+    @api.destroy_tag(updated_tag[:json][:id] || tag[:json][:id]) if successful?(updated_tag) || successful?(tag)
   end
 
   def test_show_sale
@@ -298,7 +357,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal sale[:json][:price_including_tax], get_sale[:json][:price_including_tax]
 
   ensure
-    @api.destroy_sale("AR#{sale[:json][:id]}") if sale[:json][:id]
+    @api.destroy_sale("AR#{sale[:json][:id]}") if successful?(sale)
   end
 
   def test_show_purchase
@@ -309,7 +368,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal purchase[:json][:id], get_purchase[:json][:id]
 
   ensure
-    @api.destroy_purchase("AP#{purchase[:json][:id]}") if purchase[:json][:id]
+    @api.destroy_purchase("AP#{purchase[:json][:id]}") if successful?(purchase)
   end
 
   def test_show_customer
@@ -320,7 +379,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal customer[:json][:id], get_customer[:json][:id]
 
   ensure
-    @api.destroy_customer(customer[:json][:id]) if customer[:json][:id]
+    @api.destroy_customer(customer[:json][:id]) if successful?(customer)
   end
 
   def test_show_staff
@@ -355,7 +414,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal staff_data[:json][:id], get_staff_data_2[:json][:id]
 
   ensure
-    @api.destroy_staff_data(staff_data[:json][:id]) if staff_data[:json][:id]
+    @api.destroy_staff_data(staff_data[:json][:id]) if successful?(staff_data)
   end
 
   def test_show_staff_datum_master
@@ -386,7 +445,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal 200, reimbursement[:status].to_i, reimbursement.inspect
     assert_equal @reimbursement_1[:applicant], reimbursement[:json][:applicant]
   ensure
-    @api.destroy_reimbursement(reimbursement[:json][:id])
+    @api.destroy_reimbursement(reimbursement[:json][:id]) if successful?(reimbursement)
   end
 
   def test_show_reimbursement_reason_master
@@ -408,8 +467,8 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal options[:reimbursement_id], reimbursement_transaction[:json][:reimbursement_id]
 
   ensure
-    @api.destroy_reimbursement_transaction(reimbursement_transaction[:json][:id]) if reimbursement_transaction[:json][:id]
-    @api.destroy_reimbursement(reimbursement[:json][:id]) if reimbursement[:json][:id]
+    @api.destroy_reimbursement_transaction(reimbursement_transaction[:json][:id]) if successful?(reimbursement_transaction)
+    @api.destroy_reimbursement(reimbursement[:json][:id]) if successful?(reimbursement)
   end
 
   def test_show_manual_journal
@@ -422,7 +481,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal first_manual_journal_id, manual_journal[:json][:id]
 
   ensure
-    @api.destroy_manual_journal(manual_journal[:json][:id]) if successful?(manual_journal[:status])
+    @api.destroy_manual_journal(manual_journal[:json][:id]) if successful?(manual_journal)
   end
 
   def test_show_journal
@@ -435,7 +494,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal first_journal_id, journal[:json][:records][:id]
 
   ensure
-    @api.destroy_manual_journal(manual_journal[:json][:id]) if successful?(manual_journal[:status])
+    @api.destroy_manual_journal(manual_journal[:json][:id]) if successful?(manual_journal)
   end
 
   def test_show_dept
@@ -445,7 +504,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal 200, dept[:status].to_i, dept.inspect
     assert_equal @dept_1[:memo], dept[:json][:memo]
   ensure
-    @api.destroy_dept(dept[:json][:id])
+    @api.destroy_dept(dept[:json][:id]) if successful?(dept)
   end
 
   def test_show_tag
@@ -455,7 +514,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_equal 200, tag[:status].to_i, tag.inspect
     assert_equal @tag_1[:name], tag[:json][:name]
   ensure
-    @api.destroy_tag(tag[:json][:id])
+    @api.destroy_tag(tag[:json][:id]) if successful?(tag)
   end
 
   def test_show_bonus
@@ -468,7 +527,7 @@ class TsubaisoSDKTest < MiniTest::Test
   end
 
   def test_show_payroll
-    payrolls_list = @api.list_payrolls(2017, 1)
+    payrolls_list = @api.list_payrolls(2016, 2)
     first_payroll_id = payrolls_list[:json].first[:id]
 
     payroll = @api.show_payroll(first_payroll_id)
@@ -510,9 +569,9 @@ class TsubaisoSDKTest < MiniTest::Test
     assert !sales_list[:json].any?{ |x| x[:id] == september_sale_id }
 
   ensure
-    @api.destroy_sale("AR#{august_sale_a[:json][:id]}") if august_sale_a[:json][:id]
-    @api.destroy_sale("AR#{august_sale_b[:json][:id]}") if august_sale_b[:json][:id]
-    @api.destroy_sale("AR#{september_sale[:json][:id]}") if september_sale[:json][:id]
+    @api.destroy_sale("AR#{august_sale_a[:json][:id]}") if successful?(august_sale_a)
+    @api.destroy_sale("AR#{august_sale_b[:json][:id]}") if successful?(august_sale_b)
+    @api.destroy_sale("AR#{september_sale[:json][:id]}") if successful?(september_sale)
   end
 
   def test_list_sales_and_account_balances
@@ -534,20 +593,15 @@ class TsubaisoSDKTest < MiniTest::Test
     customer_masters_list = @api.list_customers
     assert_equal 200, customer_masters_list[:status].to_i, customer_masters_list.inspect
     assert customer_masters_list[:json].any?{ |x| x[:code] == new_sale[:json][:customer_master_code] }
-    filtered_customer_master = customer_masters_list[:json].select{ |x| x[:code] == new_sale[:json][:customer_master_code] }.first
-    customer_master_code = filtered_customer_master[:code]
-    ar_segment = filtered_customer_master[:used_in_ar]
+    filtered_cm = customer_masters_list[:json].select{ |x| x[:code] == new_sale[:json][:customer_master_code] }.first
 
     # With customer_master_id and ar_segment option parameters
-    balance_list = @api.list_sales_and_account_balances(realization_timestamp.year, realization_timestamp.month, :customer_master_code => customer_master_code, :ar_segment => ar_segment)
+    balance_list = @api.list_sales_and_account_balances(realization_timestamp.year, realization_timestamp.month, :customer_master_id => filtered_cm[:id], :ar_segment => filtered_cm[:used_in_ar])
     assert_equal 200, balance_list[:status].to_i, balance_list.inspect
     assert(balance_list[:json].count > 0)
-    balance_list[:json].each do |x|
-      assert x[:customer_master_code] == customer_master_code, "#{x} customer_master_code is right"
-      assert x[:ar_segment] == ar_segment, "ar_segment is not right"
-    end
+    assert balance_list[:json].all?{ |x| x[:customer_master_code] == filtered_cm[:code] && x[:ar_segment] == filtered_cm[:used_in_ar] }
   ensure
-    @api.destroy_sale("AR#{new_sale[:json][:id]}") if new_sale[:json][:id]
+    @api.destroy_sale("AR#{new_sale[:json][:id]}") if successful?(new_sale)
   end
 
   def test_list_purchases
@@ -566,9 +620,9 @@ class TsubaisoSDKTest < MiniTest::Test
     assert !purchase_list[:json].any?{ |x| x[:id] == september_purchase_id }
 
   ensure
-    @api.destroy_purchase("AP#{august_purchase_a[:json][:id]}") if august_purchase_a[:json][:id]
-    @api.destroy_purchase("AP#{august_purchase_b[:json][:id]}") if august_purchase_b[:json][:id]
-    @api.destroy_purchase("AP#{september_purchase[:json][:id]}") if september_purchase[:json][:id]
+    @api.destroy_purchase("AP#{august_purchase_a[:json][:id]}") if successful?(august_purchase_a)
+    @api.destroy_purchase("AP#{august_purchase_b[:json][:id]}") if successful?(august_purchase_b)
+    @api.destroy_purchase("AP#{september_purchase[:json][:id]}") if successful?(september_purchase)
   end
 
   def test_list_purchases_and_account_balances
@@ -600,7 +654,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert(balance_list[:json].count > 0)
     assert balance_list[:json].all?{ |x| x[:customer_master_id] == customer_master_id && x[:ap_segment] == ap_segment }
   ensure
-    @api.destroy_purchase("AP#{new_purchase[:json][:id]}") if new_purchase[:json][:id]
+    @api.destroy_purchase("AP#{new_purchase[:json][:id]}") if successful?(new_purchase)
   end
 
   def test_list_customers
@@ -613,7 +667,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert customer_list[:json].any?{ |x| x[:id] == customer_1000_id }
 
   ensure
-    @api.destroy_customer(customer_1000[:json][:id]) if customer_1000[:json][:id]
+    @api.destroy_customer(customer_1000[:json][:id]) if successful?(customer_1000)
   end
 
   def test_list_staff
@@ -653,9 +707,9 @@ class TsubaisoSDKTest < MiniTest::Test
     journals_list = @api.list_journals(options)
     records = journals_list[:json][:records]
     assert_equal 200, journals_list[:status].to_i, journals_list.inspect
-    record_timestamps = records.map { |x| x[:journal_timestamp].split(" ")[0] }
-    assert_includes record_timestamps, august_sale[:json][:realization_timestamp]
-    assert_includes record_timestamps, august_purchase[:json][:accrual_timestamp]
+    record_timestamps = records.map { |x| Time.parse(x[:journal_timestamp]) }
+    assert_includes record_timestamps, Time.parse(august_sale[:json][:realization_timestamp])
+    assert_includes record_timestamps, Time.parse(august_purchase[:json][:accrual_timestamp])
 
     options = { price: 10800 }
     journals_list = @api.list_journals(options)
@@ -676,10 +730,10 @@ class TsubaisoSDKTest < MiniTest::Test
     assert_includes record_depts, september_purchase[:json][:dept_code]
 
   ensure
-    @api.destroy_sale("AR#{august_sale[:json][:id]}") if august_sale[:json][:id]
-    @api.destroy_sale("AR#{september_sale[:json][:id]}") if september_sale[:json][:id]
-    @api.destroy_purchase("AP#{august_purchase[:json][:id]}") if august_purchase[:json][:id]
-    @api.destroy_purchase("AP#{september_purchase[:json][:id]}") if september_purchase[:json][:id]
+    @api.destroy_sale("AR#{august_sale[:json][:id]}") if successful?(august_sale)
+    @api.destroy_sale("AR#{september_sale[:json][:id]}") if successful?(september_sale)
+    @api.destroy_purchase("AP#{august_purchase[:json][:id]}") if successful?(august_purchase)
+    @api.destroy_purchase("AP#{september_purchase[:json][:id]}") if successful?(september_purchase)
   end
 
   def test_list_reimbursements
@@ -718,9 +772,9 @@ class TsubaisoSDKTest < MiniTest::Test
     assert reimbursement_transactions[:json].any?{ |x| x[:id] == reimbursement_transaction_2[:json][:id] }
 
   ensure
-    @api.destroy_reimbursement_transaction(reimbursement_transaction_1[:json][:id]) if reimbursement_transaction_1[:json][:id]
-    @api.destroy_reimbursement_transaction(reimbursement_transaction_1[:json][:id]) if reimbursement_transaction_1[:json][:id]
-    @api.destroy_reimbursement(reimbursement[:json][:id]) if reimbursement[:json][:id]
+    @api.destroy_reimbursement_transaction(reimbursement_transaction_1[:json][:id]) if successful?(reimbursement_transaction_1)
+    @api.destroy_reimbursement_transaction(reimbursement_transaction_2[:json][:id]) if successful?(reimbursement_transaction_2)
+    @api.destroy_reimbursement(reimbursement[:json][:id]) if successful?(reimbursement)
   end
 
   def test_list_depts
@@ -731,7 +785,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert depts[:json].any?{ |x| x[:id] == dept[:json][:id] }
 
   ensure
-    @api.destroy_dept(dept[:json][:id]) if dept[:json][:id]
+    @api.destroy_dept(dept[:json][:id]) if successful?(dept)
   end
 
   def test_list_tags
@@ -742,7 +796,7 @@ class TsubaisoSDKTest < MiniTest::Test
     assert tags[:json][@tag_1[:tag_group_code].to_sym].any?{ |x| x[:id] == tag[:json][:id] }
 
   ensure
-    @api.destroy_tag(tag[:json][:id]) if tag[:json][:id]
+    @api.destroy_tag(tag[:json][:id]) if successful?(tag)
   end
 
   def test_list_bonuses
@@ -756,7 +810,7 @@ class TsubaisoSDKTest < MiniTest::Test
     payrolls_list = @api.list_payrolls(2016, 2)
 
     assert_equal 200, payrolls_list[:status].to_i, payrolls_list.inspect
-    assert(payrolls_list.size > 0)
+    assert(payrolls_list[:json].size > 0)
   end
 
   def test_list_ar_reason_masters
@@ -773,8 +827,127 @@ class TsubaisoSDKTest < MiniTest::Test
     assert(ap_reason_masters_list[:json].size > 0)
   end
 
+  def test_destroy_sale
+    sale = @api.create_sale(@sale_201608)
+
+    destroy_res = @api.destroy_sale("AR#{sale[:json][:id]}")
+    assert_equal 204, destroy_res[:status].to_i, destroy_res.inspect
+
+    show_res = @api.show_res("AR#{sale[:json][:id]}")
+    assert_equal 404, show_res[:status].to_i, show_res.inspect
+  end
+
+  def test_destroy_purchase
+    purchase = @api.create_purchase(@purchase_201608)
+
+    destroy_res = @api.destroy_purchase("AP#{purchase[:json][:id]}")
+    assert_equal 204, destroy_res[:status].to_i, destroy_res.inspect
+
+    show_res = @api.show_purchase("AP#{purchase[:json][:id]}")
+    assert_equal 404, show_res[:status].to_i, show_res.inspect
+  end
+
+  def test_destroy_customer
+    customer = @api.create_customer(@customer_1000)
+
+    destroy_res = @api.destroy_customer(customer[:json][:id])
+    assert_equal 204, destroy_res[:status].to_i, destroy_res.inspect
+
+    show_res = @api.show_customer(customer[:json][:id])
+    assert_equal 404, show_res[:status].to_i, show_res.inspect
+  end
+
+  def test_destroy_staff_data
+    staff_list = @api.list_staff
+    first_staff_id = staff_list[:json].first[:id]
+    @staff_data_1[:staff_id] = first_staff_id
+    staff_data = @api.create_staff_data(@staff_data_1)
+
+    destroy_res = @api.destroy_staff_data(staff_data[:json][:id])
+    assert_equal 204, destroy_res[:status].to_i, destroy_res.inspect
+
+    show_res = @api.show_staff_data(staff_data[:json][:id])
+    assert_equal 404, show_res[:status].to_i, show_res.inspect
+  end
+
+  def test_destroy_manual_journal
+    manual_journal = @api.create_manual_journal(@manual_journal_1)
+
+    destroy_res = @api.destroy_manual_journal(manual_journal[:json][:id])
+    assert_equal 204, destroy_res[:status].to_i, destroy_res.inspect
+
+    show_res = @api.show_manual_journal(manual_journal[:json][:id])
+    assert_equal 404, show_res[:status].to_i, show_res.inspect
+  end
+
+  def test_destroy_reimbursement
+    reimbursement = @api.create_reimbursement(@reimbursement_1)
+
+    destroy_res = @api.destroy_reimbursement(reimbursement[:json][:id])
+    assert_equal 204, destroy_res[:status].to_i, destroy_res.inspect
+
+    show_res = @api.show_reimbursement(reimbursement[:json][:id])
+    assert_equal 404, show_res[:status].to_i, show_res.inspect
+  end
+
+  def test_destroy_reimbursement_transaction
+    reimbursement = @api.create_reimbursement(@reimbursement_1)
+    options = @reimbursement_tx_1.merge({ :reimbursement_id => reimbursement[:json][:id] })
+    reimbursement_transaction = @api.create_reimbursement_transaction(options)
+
+    destroy_res = @api.destroy_reimbursement_transaction(reimbursement_transaction[:json][:id])
+    assert_equal 204, destroy_res[:status].to_i, destroy_res.inspect
+
+    show_res = @api.show_reimbursement_transaction(reimbursement_transaction[:json][:id])
+    assert_equal 404, show_res[:status].to_i, show_res.inspect
+
+  ensure
+    @api.destroy_reimbursement(reimbursement[:json][:id]) if successful?(reimbursement)
+  end
+
+  def test_destroy_dept
+    dept = @api.create_dept(@dept_1)
+
+    destroy_res = @api.destroy_dept(dept[:json][:id])
+    assert_equal 204, destroy_res[:status].to_i, destroy_res.inspect
+
+    show_res = @api.show_dept(dept[:json][:id])
+    assert_equal 404, show_res[:status].to_i, show_res.inspect
+  end
+
+  def test_destroy_tag
+    tag = @api.create_tag(@tag_1)
+
+    destroy_res = @api.destroy_tag(tag[:json][:id])
+    assert_equal 204, destroy_res[:status].to_i, destroy_res.inspect
+
+    show_res = @api.show_tag(tag[:json][:id])
+    assert_equal 404, show_res[:status].to_i, show_res.inspect
+  end
+
+  def test_destroy_journal_distribution
+    sale = @api.create_sale(@sale_201609)
+    options = { start_date: @journal_distribution_1[:target_timestamp], finish_date: @journal_distribution_1[:target_timestamp] }
+    journals_list_before = @api.list_journals(options)
+    records_before_count = journals_list_before[:json][:records].count
+    journal_distribution = @api.create_journal_distribution(@journal_distribution_1)
+    journals_list_after = @api.list_journals(options)
+    records_after_count = journals_list_after[:json][:records].count
+    assert (records_before_count < records_after_count)
+
+    destroy_res = @api.destroy_journal_distribution(journal_distribution[:json][:id]) 
+    assert_equal 204, destroy_res[:status].to_i, destroy_res.inspect
+
+    journals_list_after_destroy = @api.list_journals(options)
+    records_count_after_destroy = journals_list_after_destroy[:json][:records].count
+    assert (records_before_count == records_count_after_destroy)
+
+  ensure
+    @api.destroy_sale("AR#{sale[:json][:id]}") if successful?(sale)
+  end
+
   private
-  def successful?(status)
-    status.to_i == 200
+  def successful?(response)
+    response && response[:status].to_i == 200
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsubaiso-sdk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tsubaiso, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -31,25 +31,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.3
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: 3.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: 3.0.8
 description: A library of methods that directly uses Tsubaiso API web endpoints.
 email: apisupport@tsubaiso.net
 executables: []
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: SDK for the Tsubaiso API