ledger_sync 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53419559e8cc29609542a442a100a9ecf8fe4dff040f4233631f4e13c688c893
-  data.tar.gz: 707b1bc26a777fb442cce8052a8facff59ce715ddaf5a09c8c626b5e7867d0c7
+  metadata.gz: 0e39d8dc0e6f3df94374cb5200d7062213327b06f470111c9d3baf4fe7407e76
+  data.tar.gz: 206ccec75be3d425dbaf6b3567af57536cab77851e8c815c31ee1642b81cb0ef
 SHA512:
-  metadata.gz: edf14189d54667014a36ab9959ae0ba60a980c80131ea1cf36507358da50151a7e0428cc785d72aba91d6dd7a4b81836f40d743fedf93efbb0c90b3b2f3eecc8
-  data.tar.gz: a8eb0c9a2d75b5a2177f480f3fe2dbe4410201fa59cab4d5abca51586612012271081242e5190f894caa9b218f5ee3e899c1fb42e171512bae949fd40c01a978
+  metadata.gz: 1024346df20614497f7db8e000bacd9440efb24084e2675769295ef69dc2d1d6c1770d8c5f25258ad05ba1b7bdb6d9ae23440c8d56787c3980c572e65a2af52a
+  data.tar.gz: b5571c6836c32ade58704aae76ac4b1577c5f457240c5ce2ef121a27b9424eb46619366fe09650c4a6953e44d6dd5b9df1eba4e42d8d313e72b17433e26075cd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ledger_sync (1.1.2)
+    ledger_sync (1.1.3)
       activemodel
       colorize
       coveralls

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

@@ -108,7 +108,7 @@ module LedgerSync
         end
 
         def url_for(resource:)
-          base_url = test ? 'https://app.sandbox.qbo.intuit.com/app' : 'https://app.qbo.intuit.com/app'
+          base_url = test ? 'https://app.sandbox.qbo.intuit.com/app' : 'https://qbo.intuit.com/app'
           resource_path = case resource
                           when LedgerSync::Account
                             "/register?accountId=#{resource.ledger_id}"

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

@@ -14,6 +14,10 @@ module LedgerSync
           attribute ledger_attribute: 'DepositLineDetail.AccountRef.value',
                     resource_attribute: 'account.ledger_id'
 
+          attribute ledger_attribute: 'DepositLineDetail.Entity',
+                    resource_attribute: :entity,
+                    type: LedgerSerializerType::EntityReferenceType
+
           attribute ledger_attribute: 'Amount',
                     resource_attribute: :amount,
                     type: LedgerSerializerType::AmountType

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

@@ -29,8 +29,9 @@ module LedgerSync
           attribute ledger_attribute: 'ExchangeRate',
                     resource_attribute: :exchange_rate
 
-          attribute ledger_attribute: 'EntityRef.value',
-                    resource_attribute: 'vendor.ledger_id'
+          attribute ledger_attribute: 'EntityRef',
+                    resource_attribute: :entity,
+                    type: LedgerSerializerType::EntityReferenceType
 
           attribute ledger_attribute: 'DocNumber',
                     resource_attribute: :reference_number

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

@@ -16,7 +16,7 @@ module LedgerSync
                 required(:payment_type).filled(:string)
                 optional(:reference_number).maybe(:string)
                 optional(:transaction_date).filled(:date?)
-                optional(:vendor).hash(Types::Reference)
+                optional(:entity).hash(Types::Reference)
               end
             end
           end

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

@@ -16,7 +16,7 @@ module LedgerSync
                 optional(:payment_type).maybe(:string)
                 optional(:reference_number).maybe(:string)
                 optional(:transaction_date).filled(:date?)
-                optional(:vendor).hash(Types::Reference)
+                optional(:entity).hash(Types::Reference)
               end
             end
           end

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

@@ -16,7 +16,7 @@ module LedgerSync
                 required(:payment_type).filled(:string)
                 optional(:reference_number).maybe(:string)
                 optional(:transaction_date).filled(:date?)
-                optional(:vendor).hash(Types::Reference)
+                optional(:entity).hash(Types::Reference)
               end
             end
           end

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

@@ -12,9 +12,7 @@ module LedgerSync
           deserialized_resource = super(hash: hash)
 
           # Ref: https://github.com/LedgerSync/ledger_sync/issues/86
-          if deserialized_resource.is_a?(LedgerSync::Account) && deserialized_resource.account_type
-            deserialized_resource.classification ||= LedgerSerializerType::AccountType::TYPE_TO_CLASSIFICATION_MAPPING.fetch(deserialized_resource.account_type, nil)
-          end
+          deserialized_resource.classification ||= LedgerSerializerType::AccountType::TYPE_TO_CLASSIFICATION_MAPPING.fetch(deserialized_resource.account_type, nil) if deserialized_resource.is_a?(LedgerSync::Account) && deserialized_resource.account_type
 
           return deserialized_resource unless merge_for_full_update
 
@@ -59,10 +57,6 @@ module LedgerSync
           merged_resource
         end
 
-        def self.id(**keywords)
-          super({ ledger_attribute: 'Id', resource_attribute: :ledger_id }.merge(keywords))
-        end
-
         def to_ledger_hash(deep_merge_unmapped_values: {}, only_changes: false)
           ret = super(only_changes: only_changes)
           return ret unless deep_merge_unmapped_values.any?
@@ -73,8 +67,36 @@ module LedgerSync
           )
         end
 
+        class << self
+          attr_reader :quickbooks_online_resource_types_hash
+        end
+
+        def self.id(**keywords)
+          super({ ledger_attribute: 'Id', resource_attribute: :ledger_id }.merge(keywords))
+        end
+
+        def self.ledger_serializer_for(resource_class:)
+          QuickBooksOnline.const_get("#{resource_class.name.split('LedgerSync::')[1..-1].join('LedgerSync::')}::LedgerSerializer")
+        end
+
         def self.quickbooks_online_resource_type(type = nil)
-          @quickbooks_online_resource_type ||= (type || _inferred_resource_class.resource_type).to_s
+          @quickbooks_online_resource_type ||= begin
+            inferred_resource_class = _inferred_resource_class
+            qbo_type = (type || inferred_resource_class.resource_type).to_s
+            type_hash = QuickBooksOnline::LedgerSerializer.quickbooks_online_resource_types_hash.try(:fetch, qbo_type, nil)
+            raise "Cannot define type in #{name}.  Type already exists: #{qbo_type}.  Defined previously by #{quickbooks_online_resource_types_hash[qbo_type][:serializer_class].name}" if type_hash.present? && (type_hash[:serializer_class] != serializer_class || type_hash[:resource_class] != inferred_resource_class) if type_hash.present?
+
+            QuickBooksOnline::LedgerSerializer.class_eval do
+              @quickbooks_online_resource_types_hash ||= {}
+            end
+
+            QuickBooksOnline::LedgerSerializer.quickbooks_online_resource_types_hash[qbo_type] = {
+              resource_class: inferred_resource_class,
+              serializer_class: self
+            }
+
+            qbo_type
+          end
         end
 
         private
@@ -101,3 +123,6 @@ module LedgerSync
     end
   end
 end
+
+# Load other serializers to populate `QuickBooksOnline::LedgerSerializer.quickbooks_online_resource_types_hash`
+Gem.find_files('ledger_sync/adaptors/quickbooks_online/**/ledger_serializer.rb').each { |path| require path }

data/lib/ledger_sync/adaptors/quickbooks_online/ledger_serializer_type/amount_type.rb

@@ -4,7 +4,7 @@ module LedgerSync
   module Adaptors
     module QuickBooksOnline
       module LedgerSerializerType
-        class AmountType < Adaptors::LedgerSerializerType::MappingType
+        class AmountType < Adaptors::LedgerSerializerType::ValueType
           def convert_from_ledger(value:)
             return if value.nil?
 

data/lib/ledger_sync/adaptors/quickbooks_online/ledger_serializer_type/entity_reference_type.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module LedgerSync
+  module Adaptors
+    module QuickBooksOnline
+      module LedgerSerializerType
+        class EntityReferenceType < Adaptors::LedgerSerializerType::ValueType
+          def convert_from_ledger(value:)
+            return if value.nil?
+
+            raise "Unknown value type.  Hash expected.  Given: #{value.class.name}" unless value.is_a?(Hash)
+            return if value.empty?
+
+            value = LedgerSync::Util::HashHelpers.deep_stringify_keys(value)
+            resource_class = begin
+              quickbooks_online_type_hash = QuickBooksOnline::LedgerSerializer.quickbooks_online_resource_types_hash.fetch(value['type'].downcase, nil)
+              if quickbooks_online_type_hash.present?
+                quickbooks_online_type_hash.try(:fetch, :resource_class, nil)
+              else
+                LedgerSync.resources[value['type'].downcase.to_sym]
+              end
+            end
+
+            raise "Unknown QuickBooks Online resource type: #{value['type']}" if resource_class.blank?
+
+            ret = resource_class.new(
+              ledger_id: value['value']
+            )
+
+            ret.display_name = value['name'] if ret.respond_to?(:display_name)
+            ret
+          end
+
+          def convert_from_local(value:)
+            return if value.nil?
+            raise "Resource expected.  Given: #{value.class.name}" unless value.is_a?(LedgerSync::Resource)
+
+            ret = {
+              'value' => value.ledger_id
+            }
+            ret['name'] = value.display_name if value.respond_to?(:display_name)
+            ret['type'] = string_helpers.camelcase(
+              QuickBooksOnline::LedgerSerializer.ledger_serializer_for(
+                resource_class: value.class
+              ).quickbooks_online_resource_type
+            )
+            ret
+          end
+
+          private
+
+          def string_helpers
+            @string_helpers ||= LedgerSync::Util::StringHelpers
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ledger_sync/adaptors/test/expense/operations/create.rb

@@ -11,7 +11,7 @@ module LedgerSync
                 required(:external_id).maybe(:string)
                 required(:ledger_id).value(:nil)
                 required(:account).hash(Types::Reference)
-                required(:vendor).hash(Types::Reference)
+                required(:entity).hash(Types::Reference)
                 required(:currency).filled(:string)
                 required(:memo).filled(:string)
                 required(:payment_type).filled(:string)
@@ -21,36 +21,6 @@ module LedgerSync
                 required(:reference_number).filled(:string)
               end
             end
-
-            private
-
-            def operate
-              response = adaptor.post(
-                resource: 'purchase',
-                payload: local_resource_data
-              )
-
-              resource.ledger_id = response.dig('id')
-              success(
-                resource: Test::LedgerSerializer.new(resource: resource).deserialize(hash: response),
-                response: response
-              )
-            end
-
-            def local_resource_data
-              {
-                'currency' => resource.currency,
-                'account_id' => resource.account.ledger_id,
-                'vendor_id' => resource.vendor.ledger_id,
-                'line_items' => resource.line_items.map do |line_item|
-                  {
-                    'account_id' => line_item.account&.ledger_id,
-                    'Amount' => line_item.amount / 100.0,
-                    'description' => line_item.description
-                  }
-                end
-              }
-            end
           end
         end
       end

data/lib/ledger_sync/adaptors/test/expense/operations/find.rb

@@ -11,7 +11,7 @@ module LedgerSync
                 required(:external_id).maybe(:string)
                 required(:ledger_id).filled(:string)
                 required(:account).hash(Types::Reference)
-                required(:vendor).hash(Types::Reference)
+                required(:entity).hash(Types::Reference)
                 required(:currency).maybe(:string)
                 required(:memo).maybe(:string)
                 required(:payment_type).maybe(:string)

data/lib/ledger_sync/adaptors/test/expense/operations/update.rb

@@ -9,7 +9,7 @@ module LedgerSync
                 required(:external_id).maybe(:string)
                 required(:ledger_id).filled(:string)
                 required(:account).hash(Types::Reference)
-                required(:vendor).hash(Types::Reference)
+                required(:entity).hash(Types::Reference)
                 required(:currency).filled(:string)
                 required(:memo).filled(:string)
                 required(:payment_type).filled(:string)

data/lib/ledger_sync/resources/deposit_line_item.rb

@@ -4,6 +4,8 @@ module LedgerSync
     attribute :amount, type: Type::Integer
     attribute :description, type: Type::String
 
+    references_one :entity, to: [Customer, Vendor]
+
     def name
       description
     end

data/lib/ledger_sync/resources/expense.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LedgerSync
   class Expense < LedgerSync::Resource
     attribute :currency, type: Type::String
@@ -7,7 +9,7 @@ module LedgerSync
     attribute :exchange_rate, type: Type::Float
     attribute :reference_number, type: Type::String
 
-    references_one :vendor, to: Vendor
+    references_one :entity, to: [Customer, Vendor]
     references_one :account, to: Account
 
     references_many :line_items, to: ExpenseLineItem

data/lib/ledger_sync/type/reference_one.rb

@@ -13,7 +13,11 @@ module LedgerSync
       end
 
       def error_message(attribute:, resource:, value:)
-        "Attribute #{attribute.name} for #{resource.class.name} should be a #{resource_class.name}.  Given #{value.class.name}"
+        if resource_class.is_a?(Array)
+          "Attribute #{attribute.name} for #{resource.class.name} should be one of the following: #{resource_class.map(&:name).join(', ')}.  Given #{value.class.name}"
+        else
+          "Attribute #{attribute.name} for #{resource.class.name} should be a #{resource_class.first.name}.  Given #{value.class.name}"
+        end
       end
 
       def type
@@ -22,10 +26,20 @@ module LedgerSync
 
       def valid_without_casting?(value:)
         return true if value.nil?
-        return true if value.is_a?(resource_class)
+        return true if resource_classes.select { |e| value.is_a?(e) }.any?
 
         false
       end
+
+      private
+
+      def resource_classes
+        @resource_classes ||= if resource_class.is_a?(Array)
+                                resource_class
+                              else
+                                [resource_class]
+                              end
+      end
     end
   end
 end

data/lib/ledger_sync/util/resources_builder.rb

@@ -53,9 +53,10 @@ module LedgerSync
             raise "Unrecognized attribute for #{resource_class.name}: #{k}" if attribute.nil? && !ignore_unrecognized_attributes
 
             v = if attribute.is_a?(ResourceAttribute::Reference::One)
+                  resource_type = resource_type_by(external_id: current_data[k])
                   resource_or_build(
                     external_id: current_data[k],
-                    type: attribute.type.resource_class.resource_type
+                    type: resource_type
                   )
                 elsif attribute.is_a?(ResourceAttribute::Reference::Many)
                   current_data[k].map do |many_reference|
@@ -81,6 +82,19 @@ module LedgerSync
         )
       end
 
+      # This will break if multiple objects of different types have the same external_id
+      def external_id_to_type_hash
+        @external_id_to_type_hash ||= begin
+          ret = {}
+          data.each do |type, type_resources|
+            type_resources.keys.each do |external_id|
+              ret[external_id] = type
+            end
+          end
+          ret
+        end
+      end
+
       def resource_key(external_id:, type:)
         "#{type}/#{external_id}"
       end
@@ -91,6 +105,10 @@ module LedgerSync
           build_resource(**external_id_and_type)
         )
       end
+
+      def resource_type_by(external_id:)
+        external_id_to_type_hash[external_id.to_sym]
+      end
     end
   end
 end

data/lib/ledger_sync/version.rb

@@ -1,3 +1,3 @@
 module LedgerSync
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ledger_sync
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Ryan Jackson
@@ -398,6 +398,7 @@ files:
 - lib/ledger_sync/adaptors/quickbooks_online/ledger_serializer_type/amount_type.rb
 - lib/ledger_sync/adaptors/quickbooks_online/ledger_serializer_type/classification_type.rb
 - lib/ledger_sync/adaptors/quickbooks_online/ledger_serializer_type/date_type.rb
+- lib/ledger_sync/adaptors/quickbooks_online/ledger_serializer_type/entity_reference_type.rb
 - lib/ledger_sync/adaptors/quickbooks_online/ledger_serializer_type/journal_entry_line_item_type.rb
 - lib/ledger_sync/adaptors/quickbooks_online/ledger_serializer_type/payment_type.rb
 - lib/ledger_sync/adaptors/quickbooks_online/operation.rb
@@ -524,7 +525,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sync common objects to accounting software.