From 4ed3bc0f503405e9e9abc18cb1219a07af76fa34 Mon Sep 17 00:00:00 2001 From: arata Date: Fri, 26 May 2023 15:58:23 +0900 Subject: [PATCH 01/27] Update client.rb --- lib/freee/token/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index b6ff177..30c6d38 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -71,7 +71,7 @@ def refresh_token(access_token, refresh_token, expires_at) refresh_token: refresh_token, expires_at: expires_at } - @access_token = OAuth2::AccessToken.new(@client, access_token, params) + @access_token = OAuth2::AccessToken.new(refresh_token, expires_at, access_token, params) begin @access_token.refresh! if @access_token.expired? rescue OAuth2::Error From 1340d1d13273966fd33c2a376bbe6aa9371ce6b2 Mon Sep 17 00:00:00 2001 From: "arata@uniba.jp" Date: Fri, 26 May 2023 16:34:57 +0900 Subject: [PATCH 02/27] Update client.rb --- lib/freee/token/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index 30c6d38..9f711aa 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -71,7 +71,7 @@ def refresh_token(access_token, refresh_token, expires_at) refresh_token: refresh_token, expires_at: expires_at } - @access_token = OAuth2::AccessToken.new(refresh_token, expires_at, access_token, params) + @access_token = OAuth2::AccessToken.new(refresh_token, expires_at, access_token) begin @access_token.refresh! if @access_token.expired? rescue OAuth2::Error From 391c729d54063a0250d3231932f1985c241d6848 Mon Sep 17 00:00:00 2001 From: "arata@uniba.jp" Date: Fri, 26 May 2023 16:57:44 +0900 Subject: [PATCH 03/27] Update client.rb --- lib/freee/token/client.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index 9f711aa..cb1f5fb 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -67,11 +67,11 @@ def refresh_token(access_token, refresh_token, expires_at) raise 'アクセストークンが存在しません' if access_token.empty? raise 'アクセストークンの有効期限が指定されていません' if expires_at.nil? raise 'リフレッシュトークンが存在しません' if refresh_token.empty? - params = { - refresh_token: refresh_token, - expires_at: expires_at - } - @access_token = OAuth2::AccessToken.new(refresh_token, expires_at, access_token) + #params = { + #refresh_token: refresh_token, + #expires_at: expires_at + #} + @access_token = OAuth2::AccessToken.new(access_token, refresh_token, expires_at) begin @access_token.refresh! if @access_token.expired? rescue OAuth2::Error From b3646273573fcca13517cf0bd97a184c0a6eddcd Mon Sep 17 00:00:00 2001 From: "arata@uniba.jp" Date: Fri, 26 May 2023 17:43:05 +0900 Subject: [PATCH 04/27] Update client.rb --- lib/freee/token/client.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index cb1f5fb..4aa1bff 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -63,7 +63,7 @@ def get_access_token(code, redirect_uri) # @param refresh_token [String] Refresh Token # @param expires_at [Integer] アクセストークンの有効期限(UNIX TIME) # @return [Hash] アクセストークン - def refresh_token(access_token, refresh_token, expires_at) + def refresh_token(application_id, access_token, refresh_token, expires_at) raise 'アクセストークンが存在しません' if access_token.empty? raise 'アクセストークンの有効期限が指定されていません' if expires_at.nil? raise 'リフレッシュトークンが存在しません' if refresh_token.empty? @@ -71,7 +71,7 @@ def refresh_token(access_token, refresh_token, expires_at) #refresh_token: refresh_token, #expires_at: expires_at #} - @access_token = OAuth2::AccessToken.new(access_token, refresh_token, expires_at) + @access_token = OAuth2::AccessToken.new(application_id, access_token, refresh_token, expires_at) begin @access_token.refresh! if @access_token.expired? rescue OAuth2::Error From 208773c75efce3b4453a5c30b32de9e541e9d024 Mon Sep 17 00:00:00 2001 From: "arata@uniba.jp" Date: Fri, 26 May 2023 17:54:03 +0900 Subject: [PATCH 05/27] Update client.rb --- lib/freee/token/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index 4aa1bff..490a52d 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -71,7 +71,7 @@ def refresh_token(application_id, access_token, refresh_token, expires_at) #refresh_token: refresh_token, #expires_at: expires_at #} - @access_token = OAuth2::AccessToken.new(application_id, access_token, refresh_token, expires_at) + @access_token = OAuth2::AccessToken.new(application_id, access_token, refresh_token: refresh_token, expires_at: expires_at) begin @access_token.refresh! if @access_token.expired? rescue OAuth2::Error From 388a892c1086ea9a8df31123fb04e4fd8407d1eb Mon Sep 17 00:00:00 2001 From: "arata@uniba.jp" Date: Fri, 26 May 2023 17:55:52 +0900 Subject: [PATCH 06/27] Update client.rb --- lib/freee/token/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index 490a52d..99b9360 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -71,7 +71,7 @@ def refresh_token(application_id, access_token, refresh_token, expires_at) #refresh_token: refresh_token, #expires_at: expires_at #} - @access_token = OAuth2::AccessToken.new(application_id, access_token, refresh_token: refresh_token, expires_at: expires_at) + @access_token = OAuth2::AccessToken.new(access_token, refresh_token: refresh_token, expires_at: expires_at) begin @access_token.refresh! if @access_token.expired? rescue OAuth2::Error From 8896d1a81ac3dd069cda030a90970abe679a9a81 Mon Sep 17 00:00:00 2001 From: "arata@uniba.jp" Date: Fri, 26 May 2023 18:00:29 +0900 Subject: [PATCH 07/27] Update client.rb --- lib/freee/token/client.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index 99b9360..7c9cecb 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -63,7 +63,7 @@ def get_access_token(code, redirect_uri) # @param refresh_token [String] Refresh Token # @param expires_at [Integer] アクセストークンの有効期限(UNIX TIME) # @return [Hash] アクセストークン - def refresh_token(application_id, access_token, refresh_token, expires_at) + def refresh_token(application_id, secret, access_token, refresh_token, expires_at) raise 'アクセストークンが存在しません' if access_token.empty? raise 'アクセストークンの有効期限が指定されていません' if expires_at.nil? raise 'リフレッシュトークンが存在しません' if refresh_token.empty? @@ -71,7 +71,7 @@ def refresh_token(application_id, access_token, refresh_token, expires_at) #refresh_token: refresh_token, #expires_at: expires_at #} - @access_token = OAuth2::AccessToken.new(access_token, refresh_token: refresh_token, expires_at: expires_at) + @access_token = OAuth2::AccessToken.new(application_id: application_id, secret: secret, access_token, refresh_token: refresh_token, expires_at: expires_at) begin @access_token.refresh! if @access_token.expired? rescue OAuth2::Error From 217ec516a45e340bcc3f84d21c69374598740890 Mon Sep 17 00:00:00 2001 From: "arata@uniba.jp" Date: Fri, 26 May 2023 18:02:59 +0900 Subject: [PATCH 08/27] Update client.rb --- lib/freee/token/client.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index 7c9cecb..5c5f8e8 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -67,11 +67,15 @@ def refresh_token(application_id, secret, access_token, refresh_token, expires_a raise 'アクセストークンが存在しません' if access_token.empty? raise 'アクセストークンの有効期限が指定されていません' if expires_at.nil? raise 'リフレッシュトークンが存在しません' if refresh_token.empty? + client = { + application_id: application_id, + client: client + } #params = { #refresh_token: refresh_token, #expires_at: expires_at #} - @access_token = OAuth2::AccessToken.new(application_id: application_id, secret: secret, access_token, refresh_token: refresh_token, expires_at: expires_at) + @access_token = OAuth2::AccessToken.new(client, access_token, refresh_token: refresh_token, expires_at: expires_at) begin @access_token.refresh! if @access_token.expired? rescue OAuth2::Error From 8f9b21f16a2d51734126c813e4040064d65d0294 Mon Sep 17 00:00:00 2001 From: "arata@uniba.jp" Date: Fri, 26 May 2023 18:13:43 +0900 Subject: [PATCH 09/27] Update client.rb --- lib/freee/token/client.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index 5c5f8e8..dc01ab0 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -63,19 +63,15 @@ def get_access_token(code, redirect_uri) # @param refresh_token [String] Refresh Token # @param expires_at [Integer] アクセストークンの有効期限(UNIX TIME) # @return [Hash] アクセストークン - def refresh_token(application_id, secret, access_token, refresh_token, expires_at) + def refresh_token(refresh_token) raise 'アクセストークンが存在しません' if access_token.empty? raise 'アクセストークンの有効期限が指定されていません' if expires_at.nil? raise 'リフレッシュトークンが存在しません' if refresh_token.empty? - client = { - application_id: application_id, - client: client - } #params = { #refresh_token: refresh_token, #expires_at: expires_at #} - @access_token = OAuth2::AccessToken.new(client, access_token, refresh_token: refresh_token, expires_at: expires_at) + @access_token = OAuth2::AccessToken.from_hash(@client, refresh_token: refresh_token) begin @access_token.refresh! if @access_token.expired? rescue OAuth2::Error From 1634c1b27722052823a073c82241da4e57e9559d Mon Sep 17 00:00:00 2001 From: "arata@uniba.jp" Date: Fri, 26 May 2023 18:18:20 +0900 Subject: [PATCH 10/27] Update client.rb --- lib/freee/token/client.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index dc01ab0..2c11982 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -64,8 +64,8 @@ def get_access_token(code, redirect_uri) # @param expires_at [Integer] アクセストークンの有効期限(UNIX TIME) # @return [Hash] アクセストークン def refresh_token(refresh_token) - raise 'アクセストークンが存在しません' if access_token.empty? - raise 'アクセストークンの有効期限が指定されていません' if expires_at.nil? + #raise 'アクセストークンが存在しません' if access_token.empty? + #raise 'アクセストークンの有効期限が指定されていません' if expires_at.nil? raise 'リフレッシュトークンが存在しません' if refresh_token.empty? #params = { #refresh_token: refresh_token, From 5f39b1eb3772c14ccffbf3b66037950039c42220 Mon Sep 17 00:00:00 2001 From: "arata@uniba.jp" Date: Fri, 26 May 2023 18:20:05 +0900 Subject: [PATCH 11/27] Update client.rb --- lib/freee/token/client.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index 2c11982..a2836b1 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -71,9 +71,11 @@ def refresh_token(refresh_token) #refresh_token: refresh_token, #expires_at: expires_at #} - @access_token = OAuth2::AccessToken.from_hash(@client, refresh_token: refresh_token) + token = OAuth2::AccessToken.from_hash(@client, refresh_token: refresh_token) + new_token = token.refresh! + access_token = new_token.token begin - @access_token.refresh! if @access_token.expired? + return access_token rescue OAuth2::Error raise 'アクセストークンの取得に失敗しました。次の原因が考えられます。原因: 不明なクライアント、アクセストークンが不正、リフレッシュトークンが不正、有効期限が不正。' end From 3e5d625ab0b70abf5d34132e13cf2d76dc51aa0b Mon Sep 17 00:00:00 2001 From: "arata@uniba.jp" Date: Fri, 26 May 2023 18:51:44 +0900 Subject: [PATCH 12/27] Update client.rb --- lib/freee/token/client.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/freee/token/client.rb b/lib/freee/token/client.rb index a2836b1..59263f6 100644 --- a/lib/freee/token/client.rb +++ b/lib/freee/token/client.rb @@ -73,9 +73,8 @@ def refresh_token(refresh_token) #} token = OAuth2::AccessToken.from_hash(@client, refresh_token: refresh_token) new_token = token.refresh! - access_token = new_token.token begin - return access_token + return new_token rescue OAuth2::Error raise 'アクセストークンの取得に失敗しました。次の原因が考えられます。原因: 不明なクライアント、アクセストークンが不正、リフレッシュトークンが不正、有効期限が不正。' end From 07ef41f07e05153bb6048e0bb95f45f3db58ff4c Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 2 Jul 2024 16:02:48 +0900 Subject: [PATCH 13/27] Create client.rb --- lib/freee/segment_tag/client.rb | 55 +++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 lib/freee/segment_tag/client.rb diff --git a/lib/freee/segment_tag/client.rb b/lib/freee/segment_tag/client.rb new file mode 100644 index 0000000..48f4772 --- /dev/null +++ b/lib/freee/segment_tag/client.rb @@ -0,0 +1,55 @@ +# frozen_string_literal: true + +require 'faraday' +require 'json' + +module Freee + module Api + class Tags + BASE_URL = 'https://api.freee.co.jp' + PATH = '/api/1/segments/1/tags' + + def initialize + @client = Faraday.new(url: BASE_URL) do |faraday| + faraday.request :json + faraday.response :json, content_type: /\bjson$/ + faraday.adapter Faraday.default_adapter + end + end + + # タグ一覧の取得 + def get_tags(access_token, company_id) + raise 'アクセストークンが設定されていません' if access_token.empty? + + response = @client.get(PATH, { company_id: company_id }, 'Authorization' => "Bearer #{access_token}") + handle_response(response, 'fetch') + end + + # タグの作成 + def post_tags(access_token, data) + raise 'アクセストークンが設定されていません' if access_token.empty? + + response = @client.post(PATH, data.to_json, 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json') + handle_response(response, 'create') + end + + private + + def handle_response(response, action) + case response.status + when 200, 201 + if action == 'fetch' + Rails.logger.info "Tags fetched successfully: #{response.body}" + response.body + elsif action == 'create' + Rails.logger.info "Successfully created tag: segment_tag_id=#{response.body.dig('segment_tag', 'id')}" + response.body.dig('segment_tag', 'id') + end + else + Rails.logger.error "Failed to #{action} tags: #{response.body}" + nil + end + end + end + end +end From f9aa852efe3b59e17a801480ae3e868d03d55db0 Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 2 Jul 2024 17:42:00 +0900 Subject: [PATCH 14/27] =?UTF-8?q?=E5=90=8D=E5=89=8D=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/freee/{segment_tag => tags}/client.rb | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lib/freee/{segment_tag => tags}/client.rb (100%) diff --git a/lib/freee/segment_tag/client.rb b/lib/freee/tags/client.rb similarity index 100% rename from lib/freee/segment_tag/client.rb rename to lib/freee/tags/client.rb From bb3794cff1c5c65e662ad048838d523c3811fc56 Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 2 Jul 2024 18:24:29 +0900 Subject: [PATCH 15/27] =?UTF-8?q?tag=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/freee/api.rb | 1 + lib/freee/tags/client.rb | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/freee/api.rb b/lib/freee/api.rb index e6ecf7c..ca8dad7 100644 --- a/lib/freee/api.rb +++ b/lib/freee/api.rb @@ -16,3 +16,4 @@ require 'freee/token/client' require 'freee/walletables/client' require 'freee/wallet_txns/client' +require 'freee/tags/client' diff --git a/lib/freee/tags/client.rb b/lib/freee/tags/client.rb index 48f4772..83a38a2 100644 --- a/lib/freee/tags/client.rb +++ b/lib/freee/tags/client.rb @@ -1,7 +1,3 @@ -# frozen_string_literal: true - -require 'faraday' -require 'json' module Freee module Api From 7b1ba472f73b4edac21af41a9907361fa4c1014c Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 2 Jul 2024 19:04:24 +0900 Subject: [PATCH 16/27] Update client.rb --- lib/freee/tags/client.rb | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/lib/freee/tags/client.rb b/lib/freee/tags/client.rb index 83a38a2..84f7f04 100644 --- a/lib/freee/tags/client.rb +++ b/lib/freee/tags/client.rb @@ -1,9 +1,10 @@ +# frozen_string_literal: true module Freee module Api class Tags - BASE_URL = 'https://api.freee.co.jp' PATH = '/api/1/segments/1/tags' + PATH.freeze def initialize @client = Faraday.new(url: BASE_URL) do |faraday| @@ -16,9 +17,19 @@ def initialize # タグ一覧の取得 def get_tags(access_token, company_id) raise 'アクセストークンが設定されていません' if access_token.empty? - - response = @client.get(PATH, { company_id: company_id }, 'Authorization' => "Bearer #{access_token}") - handle_response(response, 'fetch') + raise '事業所IDが設定されていません' unless params.key?(:company_id) + @client.authorization :Bearer, access_token + response = @client.get do |req| + req.url PATH + req.params = params + end + case response.status + when 400 + raise StandardError, response.body + when 401 + raise 'Unauthorized' + end + response end # タグの作成 @@ -29,23 +40,7 @@ def post_tags(access_token, data) handle_response(response, 'create') end - private - def handle_response(response, action) - case response.status - when 200, 201 - if action == 'fetch' - Rails.logger.info "Tags fetched successfully: #{response.body}" - response.body - elsif action == 'create' - Rails.logger.info "Successfully created tag: segment_tag_id=#{response.body.dig('segment_tag', 'id')}" - response.body.dig('segment_tag', 'id') - end - else - Rails.logger.error "Failed to #{action} tags: #{response.body}" - nil - end - end end end end From 88d20feea9d502ee01ea8afc3b302ffb23408221 Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 2 Jul 2024 19:08:16 +0900 Subject: [PATCH 17/27] Update client.rb --- lib/freee/tags/client.rb | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/freee/tags/client.rb b/lib/freee/tags/client.rb index 84f7f04..5309a75 100644 --- a/lib/freee/tags/client.rb +++ b/lib/freee/tags/client.rb @@ -7,7 +7,7 @@ class Tags PATH.freeze def initialize - @client = Faraday.new(url: BASE_URL) do |faraday| + @client = Faraday.new(url: Parameter::SITE) do |faraday| faraday.request :json faraday.response :json, content_type: /\bjson$/ faraday.adapter Faraday.default_adapter @@ -33,11 +33,23 @@ def get_tags(access_token, company_id) end # タグの作成 - def post_tags(access_token, data) + def create_deal(access_token, params) raise 'アクセストークンが設定されていません' if access_token.empty? - - response = @client.post(PATH, data.to_json, 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json') - handle_response(response, 'create') + raise '収入・支出の発生日が指定されていません' unless params.key?(:issue_date) + raise '収支区分が指定されていません' unless params.key?(:type) + raise '事業所IDが設定されていません' unless params.key?(:company_id) + @client.authorization :Bearer, access_token + response = @client.post do |req| + req.url PATH + req.body = params.to_json + end + case response.status + when 400 + raise StandardError, response.body + when 401 + raise 'Unauthorized' + end + response end From 593d2876fc843db094ecbf27f28dce6d4f5bc453 Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 2 Jul 2024 19:28:40 +0900 Subject: [PATCH 18/27] Update client.rb --- lib/freee/tags/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freee/tags/client.rb b/lib/freee/tags/client.rb index 5309a75..295aac2 100644 --- a/lib/freee/tags/client.rb +++ b/lib/freee/tags/client.rb @@ -15,7 +15,7 @@ def initialize end # タグ一覧の取得 - def get_tags(access_token, company_id) + def get_tags(access_token, params) raise 'アクセストークンが設定されていません' if access_token.empty? raise '事業所IDが設定されていません' unless params.key?(:company_id) @client.authorization :Bearer, access_token From b6bb284910a73c24ab3914bf6ce3770fefc4b89a Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 9 Jul 2024 18:27:25 +0900 Subject: [PATCH 19/27] Update client.rb --- lib/freee/tags/client.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/freee/tags/client.rb b/lib/freee/tags/client.rb index 295aac2..b353d9f 100644 --- a/lib/freee/tags/client.rb +++ b/lib/freee/tags/client.rb @@ -21,7 +21,7 @@ def get_tags(access_token, params) @client.authorization :Bearer, access_token response = @client.get do |req| req.url PATH - req.params = params + req.params = params.to_json end case response.status when 400 @@ -33,7 +33,7 @@ def get_tags(access_token, params) end # タグの作成 - def create_deal(access_token, params) + def create_tag(access_token, params) raise 'アクセストークンが設定されていません' if access_token.empty? raise '収入・支出の発生日が指定されていません' unless params.key?(:issue_date) raise '収支区分が指定されていません' unless params.key?(:type) From d1a97e297fdcc4f8122c98524a923321965e26c1 Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 9 Jul 2024 18:34:46 +0900 Subject: [PATCH 20/27] Update client.rb --- lib/freee/tags/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freee/tags/client.rb b/lib/freee/tags/client.rb index b353d9f..bca5ae8 100644 --- a/lib/freee/tags/client.rb +++ b/lib/freee/tags/client.rb @@ -21,7 +21,7 @@ def get_tags(access_token, params) @client.authorization :Bearer, access_token response = @client.get do |req| req.url PATH - req.params = params.to_json + req.params = params end case response.status when 400 From 028d016f2bb09e00527a4b16fa249ae9a90a7504 Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 23 Jul 2024 17:29:47 +0900 Subject: [PATCH 21/27] Update client.rb --- lib/freee/tags/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freee/tags/client.rb b/lib/freee/tags/client.rb index bca5ae8..76c8952 100644 --- a/lib/freee/tags/client.rb +++ b/lib/freee/tags/client.rb @@ -41,7 +41,7 @@ def create_tag(access_token, params) @client.authorization :Bearer, access_token response = @client.post do |req| req.url PATH - req.body = params.to_json + req.body = params end case response.status when 400 From 89376c953e3819441ea346cf1b8ee5196c7a330a Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 23 Jul 2024 19:35:31 +0900 Subject: [PATCH 22/27] Update client.rb --- lib/freee/tags/client.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/freee/tags/client.rb b/lib/freee/tags/client.rb index 76c8952..361e364 100644 --- a/lib/freee/tags/client.rb +++ b/lib/freee/tags/client.rb @@ -35,8 +35,6 @@ def get_tags(access_token, params) # タグの作成 def create_tag(access_token, params) raise 'アクセストークンが設定されていません' if access_token.empty? - raise '収入・支出の発生日が指定されていません' unless params.key?(:issue_date) - raise '収支区分が指定されていません' unless params.key?(:type) raise '事業所IDが設定されていません' unless params.key?(:company_id) @client.authorization :Bearer, access_token response = @client.post do |req| From e3b15fd37fdc8b36770ef2428720b0bb12b892cd Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 30 Jul 2024 11:56:30 +0900 Subject: [PATCH 23/27] Update client.rb --- lib/freee/deals/client.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/freee/deals/client.rb b/lib/freee/deals/client.rb index c878f12..b006d5e 100644 --- a/lib/freee/deals/client.rb +++ b/lib/freee/deals/client.rb @@ -21,6 +21,23 @@ def initialize # @param access_token [String] アクセストークン # @param params [Hash] 新規取引作成用のパラメータ # @return [Hash] 取引作成の結果 + + def get_deals(access_token, params) + @client.authorization :Bearer, access_token + + response = @client.post do |req| + req.url PATH + req.body = params + end + case response.status + when 400 + raise StandardError, response.body + when 401 + raise 'Unauthorized' + end + response + end + def create_deal(access_token, params) raise 'アクセストークンが設定されていません' if access_token.empty? raise '収入・支出の発生日が指定されていません' unless params.key?(:issue_date) From 8a3b3ea3f4b6de23c7c2a2fbde08562be5d3c888 Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 30 Jul 2024 12:04:33 +0900 Subject: [PATCH 24/27] Update client.rb --- lib/freee/deals/client.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/freee/deals/client.rb b/lib/freee/deals/client.rb index b006d5e..29bdd92 100644 --- a/lib/freee/deals/client.rb +++ b/lib/freee/deals/client.rb @@ -22,12 +22,13 @@ def initialize # @param params [Hash] 新規取引作成用のパラメータ # @return [Hash] 取引作成の結果 - def get_deals(access_token, params) + def get_tags(access_token, params) + raise 'アクセストークンが設定されていません' if access_token.empty? + raise '事業所IDが設定されていません' unless params.key?(:company_id) @client.authorization :Bearer, access_token - - response = @client.post do |req| + response = @client.get do |req| req.url PATH - req.body = params + req.params = params end case response.status when 400 From b0a5a0d73028ae68a4a6fbe91f03123dcfe848c9 Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 30 Jul 2024 12:08:06 +0900 Subject: [PATCH 25/27] Update client.rb --- lib/freee/deals/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freee/deals/client.rb b/lib/freee/deals/client.rb index 29bdd92..a325055 100644 --- a/lib/freee/deals/client.rb +++ b/lib/freee/deals/client.rb @@ -22,7 +22,7 @@ def initialize # @param params [Hash] 新規取引作成用のパラメータ # @return [Hash] 取引作成の結果 - def get_tags(access_token, params) + def get_deals(access_token, params) raise 'アクセストークンが設定されていません' if access_token.empty? raise '事業所IDが設定されていません' unless params.key?(:company_id) @client.authorization :Bearer, access_token From 6675013d4356a983f9a995b996fa71988b40dd2d Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 30 Jul 2024 12:20:52 +0900 Subject: [PATCH 26/27] Update client.rb --- lib/freee/deals/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freee/deals/client.rb b/lib/freee/deals/client.rb index a325055..4fc12de 100644 --- a/lib/freee/deals/client.rb +++ b/lib/freee/deals/client.rb @@ -36,7 +36,7 @@ def get_deals(access_token, params) when 401 raise 'Unauthorized' end - response + puts response end def create_deal(access_token, params) From 56ef3ee6c53be5790a74a2c708f49ed8fd3816c1 Mon Sep 17 00:00:00 2001 From: arata83 Date: Tue, 30 Jul 2024 12:26:40 +0900 Subject: [PATCH 27/27] Update client.rb --- lib/freee/deals/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freee/deals/client.rb b/lib/freee/deals/client.rb index 4fc12de..a325055 100644 --- a/lib/freee/deals/client.rb +++ b/lib/freee/deals/client.rb @@ -36,7 +36,7 @@ def get_deals(access_token, params) when 401 raise 'Unauthorized' end - puts response + response end def create_deal(access_token, params)