flowcommerce_spree 0.0.3 → 0.0.8

data/lib/flowcommerce_spree.rb

@@ -1,17 +1,21 @@
 # frozen_string_literal: true
 
+require 'activerecord-postgres-json'
+require 'active_model_serializers'
 require 'flowcommerce'
 require 'flowcommerce_spree/api'
 require 'flowcommerce_spree/refresher'
 require 'flowcommerce_spree/engine'
 require 'flowcommerce_spree/logging_http_client'
 require 'flowcommerce_spree/logging_http_handler'
-require 'flowcommerce_spree/webhook_service'
 require 'flowcommerce_spree/session'
 require 'flow/simple_gateway'
-require 'request_store'
+require 'oj'
 
 module FlowcommerceSpree
+  API_KEY = ENV.fetch('FLOW_TOKEN', 'test_key')
+  ENV['FLOW_TOKEN'] = API_KEY
+
   def self.client(logger: FlowcommerceSpree.logger, **opts)
     FlowCommerce.instance(http_handler: LoggingHttpHandler.new(logger: logger), **opts)
   end

data/lib/flowcommerce_spree/engine.rb

@@ -9,6 +9,8 @@ module FlowcommerceSpree
       FlowcommerceSpree::ORGANIZATION = ENV.fetch('FLOW_ORGANIZATION', 'flow.io')
       FlowcommerceSpree::BASE_COUNTRY = ENV.fetch('FLOW_BASE_COUNTRY', 'USA')
       FlowcommerceSpree::API_KEY = ENV.fetch('FLOW_TOKEN', 'test_key')
+      FlowcommerceSpree::FLOW_IO_WEBHOOK_USER = ENV.fetch('FLOW_IO_WEBHOOK_USER', 'test_user')
+      FlowcommerceSpree::FLOW_IO_WEBHOOK_PASSWORD = ENV.fetch('FLOW_IO_WEBHOOK_PASSWORD', 'test_password')
 
       FlowcommerceSpree::Config = FlowcommerceSpree::Settings.new
     end
@@ -24,7 +26,7 @@ module FlowcommerceSpree
 
       app.config.flowcommerce_spree[:mounted_path] = ENV.fetch('FLOW_MOUNT_PATH', '/flow')
 
-      app.routes.append do
+      app.routes.prepend do
         mount FlowcommerceSpree::Engine => app.config.flowcommerce_spree[:mounted_path]
       end
     end
@@ -40,6 +42,9 @@ module FlowcommerceSpree
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')).sort.each do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
+      Dir.glob(File.join(File.dirname(__FILE__), '../app/overrides/*.rb')).sort.each do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
     end
 
     config.to_prepare(&method(:activate).to_proc)

data/lib/flowcommerce_spree/experience_service.rb

@@ -22,18 +22,6 @@ module FlowcommerceSpree
       nil
     end
 
-    def get_by_subcatalog_id(subcatalog_id)
-      fetch_from_flow.each do |experince|
-        return experince if experince.subcatalog.id == subcatalog_id
-      end
-
-      nil
-    end
-
-    def compact
-      all.map { |exp| [exp.country, exp.key, exp.name] }
-    end
-
     def default
       FlowcommerceSpree::ExperienceService
         .all.select { |exp| exp.key.downcase == ENV.fetch('FLOW_BASE_COUNTRY').downcase }.first
@@ -42,24 +30,10 @@ module FlowcommerceSpree
     private
 
     def fetch_from_flow
-      # return cached_experinces if cache_valid?
-
-      experiences = FlowcommerceSpree.client.experiences.get ORGANIZATION
+      FlowcommerceSpree.client.experiences.get ORGANIZATION
 
       # work with active axperiences only
       # experiences = experiences.select { |it| it.status.value == 'active' }
-
-      # @cache = [experiences, Time.now]
-      experiences
-    end
-
-    def cache_valid?
-      # cache experinces in worker memory for 1 minute
-      @cache && @cache[1] > Time.now.ago(1.minute)
-    end
-
-    def cached_experinces
-      @cache[0]
     end
   end
 end

data/lib/flowcommerce_spree/logging_http_client.rb

@@ -15,31 +15,47 @@ module FlowcommerceSpree
 
       start_time = Time.now.utc.round(10)
 
+      # Contrived example to show how client settings can be adjusted
       # if request.path.start_with?('/organizations')
-        # Contrived example to show how client settings can be adjusted
-        # client.open_timeout = 60
-        # client.read_timeout = 60
+      #   client.open_timeout = 60
+      #   client.read_timeout = 60
       # end
 
       begin
         response = super
       rescue Io::Flow::V0::HttpClient::ServerError => e
-        @error = { error: e }.to_json
+        @error = { error: Oj.load(e.body), code: e.code, status: e.details }
+        raise exception_to_raise(e), @error.dig(:error, 'messages')
       ensure
         # client.open_timeout = original_open
         # client.read_timeout = original_read
 
-        duration = ((Time.now.utc.round(10) - start_time) * 1000).round(0)
+        log_request(request, response, start_time)
+      end
+    end
+
+    private
+
+    def exception_to_raise(flow_io_exception)
+      resource = flow_io_exception.uri.split('/').last
+      exception = case resource
+                    when 'reversals', 'refunds'
+                      'Spree::Core::GatewayError'
+                    else
+                      'StandardError'
+                  end
+      exception.constantize
+    end
 
-        @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"
-        )
+    def log_request(request, response, start_time)
+      duration = ((Time.now.utc.round(10) - start_time) * 1000).round(0)
 
-        @logger.info "Error: #{e.inspect}" if e
-      end
+      @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: #{@error.inspect}" if @error
     end
   end
 end

data/lib/flowcommerce_spree/session.rb

@@ -5,16 +5,14 @@ module FlowcommerceSpree
   class Session
     attr_accessor :session, :localized, :visitor
 
-    def self.create(ip:, visitor:, experience: nil)
-      instance = new(ip: ip, visitor: visitor, experience: experience)
+    def self.create(country:, visitor:, experience: nil)
+      instance = new(country: country, visitor: visitor, experience: experience)
       instance.create
       instance
     end
 
-    def initialize(ip:, visitor:, experience: nil)
-      ip = '127.0.0.1' if ip == '::1'
-
-      @ip      = ip
+    def initialize(country:, visitor:, experience: nil)
+      @country = country
       @visitor = visitor
       @experience = experience
     end
@@ -22,7 +20,7 @@ module FlowcommerceSpree
     # 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,
+      data = { country: @country,
                visit: { id: @visitor,
                         expires_at: (Time.now + 30.minutes).iso8601 } }
       data[:experience] = @experience if @experience
@@ -54,23 +52,5 @@ module FlowcommerceSpree
     def id
       @session.id
     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
-
-      return unless (flow_experience = Flow::Experience.get(experience.key))
-
-      Hashie::Mash.new(flow_experience.settings.delivered_duty.to_hash)
-    end
-
-    # if we have more than one choice, we show choice popup
-    def offers_delivered_duty_choice?
-      if (options = delivered_duty_options)
-        options.available.length > 1
-      else
-        false
-      end
-    end
   end
 end

data/lib/flowcommerce_spree/version.rb

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

data/lib/tasks/flowcommerce_spree.rake

@@ -47,8 +47,11 @@ namespace :flowcommerce_spree do
 
     while current_page == 0 || !variants.empty?
       current_page += 1
-      variants = Spree::Variant.order('updated_at desc').page(current_page).per(100).all
 
+      products = Spree::Product.where.not(country_of_origin: nil)
+                               .order('updated_at desc')
+                               .page(current_page).per(50).includes(:variants_including_master)
+      variants = products.map(&:variants_including_master).flatten
       variants.each do |variant|
         total_sum += 1
         result = variant.sync_product_to_flow

metadata

@@ -1,16 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - Aurel Branzeanu
 - Sebastian De Luca
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: active_model_serializers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+- !ruby/object:Gem::Dependency
+  name: activerecord-postgres-json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -77,16 +105,16 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.12
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -102,33 +130,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.21'
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: spree_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: spree_backend
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
+        version: '4.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +171,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: Integration of popular Rails/Spree store framework with e-commerce Flow
   API
 email:
@@ -159,22 +201,23 @@ files:
 - app/assets/javascripts/flowcommerce_spree/application.js
 - app/assets/stylesheets/flowcommerce_spree/application.css
 - app/controllers/concerns/current_zone_loader_decorator.rb
+- app/controllers/flowcommerce_spree/inventory_controller.rb
+- app/controllers/flowcommerce_spree/orders_controller.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_credit_card_decorator.rb
+- app/models/spree/flow_io_order_decorator.rb
 - app/models/spree/flow_io_product_decorator.rb
 - app/models/spree/flow_io_variant_decorator.rb
 - app/models/spree/gateway/flow_io.rb
-- app/models/spree/line_item_decorator.rb
-- app/models/spree/order_decorator.rb
+- app/models/spree/payment_capture_event_decorator.rb
 - app/models/spree/promotion_decorator.rb
 - app/models/spree/promotion_handler/coupon_decorator.rb
 - app/models/spree/spree_user_decorator.rb
@@ -182,24 +225,32 @@ files:
 - app/models/spree/zone_decorator.rb
 - app/models/spree/zones/flow_io_product_zone_decorator.rb
 - app/models/tracking/setup_decorator.rb
+- app/overrides/spree/admin/order_sidebar_summary_flow_link.rb
+- app/overrides/spree/admin/products/order_price_flow_message.rb
+- app/serializers/api/v2/order_serializer_decorator.rb
 - app/services/flowcommerce_spree/import_experience_items.rb
 - app/services/flowcommerce_spree/import_experiences.rb
+- app/services/flowcommerce_spree/import_item.rb
 - app/services/flowcommerce_spree/order_sync.rb
+- app/services/flowcommerce_spree/order_updater.rb
+- app/services/flowcommerce_spree/webhooks/capture_upserted_v2.rb
+- app/services/flowcommerce_spree/webhooks/card_authorization_upserted_v2.rb
+- app/services/flowcommerce_spree/webhooks/experience_upserted_v2.rb
+- app/services/flowcommerce_spree/webhooks/fraud_status_changed.rb
+- app/services/flowcommerce_spree/webhooks/local_item_upserted.rb
 - app/views/layouts/flowcommerce_spree/application.html.erb
 - app/views/spree/admin/payments/index.html.erb
+- app/views/spree/admin/payments/source_views/_flow_io_gateway.html.erb
 - app/views/spree/admin/promotions/edit.html.erb
 - app/views/spree/admin/shared/_order_summary.html.erb
 - 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
+- app/workers/flowcommerce_spree/import_item_worker.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
 - db/migrate/20201022173210_add_zone_type_to_spree_zone_members.rb
 - db/migrate/20201022174252_add_kind_to_zone.rb
-- lib/flow/error.rb
-- lib/flow/pay_pal.rb
 - lib/flow/simple_gateway.rb
 - lib/flowcommerce_spree.rb
 - lib/flowcommerce_spree/api.rb
@@ -211,14 +262,12 @@ files:
 - 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
 - lib/tasks/flowcommerce_spree.rake
 homepage: https://github.com/mejuri-inc/flowcommerce_spree
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -234,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Integration of Spree with Flow API
 test_files: []