ledger_sync 1.1.3 → 1.3.1

data/lib/ledger_sync/adaptors/quickbooks_online/operation/create.rb

@@ -12,14 +12,11 @@ module LedgerSync
           private
 
           def operate
-            response = adaptor.post(
-              resource: quickbooks_online_resource_type,
-              payload: ledger_serializer.to_ledger_hash
-            )
-
-            success(
-              resource: ledger_serializer.deserialize(hash: response),
-              response: response
+            result(
+              response: adaptor.post(
+                path: ledger_resource_type_for_path,
+                payload: ledger_serializer.to_ledger_hash
+              )
             )
           end
         end

data/lib/ledger_sync/adaptors/quickbooks_online/operation/find.rb

@@ -12,16 +12,16 @@ module LedgerSync
           private
 
           def operate
-            return failure(nil) if resource.ledger_id.nil?
+            return failure(
+              Errors::OperationError::LedgerIDRequired.new(
+                operation: self
+              )
+            ) if resource.ledger_id.nil?
 
-            response = adaptor.find(
-              resource: quickbooks_online_resource_type,
-              id: resource.ledger_id
-            )
-
-            success(
-              resource: ledger_serializer.deserialize(hash: response),
-              response: response
+            result(
+              response: adaptor.find(
+                path: ledger_resource_path
+              )
             )
           end
         end

data/lib/ledger_sync/adaptors/quickbooks_online/operation/full_update.rb

@@ -13,27 +13,29 @@ module LedgerSync
 
           def find_resource
             adaptor.find(
-              resource: quickbooks_online_resource_type,
-              id: resource.ledger_id
+              path: ledger_resource_path
             )
           end
 
           def operate
-            update_resource(find_resource)
-          end
-
-          def update_resource(find_result_hash)
-            merged_resource = ledger_serializer.deserialize(hash: find_result_hash, merge_for_full_update: true)
-            merged_serializer = ledger_serializer.class.new(resource: merged_resource)
-
-            response = adaptor.post(
-              resource: quickbooks_online_resource_type,
-              payload: merged_serializer.to_ledger_hash(deep_merge_unmapped_values: find_result_hash)
+            find_result_hash = find_resource.body.dig(
+              quickbooks_online_resource_type.to_s.classify
+            )
+            merged_resource = ledger_serializer.deserialize(
+              hash: find_result_hash,
+              merge_for_full_update: true
+            )
+            merged_serializer = ledger_serializer.class.new(
+              resource: merged_resource
             )
 
-            success(
-              resource: ledger_serializer.deserialize(hash: response),
-              response: response
+            result(
+              response: adaptor.post(
+                path: ledger_resource_type_for_path,
+                payload: merged_serializer.to_ledger_hash(
+                  deep_merge_unmapped_values: find_result_hash
+                )
+              )
             )
           end
         end

data/lib/ledger_sync/adaptors/quickbooks_online/payment/ledger_serializer.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../payment_line_item/ledger_serializer'
+
 module LedgerSync
   module Adaptors
     module QuickBooksOnline
@@ -16,6 +18,29 @@ module LedgerSync
 
           attribute ledger_attribute: 'CustomerRef.value',
                     resource_attribute: 'customer.ledger_id'
+
+          attribute ledger_attribute: 'DepositToAccountRef.value',
+                    resource_attribute: 'deposit_account.ledger_id'
+
+          attribute ledger_attribute: 'ARAccountRef.value',
+                    resource_attribute: 'account.ledger_id'
+
+          attribute ledger_attribute: 'PaymentRefNum',
+                    resource_attribute: :reference_number
+
+          attribute ledger_attribute: 'PrivateNote',
+                    resource_attribute: :memo
+
+          attribute ledger_attribute: 'ExchangeRate',
+                    resource_attribute: :exchange_rate
+
+          attribute ledger_attribute: 'TxnDate',
+                    resource_attribute: :transaction_date,
+                    type: LedgerSerializerType::DateType
+
+          references_many ledger_attribute: 'Line',
+                    resource_attribute: :line_items,
+                    serializer: PaymentLineItem::LedgerSerializer
         end
       end
     end

data/lib/ledger_sync/adaptors/quickbooks_online/payment/operations/create.rb

@@ -9,14 +9,17 @@ module LedgerSync
             class Contract < LedgerSync::Adaptors::Contract
               params do
                 required(:external_id).maybe(:string)
-                required(:ledger_id).value(:nil)
-                required(:ledger_id).maybe(:string)
+                optional(:account).hash(Types::Reference)
                 required(:amount).filled(:integer)
                 required(:currency).filled(:string)
-                required(:customer).hash do
-                  required(:object).filled(:symbol)
-                  required(:id).filled(:string)
-                end
+                required(:customer).hash(Types::Reference)
+                optional(:deposit_account).hash(Types::Reference)
+                optional(:exchange_rate).maybe(:float)
+                required(:ledger_id).value(:nil)
+                required(:line_items).array(Types::Reference)
+                optional(:memo).filled(:string)
+                optional(:reference_number).maybe(:string)
+                optional(:transaction_date).filled(:date?)
               end
             end
           end

data/lib/ledger_sync/adaptors/quickbooks_online/payment/operations/find.rb

@@ -7,10 +7,17 @@ module LedgerSync
             class Contract < LedgerSync::Adaptors::Contract
               schema do
                 required(:external_id).maybe(:string)
-                required(:ledger_id).filled(:string)
+                optional(:account).hash(Types::Reference)
                 optional(:amount).maybe(:integer)
                 optional(:currency).maybe(:string)
-                optional(:customer).maybe(Types::Reference)
+                optional(:customer).hash(Types::Reference)
+                optional(:deposit_account).hash(Types::Reference)
+                optional(:exchange_rate).maybe(:float)
+                required(:ledger_id).filled(:string)
+                optional(:line_items).array(Types::Reference)
+                optional(:memo).maybe(:string)
+                optional(:reference_number).maybe(:string)
+                optional(:transaction_date).maybe(:date?)
               end
             end
           end

data/lib/ledger_sync/adaptors/quickbooks_online/payment/operations/update.rb

@@ -7,10 +7,17 @@ module LedgerSync
             class Contract < LedgerSync::Adaptors::Contract
               schema do
                 required(:external_id).maybe(:string)
-                required(:ledger_id).filled(:string)
+                optional(:account).hash(Types::Reference)
                 required(:amount).filled(:integer)
                 required(:currency).filled(:string)
                 required(:customer).hash(Types::Reference)
+                optional(:deposit_account).hash(Types::Reference)
+                optional(:exchange_rate).maybe(:float)
+                required(:ledger_id).filled(:string)
+                required(:line_items).array(Types::Reference)
+                optional(:memo).filled(:string)
+                optional(:reference_number).maybe(:string)
+                optional(:transaction_date).filled(:date?)
               end
             end
           end

data/lib/ledger_sync/adaptors/quickbooks_online/payment_line_item/ledger_serializer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module LedgerSync
+  module Adaptors
+    module QuickBooksOnline
+      module PaymentLineItem
+        class LedgerSerializer < QuickBooksOnline::LedgerSerializer
+          attribute ledger_attribute: 'Amount',
+                    resource_attribute: :amount,
+                    type: LedgerSerializerType::AmountType
+
+          attribute ledger_attribute: 'LinkedTxn',
+                    resource_attribute: :ledger_transactions,
+                    type: LedgerSerializerType::TransactionReferenceType
+        end
+      end
+    end
+  end
+end

data/lib/ledger_sync/adaptors/quickbooks_online/request.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module LedgerSync
+  module Adaptors
+    module QuickBooksOnline
+      class Request < Adaptors::Request
+        attr_reader :adaptor
+
+        def initialize(*args, adaptor:, **keywords)
+          @adaptor = adaptor
+          super(*args, **keywords)
+        end
+
+        def perform
+          raise 'Request already performed' if performed?
+
+          @response = generate_response(
+            body: body,
+            headers: headers,
+            method: method,
+            url: url
+          )
+        rescue OAuth2::Error => e
+          error = parse_error(error: e)
+
+          if error.is_a?(Error::AdaptorError::AuthenticationError)
+            begin
+              adaptor.refresh!
+              @response = generate_response(
+                body: body,
+                headers: headers,
+                method: method,
+                url: url
+              )
+              return @response
+            rescue OAuth2::Error => e
+              raise parse_error(error: e)
+            end
+          end
+
+          raise error
+        end
+
+        def refresh!
+          oauth.refresh!
+        rescue OAuth2::Error => e
+          raise parse_error(error: e)
+        end
+
+        private
+
+        def generate_response(body:, headers:, method:, url:)
+          oauth_response = oauth.send(
+            method,
+            url,
+            body: body,
+            headers: headers
+          )
+          ret = Response.new_from_oauth_response(
+            oauth_response: oauth_response,
+            request: self
+          )
+          @performed = true
+          ret
+        end
+
+        def parse_error(error:)
+          parsed_adaptor_error(error: error) ||
+            parsed_operation_error(error: error) ||
+            error
+        end
+
+        def parsed_adaptor_error(error:)
+          Util::AdaptorErrorParser.new(
+            error: error,
+            adaptor: self
+          ).parse
+        end
+
+        def parsed_operation_error(error:)
+          return nil unless error.is_a?(OAuth2::Error)
+
+          Util::OperationErrorParser.new(
+            error: error
+          ).parse
+        end
+
+        def oauth
+          adaptor.oauth
+        end
+
+        def oauth_client
+          adaptor.oauth_client
+        end
+      end
+    end
+  end
+end

data/lib/ledger_sync/adaptors/quickbooks_online/searcher.rb

@@ -4,14 +4,35 @@ module LedgerSync
   module Adaptors
     module QuickBooksOnline
       class Searcher < Adaptors::Searcher
-        def next_searcher
-          paginate(limit: limit, offset: offset + limit)
-        end
+        include Mixins::OffsetAndLimitPaginationSearcherMixin
 
-        def previous_searcher
-          return nil if offset <= 1
+        def query_string
+          ''
+        end
 
-          paginate(limit: limit, offset: offset - limit)
+        def resources
+          resource_class = self.class.inferred_resource_class
+
+          response = adaptor.query(
+            limit: limit,
+            offset: offset,
+            query: query_string,
+            resource_class: resource_class
+          )
+          return [] if response.body.blank?
+
+          (response.body.dig(
+            'QueryResponse',
+            adaptor.class.ledger_resource_type_for(
+              resource_class: resource_class
+            ).classify
+          ) || []).map do |c|
+            self.class.inferred_ledger_serializer_class.new(
+              resource: resource_class.new
+            ).deserialize(
+              hash: c
+            )
+          end
         end
 
         def search
@@ -31,13 +52,8 @@ module LedgerSync
         #
         # More here:
         # https://developer.intuit.com/app/developer/qbo/docs/develop/explore-the-quickbooks-online-api/data-queries#pagination
-
-        def limit
-          pagination.fetch(:limit, 10).to_i
-        end
-
-        def offset
-          pagination.fetch(:offset, 1).to_i
+        def default_offset
+          1
         end
       end
     end

data/lib/ledger_sync/adaptors/quickbooks_online/util/operation_error_parser.rb

@@ -75,7 +75,7 @@ module LedgerSync
 
           attr_reader :operation
 
-          def initialize(operation:, error:)
+          def initialize(operation: nil, error:)
             @operation = operation
             super(error: error)
           end

data/lib/ledger_sync/adaptors/quickbooks_online/vendor/operations/create.rb

@@ -14,6 +14,9 @@ module LedgerSync
                 optional(:first_name).maybe(:string)
                 optional(:last_name).maybe(:string)
                 optional(:email).maybe(:string)
+                optional(:company_name).maybe(:string)
+                optional(:phone_number).maybe(:string)
+                optional(:subsidiary).maybe(:hash, Types::Reference)
               end
             end
           end

data/lib/ledger_sync/adaptors/quickbooks_online/vendor/operations/find.rb

@@ -14,6 +14,9 @@ module LedgerSync
                 required(:first_name).maybe(:string)
                 required(:last_name).maybe(:string)
                 optional(:email).maybe(:string)
+                optional(:company_name).maybe(:string)
+                optional(:phone_number).maybe(:string)
+                optional(:subsidiary).maybe(:hash, Types::Reference)
               end
             end
           end

data/lib/ledger_sync/adaptors/quickbooks_online/vendor/operations/update.rb

@@ -14,6 +14,9 @@ module LedgerSync
                 optional(:first_name).maybe(:string)
                 optional(:last_name).maybe(:string)
                 optional(:email).maybe(:string)
+                optional(:company_name).maybe(:string)
+                optional(:phone_number).maybe(:string)
+                optional(:subsidiary).maybe(:hash, Types::Reference)
               end
             end
           end

data/lib/ledger_sync/adaptors/quickbooks_online/vendor/searcher.rb

@@ -1,61 +1,12 @@
+# frozen_string_literal: true
+
 module LedgerSync
   module Adaptors
     module QuickBooksOnline
       module Vendor
-        class Searcher < LedgerSync::Adaptors::Searcher
-          def next_searcher
-            paginate(limit: limit, offset: offset + limit)
-          end
-
-          def previous_searcher
-            return nil if offset <= 1
-
-            paginate(limit: limit, offset: offset - limit)
-          end
-
-          def resources
-            @resources ||= begin
-              adaptor
-                .query(
-                  resource: 'vendor',
-                  query: "DisplayName LIKE '%#{query}%'",
-                  limit: limit,
-                  offset: offset
-                )
-                .map do |c|
-                  LedgerSync::Vendor.new(
-                    ledger_id: c.fetch('Id'),
-                    display_name: c.fetch('DisplayName'),
-                    first_name: c.dig('GivenName'),
-                    last_name: c.dig('FamilyName')
-                  )
-                end
-            end
-          end
-
-          def search
-            super
-          rescue OAuth2::Error => e
-            @response = e # TODO: Better catch/raise errors as LedgerSync::Error
-            failure
-          end
-
-          private
-          # Pagination uses notation of limit and offset
-          # limit: number of results per page
-          #
-          # offset: position of first result in a list.
-          # starts from 1, not 0
-          #
-          # More here:
-          # https://developer.intuit.com/app/developer/qbo/docs/develop/explore-the-quickbooks-online-api/data-queries#pagination
-
-          def limit
-            pagination.fetch(:limit, 10).to_i
-          end
-
-          def offset
-            pagination.fetch(:offset, 1).to_i
+        class Searcher < Searcher
+          def query_string
+            "DisplayName LIKE '%#{query}%'"
           end
         end
       end