ledger_sync 1.4.4 → 1.5.0

data/lib/ledger_sync/ledgers/quickbooks_online/bill_payment/serializer.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../currency/serializer'
-require_relative '../department/serializer'
-require_relative '../bill_payment_line_item/serializer'
+require_relative '../reference/serializer'
+require_relative '../bill_payment_line/serializer'
+require_relative '../credit_card_payment/serializer'
+require_relative '../check_payment/serializer'
 
 module LedgerSync
   module Ledgers
@@ -11,65 +12,42 @@ module LedgerSync
         class Serializer < QuickBooksOnline::Serializer
           id
 
-          amount 'TotalAmt',
-                 resource_attribute: :amount
+          amount :TotalAmt
+          attribute :DocNumber
+          attribute :PrivateNote
+          attribute :ExchangeRate
+          date :TxnDate
 
-          references_one :CurrencyRef,
-                         resource_attribute: :currency,
-                         serializer: Currency::Serializer
-
-          attribute 'VendorRef.value',
-                    resource_attribute: 'vendor.ledger_id'
-
-          attribute 'DepartmentRef.value',
-                    resource_attribute: 'department.ledger_id'
-
-          attribute 'APAccountRef.value',
-                    resource_attribute: 'account.ledger_id'
-
-          attribute 'DocNumber',
-                    resource_attribute: :reference_number
-
-          attribute 'PrivateNote',
-                    resource_attribute: :memo
-
-          attribute 'ExchangeRate',
-                    resource_attribute: :exchange_rate
+          mapping :PayType,
+                  hash: BillPayment::PAYMENT_TYPES
 
-          date 'TxnDate',
-               resource_attribute: :transaction_date
+          references_one 'CurrencyRef',
+                         resource_attribute: :Currency,
+                         serializer: Reference::Serializer
 
-          mapping 'PayType',
-                  resource_attribute: :payment_type,
-                  hash: BillPayment::PAYMENT_TYPES
+          references_one 'VendorRef',
+                         resource_attribute: :Vendor,
+                         serializer: Reference::Serializer
 
-          attribute 'CreditCardPayment' do |args = {}|
-            resource = args.fetch(:resource)
+          references_one 'DepartmentRef',
+                         resource_attribute: :Department,
+                         serializer: Reference::Serializer
 
-            if resource.credit_card_account
-              {
-                'CCAccountRef' => {
-                  'value' => resource.credit_card_account.ledger_id
-                }
-              }
-            end
-          end
+          references_one 'APAccountRef',
+                         resource_attribute: :APAccount,
+                         serializer: Reference::Serializer
 
-          attribute 'CheckPayment' do |args = {}|
-            resource = args.fetch(:resource)
+          references_one 'CreditCardPayment',
+                         resource_attribute: :CreditCardPayment,
+                         serializer: CreditCardPayment::Serializer
 
-            if resource.bank_account
-              {
-                'BankAccountRef' => {
-                  'value' => resource.bank_account.ledger_id
-                }
-              }
-            end
-          end
+          references_one 'CheckPayment',
+                         resource_attribute: :CheckPayment,
+                         serializer: CheckPayment::Serializer
 
           references_many 'Line',
-                          resource_attribute: :line_items,
-                          serializer: BillPaymentLineItem::Serializer
+                          resource_attribute: :Line,
+                          serializer: BillPaymentLine::Serializer
         end
       end
     end

data/lib/ledger_sync/ledgers/quickbooks_online/{bill_payment_line_item → bill_payment_line}/deserializer.rb

@@ -3,13 +3,11 @@
 module LedgerSync
   module Ledgers
     module QuickBooksOnline
-      class BillPaymentLineItem
+      class BillPaymentLine
         class Deserializer < QuickBooksOnline::Deserializer
-          amount :amount,
-                 hash_attribute: 'Amount'
+          amount :Amount
 
-          attribute :ledger_transactions,
-                    hash_attribute: 'LinkedTxn',
+          attribute :LinkedTxn,
                     type: Serialization::Type::DeserializeTransactionReferenceType.new
         end
       end

data/lib/ledger_sync/ledgers/quickbooks_online/{bill_payment_line_item → bill_payment_line}/serializer.rb

@@ -3,13 +3,11 @@
 module LedgerSync
   module Ledgers
     module QuickBooksOnline
-      class BillPaymentLineItem
+      class BillPaymentLine
         class Serializer < QuickBooksOnline::Serializer
-          amount 'Amount',
-                 resource_attribute: :amount
+          amount :Amount
 
-          attribute 'LinkedTxn',
-                    resource_attribute: :ledger_transactions,
+          attribute :LinkedTxn,
                     type: Serialization::Type::SerializeTransactionReferenceType.new
         end
       end

data/lib/ledger_sync/ledgers/quickbooks_online/check_payment/deserializer.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative '../reference/deserializer'
+
+module LedgerSync
+  module Ledgers
+    module QuickBooksOnline
+      class CheckPayment
+        class Deserializer < QuickBooksOnline::Deserializer
+          references_one :BankAccount,
+                         hash_attribute: 'BankAccountRef',
+                         deserializer: Reference::Deserializer
+        end
+      end
+    end
+  end
+end

data/lib/ledger_sync/ledgers/quickbooks_online/check_payment/serializer.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative '../reference/serializer'
+
+module LedgerSync
+  module Ledgers
+    module QuickBooksOnline
+      class CheckPayment
+        class Serializer < QuickBooksOnline::Serializer
+          references_one 'BankAccountRef',
+                         resource_attribute: :BankAccount,
+                         serializer: Reference::Serializer
+        end
+      end
+    end
+  end
+end

data/lib/ledger_sync/ledgers/quickbooks_online/client.rb

@@ -6,7 +6,9 @@ require_relative 'dashboard_url_helper'
 module LedgerSync
   module Ledgers
     module QuickBooksOnline
-      class Client < Ledgers::Client
+      class Client
+        include Ledgers::Client::Mixin
+
         OAUTH_HEADERS     = { 'Accept' => 'application/json', 'Content-Type' => 'application/json' }.freeze
         ROOT_URI          = 'https://quickbooks.api.intuit.com'
         REVOKE_TOKEN_URI  = 'https://developer.api.intuit.com/v2/oauth2/tokens/revoke'
@@ -50,6 +52,8 @@ module LedgerSync
           @root_uri = (test ? ROOT_SANDBOX_URI : ROOT_URI)
 
           update_secrets_in_dotenv if update_dotenv
+
+          super()
         end
 
         def authorization_url(redirect_uri:)
@@ -92,7 +96,7 @@ module LedgerSync
           )
         end
 
-        def query(limit: 10, offset: 1, query:, resource_class:)
+        def query(query:, resource_class:, limit: 10, offset: 1)
           ledger_resource_type = self.class.ledger_resource_type_for(
             resource_class: resource_class
           ).classify
@@ -118,7 +122,7 @@ module LedgerSync
 
         def revoke_token!
           headers = OAUTH_HEADERS.dup.merge(
-            'Authorization' => 'Basic ' + Base64.strict_encode64(client_id + ':' + client_secret)
+            'Authorization' => "Basic #{Base64.strict_encode64("#{client_id}:#{client_secret}")}"
           )
           LedgerSync::Ledgers::Request.new(
             body: {
@@ -130,7 +134,7 @@ module LedgerSync
           ).perform.status == 200
         end
 
-        def set_credentials_from_oauth_code(code:, realm_id: nil, redirect_uri:)
+        def set_credentials_from_oauth_code(code:, redirect_uri:, realm_id: nil)
           oauth_token = oauth_client.get_token(
             code: code,
             redirect_uri: redirect_uri
@@ -232,7 +236,7 @@ module LedgerSync
           @oauth_base_uri ||= "#{root_uri}/v3/company/#{realm_id}"
         end
 
-        def request(body: nil, headers: {}, method:, url:)
+        def request(method:, url:, body: nil, headers: {})
           Request.new(
             client: self,
             body: body,
@@ -242,7 +246,7 @@ module LedgerSync
           ).perform
         end
 
-        def set_credentials_from_oauth_token(realm_id: nil, token:)
+        def set_credentials_from_oauth_token(token:, realm_id: nil) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
           @previous_access_tokens << access_token if access_token.present?
           @access_token = token.token
 

data/lib/ledger_sync/ledgers/quickbooks_online/config.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-LedgerSync.register_ledger(:quickbooks_online, module_string: 'QuickBooksOnline') do |config|
+require_relative 'client'
+
+LedgerSync.register_ledger(:quickbooks_online, base_module: LedgerSync::Ledgers::QuickBooksOnline) do |config|
   config.name = 'QuickBooks Online'
   config.add_alias :qbo
   config.add_alias :quick_books_online

data/lib/ledger_sync/ledgers/quickbooks_online/credit_card_payment/deserializer.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative '../reference/deserializer'
+
+module LedgerSync
+  module Ledgers
+    module QuickBooksOnline
+      class CreditCardPayment
+        class Deserializer < QuickBooksOnline::Deserializer
+          references_one :CCAccount,
+                         hash_attribute: 'CCAccountRef',
+                         deserializer: Reference::Deserializer
+        end
+      end
+    end
+  end
+end

data/lib/ledger_sync/ledgers/quickbooks_online/credit_card_payment/serializer.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative '../reference/serializer'
+
+module LedgerSync
+  module Ledgers
+    module QuickBooksOnline
+      class CreditCardPayment
+        class Serializer < QuickBooksOnline::Serializer
+          references_one 'CCAccountRef',
+                         resource_attribute: :CCAccount,
+                         serializer: Reference::Serializer
+        end
+      end
+    end
+  end
+end

data/lib/ledger_sync/ledgers/quickbooks_online/currency/deserializer.rb

@@ -5,11 +5,10 @@ module LedgerSync
     module QuickBooksOnline
       class Currency
         class Deserializer < QuickBooksOnline::Deserializer
-          attribute :symbol,
+          attribute :Symbol,
                     hash_attribute: :value
 
-          attribute :name,
-                    hash_attribute: :name
+          attribute :Name
         end
       end
     end

data/lib/ledger_sync/ledgers/quickbooks_online/currency/serializer.rb

@@ -6,9 +6,10 @@ module LedgerSync
       class Currency
         class Serializer < QuickBooksOnline::Serializer
           attribute :value,
-                    resource_attribute: :symbol
+                    resource_attribute: :Symbol
 
-          attribute :name
+          attribute :name,
+                    resource_attribute: :Name
         end
       end
     end

data/lib/ledger_sync/ledgers/quickbooks_online/customer/deserializer.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative '../primary_phone/deserializer'
+require_relative '../primary_email_addr/deserializer'
+
 module LedgerSync
   module Ledgers
     module QuickBooksOnline
@@ -8,10 +11,14 @@ module LedgerSync
           id
 
           attribute :DisplayName
+          attribute :GivenName
+          attribute :FamilyName
+          attribute :MiddleName
 
-          attribute 'PrimaryPhone.FreeFormNumber'
-
-          attribute 'PrimaryEmailAddr.Address'
+          references_one :PrimaryPhone,
+                         deserializer: PrimaryPhone::Deserializer
+          references_one :PrimaryEmailAddr,
+                         deserializer: PrimaryEmailAddr::Deserializer
         end
       end
     end

data/lib/ledger_sync/ledgers/quickbooks_online/customer/operations/create.rb

@@ -10,12 +10,12 @@ module LedgerSync
               params do
                 required(:external_id).maybe(:string)
                 required(:ledger_id).value(:nil)
+                required(:DisplayName).maybe(:string)
+                required(:FamilyName).maybe(:string)
+                required(:GivenName).maybe(:string)
+                required(:MiddleName).maybe(:string)
                 required(:PrimaryEmailAddr).maybe(:hash, Types::Reference)
-                optional(:DisplayName).filled(:string)
-                optional(:firstName).maybe(:string)
-                optional(:lastName).maybe(:string)
                 required(:PrimaryPhone).maybe(:hash, Types::Reference)
-                required(:subsidiary).maybe(:hash, Types::Reference)
               end
             end
           end

data/lib/ledger_sync/ledgers/quickbooks_online/customer/operations/find.rb

@@ -10,12 +10,12 @@ module LedgerSync
               params do
                 required(:external_id).maybe(:string)
                 required(:ledger_id).filled(:string)
-                required(:PrimaryEmailAddr).maybe(:hash, Types::Reference)
                 optional(:DisplayName).maybe(:string)
-                optional(:firstName).maybe(:string)
-                optional(:lastName).maybe(:string)
-                required(:PrimaryPhone).maybe(:hash, Types::Reference)
-                required(:subsidiary).maybe(:hash, Types::Reference)
+                optional(:FamilyName).maybe(:string)
+                optional(:GivenName).maybe(:string)
+                optional(:MiddleName).maybe(:string)
+                optional(:PrimaryEmailAddr).maybe(:hash, Types::Reference)
+                optional(:PrimaryPhone).maybe(:hash, Types::Reference)
               end
             end
           end

data/lib/ledger_sync/ledgers/quickbooks_online/customer/operations/update.rb

@@ -10,12 +10,12 @@ module LedgerSync
               params do
                 required(:external_id).maybe(:string)
                 required(:ledger_id).filled(:string)
+                required(:DisplayName).maybe(:string)
+                required(:FamilyName).maybe(:string)
+                required(:GivenName).maybe(:string)
+                required(:MiddleName).maybe(:string)
                 required(:PrimaryEmailAddr).maybe(:hash, Types::Reference)
-                optional(:DisplayName).filled(:string)
-                optional(:firstName).maybe(:string)
-                optional(:lastName).maybe(:string)
                 required(:PrimaryPhone).maybe(:hash, Types::Reference)
-                required(:subsidiary).maybe(:hash, Types::Reference)
               end
             end
           end

data/lib/ledger_sync/ledgers/quickbooks_online/customer/serializer.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative '../primary_phone/serializer'
+require_relative '../primary_email_addr/serializer'
+
 module LedgerSync
   module Ledgers
     module QuickBooksOnline
@@ -8,10 +11,14 @@ module LedgerSync
           id
 
           attribute :DisplayName
+          attribute :GivenName
+          attribute :FamilyName
+          attribute :MiddleName
 
-          attribute 'PrimaryPhone.FreeFormNumber'
-
-          attribute 'PrimaryEmailAddr.Address'
+          references_one :PrimaryPhone,
+                         serializer: PrimaryPhone::Serializer
+          references_one :PrimaryEmailAddr,
+                         serializer: PrimaryEmailAddr::Serializer
         end
       end
     end

data/lib/ledger_sync/ledgers/quickbooks_online/department/deserializer.rb

@@ -7,20 +7,14 @@ module LedgerSync
         class Deserializer < QuickBooksOnline::Deserializer
           id
 
-          attribute :name,
-                    hash_attribute: 'Name'
-          attribute :active,
-                    hash_attribute: 'Active'
-          attribute :sub_department,
-                    hash_attribute: 'SubDepartment'
-          attribute :fully_qualified_name,
-                    hash_attribute: 'FullyQualifiedName'
+          attribute :Name
+          attribute :Active
+          attribute :SubDepartment
+          attribute :FullyQualifiedName
 
-          attribute(:parent) do |args = {}|
-            hash = args.fetch(:hash)
-
-            LedgerSync::QuickBooks::Department.new(ledger_id: hash['ParentRef']) if hash['ParentRef'].nil?
-          end
+          references_one :Parent,
+                         hash_attribute: 'ParentRef',
+                         deserializer: Reference::Deserializer
         end
       end
     end