flowcommerce_spree 0.0.2 → 0.0.3

data/lib/flowcommerce_spree/logging_http_client.rb

@@ -14,15 +14,12 @@ module FlowcommerceSpree
       # original_read = client.read_timeout
 
       start_time = Time.now.utc.round(10)
-      @logger.info "start #{request.method} #{request.path}"
-      @logger.info "body: #{request.instance_variable_get(:@header)}"
-      @logger.info "body: #{request.body}"
 
-      if request.path.start_with?('/organizations')
+      # if request.path.start_with?('/organizations')
         # Contrived example to show how client settings can be adjusted
         # client.open_timeout = 60
         # client.read_timeout = 60
-      end
+      # end
 
       begin
         response = super
@@ -32,10 +29,15 @@ module FlowcommerceSpree
         # client.open_timeout = original_open
         # client.read_timeout = original_read
 
-        end_time = Time.now.utc.round(10)
-        duration = ((end_time - start_time) * 1000).round(0)
-        @logger.info "complete #{request.method} #{request.path} #{duration} ms"
-        @logger.info "response: #{response}"
+        duration = ((Time.now.utc.round(10) - start_time) * 1000).round(0)
+
+        @logger.info(
+          "Started #{request.method} #{request.path}\n"\
+          "headers: #{request.instance_variable_get(:@header)}\nbody: #{request.body}\n"\
+          "response: #{response&.force_encoding('utf-8')}\n"\
+          "Completed #{request.method} #{request.path} #{duration} ms\n"
+        )
+
         @logger.info "Error: #{e.inspect}" if e
       end
     end

data/lib/flowcommerce_spree/session.rb

@@ -5,25 +5,34 @@ module FlowcommerceSpree
   class Session
     attr_accessor :session, :localized, :visitor
 
-    def initialize(ip:, visitor:)
+    def self.create(ip:, visitor:, experience: nil)
+      instance = new(ip: ip, visitor: visitor, experience: experience)
+      instance.create
+      instance
+    end
+
+    def initialize(ip:, visitor:, experience: nil)
       ip = '127.0.0.1' if ip == '::1'
 
       @ip      = ip
       @visitor = visitor
+      @experience = experience
     end
 
-    # create session with blank data
+    # create session without or with experience (the latter is useful for creating a new session with the order's
+    # experience on refreshing the checkout_token)
     def create
       data = { ip: @ip,
                visit: { id: @visitor,
                         expires_at: (Time.now + 30.minutes).iso8601 } }
+      data[:experience] = @experience if @experience
 
       session_model = ::Io::Flow::V0::Models::SessionForm.new data
       @session = FlowCommerce.instance(http_handler: LoggingHttpHandler.new)
                              .sessions.post_organizations_by_organization(ORGANIZATION, session_model)
     end
 
-    # if we want to manualy switch to specific country or experience
+    # if we want to manually switch to specific country or experience
     def update(data)
       @session = FlowCommerce.instance.sessions.put_by_session(@session.id,
                                                                ::Io::Flow::V0::Models::SessionPutForm.new(data))
@@ -34,6 +43,10 @@ module FlowcommerceSpree
       @session.local&.experience
     end
 
+    def expires_at
+      @session.visit.expires_at
+    end
+
     def local
       @session.local
     end
@@ -42,14 +55,6 @@ module FlowcommerceSpree
       @session.id
     end
 
-    def localized?
-      # use flow if we are not in default country
-      return false unless local
-      return false if @localized.class == FalseClass
-
-      local.country.iso_3166_3 != ENV.fetch('FLOW_BASE_COUNTRY').upcase
-    end
-
     # because we do not get full experience from session, we have to get from exp list
     def delivered_duty_options
       return nil unless experience

data/lib/flowcommerce_spree/test_support.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module FlowcommerceSpree
+  module TestSupport
+    FACTORY_PATH = File.expand_path('../../spec/factories/flow_io', __dir__)
+  end
+end

data/lib/flowcommerce_spree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlowcommerceSpree
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/flowcommerce_spree/webhook_service.rb

@@ -3,7 +3,7 @@
 module FlowcommerceSpree
   # communicates with flow api, responds to webhook events
   class WebhookService
-    attr_accessor :errors, :product, :variant
+    attr_accessor :errors
     alias full_messages errors
 
     def self.process(data, opts = {})
@@ -17,72 +17,158 @@ module FlowcommerceSpree
     end
 
     def process
-      org = @data['organization']
-      if org != ORGANIZATION
-        errors << { message: "Organization name mismatch for #{org}" }
-      else
-        discriminator = @data['discriminator']
-        hook_method = "hook_#{discriminator}"
-        # If hook processing method registered an error, a self.object of WebhookService with this error will be
-        # returned, else an ActiveRecord object will be returned
-        return __send__(hook_method) if respond_to?(hook_method, true)
-
-        errors << { message: "No hook for #{discriminator}" }
-      end
+      discriminator = @data['discriminator']
+      hook_method = "hook_#{discriminator}"
+      # If hook processing method registered an error, a self.object of WebhookService with this error will be
+      # returned, else an ActiveRecord object will be returned
+      return __send__(hook_method) if respond_to?(hook_method, true)
 
+      errors << { message: "No hook for #{discriminator}" }
       self
     end
 
     private
 
+    def hook_capture_upserted_v2
+      capture = @data['capture']
+      order_number = capture.dig('authorization', 'order', 'number')
+      if (order = Spree::Order.find_by(number: order_number))
+        order.flow_data['captures'] ||= []
+        order_captures = order.flow_data['captures']
+        order_captures.delete_if do |c|
+          c['id'] == capture['id']
+        end
+        order_captures << capture
+
+        order.update_column(:meta, order.meta.to_json)
+        order
+      else
+        errors << { message: "Order #{order_number} not found" }
+        self
+      end
+    end
+
     def hook_experience_upserted_v2
       experience = @data['experience']
       Spree::Zones::Product.find_or_initialize_by(name: experience['key'].titleize).store_flow_io_data(experience)
     end
 
+    def hook_fraud_status_changed
+      if (order_number = @data.dig('order', 'number'))
+        if @data['status'] == 'declined'
+          if (order = Spree::Order.find_by(number: order_number))
+            order.update_columns(fraudulent: true)
+            order.cancel!
+            return order
+          else
+            errors << { message: "Order #{order_number} not found" }
+          end
+        end
+      else
+        errors << { message: 'Order number param missing' }
+      end
+
+      self
+    end
+
     def hook_local_item_upserted
-      if (local_item = @data['local_item'])
-        if (received_sku = local_item.dig('item', 'number'))
-          if (@variant = Spree::Variant.find_by(sku: received_sku))
-            @variant.add_flow_io_experience_data(
-              local_item.dig('experience', 'key'),
-              'prices' => [local_item.dig('pricing', 'price')], 'status' => local_item['status']
-            )
-
-            @variant.update_column(:meta, @variant.meta.to_json)
-            return @variant
+      errors << { message: 'Local item param missing' } && (return self) unless (local_item = @data['local_item'])
+
+      errors << { message: 'SKU param missing' } && (return self) unless (flow_sku = local_item.dig('item', 'number'))
+
+      if (variant = Spree::Variant.find_by(sku: flow_sku))
+        variant.add_flow_io_experience_data(
+          local_item.dig('experience', 'key'),
+          'prices' => [local_item.dig('pricing', 'price')], 'status' => local_item['status']
+        )
+
+        variant.update_column(:meta, variant.meta.to_json)
+        return variant
+      else
+        errors << { message: "Variant with sku [#{flow_sku}] not found!" }
+      end
+
+      self
+    end
+
+    def hook_order_placed_v2
+      order_placed = @data['order_placed']
+      flow_order = order_placed['order']
+      flow_allocation = order_placed['allocation']
+
+      errors << { message: 'Order number param missing' } && (return self) unless (order_number = flow_order['number'])
+
+      if (order = Spree::Order.find_by(number: order_number))
+        order.flow_data['order'] = flow_order.to_hash
+        order.flow_data['allocations'] = flow_allocation.to_hash
+        order_flow_data = order.flow_data['order']
+        attrs_to_update = { meta: order.meta.to_json }
+        flow_data_submitted = order_flow_data['submitted_at'].present?
+        if flow_data_submitted && !order.complete?
+          if order_flow_data['payments'].present? && (order_flow_data.dig('balance', 'amount')&.to_i == 0)
+            attrs_to_update[:state] = 'complete'
+            attrs_to_update[:payment_state] = 'paid'
+            attrs_to_update[:completed_at] = Time.zone.now.utc
+            attrs_to_update[:email] = order.flow_customer_email
           else
-            errors << { message: "Variant with sku [#{received_sku}] not found!" }
+            attrs_to_update[:state] = 'confirmed'
           end
-        else
-          errors << { message: 'SKU param missing' }
         end
+
+        attrs_to_update.merge!(order.prepare_flow_addresses) if order.complete? || attrs_to_update[:state] == 'complete'
+
+        if flow_data_submitted
+          order.create_proposed_shipments
+          order.shipment.update_amounts
+          order.line_items.each(&:store_ets)
+        end
+
+        order.update_columns(attrs_to_update)
+
+        # TODO: To be refactored once we have the capture_upserted_v2 webhook configured
+        if flow_data_submitted
+          order.create_tax_charge!
+          order.finalize!
+          order.update_totals
+          order.save
+        end
+
+        return order
       else
-        errors << { message: 'Local item param missing' }
+        errors << { message: "Order #{order_number} not found" }
       end
 
       self
     end
 
     def hook_order_upserted_v2
-      errors << { message: 'Order param missing' } unless (received_order = @data['order'])
+      errors << { message: 'Order param missing' } && (return self) unless (flow_order = @data['order'])
+
+      errors << { message: 'Order number param missing' } && (return self) unless (order_number = flow_order['number'])
 
-      if errors.none? && (order_number = received_order['number'])
-        if (order = Spree::Order.find_by(number: order_number))
-          order.flow_data['order'] = received_order.to_hash
-          attrs_to_update = { meta: order.meta.to_json }
-          if order.flow_data['order']['submitted_at'].present?
+      if (order = Spree::Order.find_by(number: order_number))
+        order.flow_data['order'] = flow_order.to_hash
+        order_flow_data = order.flow_data['order']
+        attrs_to_update = { meta: order.meta.to_json }
+        flow_data_submitted = order_flow_data['submitted_at'].present?
+        if flow_data_submitted && !order.complete?
+          if order_flow_data['payments'].present? && (order_flow_data.dig('balance', 'amount')&.to_i == 0)
             attrs_to_update[:state] = 'complete'
-            attrs_to_update[:completed_at] = Time.zone.now
+            attrs_to_update[:payment_state] = 'paid'
+            attrs_to_update[:completed_at] = Time.zone.now.utc
+            attrs_to_update[:email] = order.flow_customer_email
+          else
+            attrs_to_update[:state] = 'confirmed'
           end
-
-          order.update_columns(attrs_to_update)
-          return order
-        else
-          errors << { message: "Order #{order_number} not found" }
         end
+
+        attrs_to_update.merge!(order.prepare_flow_addresses) if order.complete? || attrs_to_update[:state] == 'complete'
+
+        order.update_columns(attrs_to_update)
+        order.create_tax_charge! if flow_data_submitted
+        return order
       else
-        errors << { message: 'Order number param missing' }
+        errors << { message: "Order #{order_number} not found" }
       end
 
       self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Aurel Branzeanu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -101,6 +101,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: spree_backend
   requirement: !ruby/object:Gem::Requirement
@@ -146,15 +160,19 @@ files:
 - app/assets/stylesheets/flowcommerce_spree/application.css
 - app/controllers/concerns/current_zone_loader_decorator.rb
 - app/controllers/flowcommerce_spree/webhooks_controller.rb
+- app/controllers/users/sessions_controller_decorator.rb
 - app/helpers/flowcommerce_spree/application_helper.rb
 - app/helpers/spree/admin/orders_helper_decorator.rb
 - app/helpers/spree/core/controller_helpers/flow_io_order_helper_decorator.rb
 - app/mailers/spree/spree_order_mailer_decorator.rb
 - app/models/flowcommerce_spree/settings.rb
+- app/models/spree/address_decorator.rb
+- app/models/spree/calculator/flow_io.rb
+- app/models/spree/calculator/shipping/flow_io.rb
 - app/models/spree/credit_card_decorator.rb
 - app/models/spree/flow_io_product_decorator.rb
 - app/models/spree/flow_io_variant_decorator.rb
-- app/models/spree/gateway/spree_flow_gateway.rb
+- app/models/spree/gateway/flow_io.rb
 - app/models/spree/line_item_decorator.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/promotion_decorator.rb
@@ -163,6 +181,7 @@ files:
 - app/models/spree/taxon_decorator.rb
 - app/models/spree/zone_decorator.rb
 - app/models/spree/zones/flow_io_product_zone_decorator.rb
+- app/models/tracking/setup_decorator.rb
 - app/services/flowcommerce_spree/import_experience_items.rb
 - app/services/flowcommerce_spree/import_experiences.rb
 - app/services/flowcommerce_spree/order_sync.rb
@@ -173,7 +192,7 @@ files:
 - app/views/spree/admin/shared/_order_summary_flow.html.erb
 - app/views/spree/order_mailer/confirm_email.html.erb
 - app/views/spree/order_mailer/confirm_email.text.erb
-- config/initializers/flowcommerce_spree.rb
+- config/rails_best_practices.yml
 - config/routes.rb
 - db/migrate/20201021160159_add_type_and_meta_to_spree_zone.rb
 - db/migrate/20201021755957_add_meta_to_spree_tables.rb
@@ -190,6 +209,7 @@ files:
 - lib/flowcommerce_spree/logging_http_handler.rb
 - lib/flowcommerce_spree/refresher.rb
 - lib/flowcommerce_spree/session.rb
+- lib/flowcommerce_spree/test_support.rb
 - lib/flowcommerce_spree/version.rb
 - lib/flowcommerce_spree/webhook_service.rb
 - lib/simple_csv_writer.rb

data/config/initializers/flowcommerce_spree.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module FlowcommerceSpree
-  ORGANIZATION = ENV.fetch('FLOW_ORGANIZATION', 'flow.io')
-  BASE_COUNTRY = ENV.fetch('FLOW_BASE_COUNTRY', 'USA')
-  API_KEY = ENV.fetch('FLOW_TOKEN', 'test_key')
-end