From 1949f1876fbbeda883b39b502f8b1990c24e496c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Thu, 7 Sep 2023 19:21:00 +0200 Subject: [PATCH] Use attr_reader instead of shared instance variables --- .../btcpay_manager/fetch_lightning_wallet_balance.rb | 2 +- app/services/btcpay_manager/fetch_onchain_wallet_balance.rb | 2 +- app/services/btcpay_manager_service.rb | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/services/btcpay_manager/fetch_lightning_wallet_balance.rb b/app/services/btcpay_manager/fetch_lightning_wallet_balance.rb index 156d6aa..533d2f1 100644 --- a/app/services/btcpay_manager/fetch_lightning_wallet_balance.rb +++ b/app/services/btcpay_manager/fetch_lightning_wallet_balance.rb @@ -1,7 +1,7 @@ module BtcpayManager class FetchLightningWalletBalance < BtcpayManagerService def call - res = get "stores/#{@store_id}/lightning/BTC/balance" + res = get "stores/#{store_id}/lightning/BTC/balance" { balance: res["offchain"]["local"].to_i / 1000 # msats to sats diff --git a/app/services/btcpay_manager/fetch_onchain_wallet_balance.rb b/app/services/btcpay_manager/fetch_onchain_wallet_balance.rb index 2907d1b..e28f197 100644 --- a/app/services/btcpay_manager/fetch_onchain_wallet_balance.rb +++ b/app/services/btcpay_manager/fetch_onchain_wallet_balance.rb @@ -1,7 +1,7 @@ module BtcpayManager class FetchOnchainWalletBalance < BtcpayManagerService def call - res = get "stores/#{@store_id}/payment-methods/onchain/BTC/wallet" + res = get "stores/#{store_id}/payment-methods/onchain/BTC/wallet" { balance: (res["balance"].to_f * 100000000).to_i, # BTC to sats diff --git a/app/services/btcpay_manager_service.rb b/app/services/btcpay_manager_service.rb index 0affb73..d8fbf09 100644 --- a/app/services/btcpay_manager_service.rb +++ b/app/services/btcpay_manager_service.rb @@ -2,6 +2,8 @@ # API Docs: https://docs.btcpayserver.org/API/Greenfield/v1/ # class BtcpayManagerService < ApplicationService + attr_reader :base_url, :store_id, :auth_token + def initialize @base_url = Setting.btcpay_api_url @store_id = Setting.btcpay_store_id @@ -11,10 +13,10 @@ class BtcpayManagerService < ApplicationService private def get(endpoint) - res = Faraday.get("#{@base_url}/#{endpoint}", {}, { + res = Faraday.get("#{base_url}/#{endpoint}", {}, { "Content-Type" => "application/json", "Accept" => "application/json", - "Authorization" => "token #{@auth_token}" + "Authorization" => "token #{auth_token}" }) JSON.parse(res.body)