flowcommerce_spree 0.0.4 → 0.0.5

data/app/services/flowcommerce_spree/webhooks/capture_upserted_v2.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module FlowcommerceSpree
+  module Webhooks
+    class CaptureUpsertedV2
+      attr_reader :errors
+      alias full_messages errors
+
+      def self.process(data)
+        new(data).process
+      end
+
+      def initialize(data)
+        @data = data
+        @errors = []
+      end
+
+      def process
+        errors << { message: 'Capture param missing' } && (return self) unless (capture = @data['capture']&.to_hash)
+
+        order_number = capture.dig('authorization', 'order', 'number')
+        errors << { message: 'Order number param missing' } && (return self) unless order_number
+
+        if (order = Spree::Order.find_by(number: order_number))
+          upsert_order_captures(order, capture)
+          payments = order.flow_io_payments
+          map_payment_captures_to_spree(order, payments) if payments.present?
+          order
+        else
+          errors << { message: "Order #{order_number} not found" }
+          self
+        end
+      end
+
+      private
+
+      def upsert_order_captures(order, capture)
+        order.flow_data ||= {}
+        order.flow_data['captures'] ||= []
+        order_captures = order.flow_data['captures']
+        order_captures.delete_if { |c| c['id'] == capture['id'] }
+        order_captures << capture
+        order.update_column(:meta, order.meta.to_json)
+      end
+
+      def map_payment_captures_to_spree(order, payments)
+        order.flow_data['captures']&.each do |c|
+          next unless (payment = captured_payment(payments, c))
+
+          payment.capture_events.create!(amount: c['amount'], meta: { 'flow_data' => { 'id' => c['id'] } })
+          return if payment.completed? || payment.capture_events.sum(:amount) < payment.amount
+
+          payment.complete
+        end
+
+        return if order.completed?
+        return unless order.flow_io_captures_sum >= order.flow_io_total_amount && order.flow_io_balance_amount <= 0
+
+        FlowcommerceSpree::OrderUpdater.new(order: order).finalize_order
+      end
+
+      def captured_payment(flow_order_payments, capture)
+        return unless capture['status'] == 'succeeded'
+
+        auth = capture.dig('authorization', 'id')
+        return unless flow_order_payments&.find { |p| p['reference'] == auth }
+
+        return unless (payment = Spree::Payment.find_by(response_code: auth))
+
+        return if Spree::PaymentCaptureEvent.where("meta -> 'flow_data' ->> 'id' = ?", capture['id']).exists?
+
+        payment
+      end
+    end
+  end
+end

data/app/services/flowcommerce_spree/webhooks/card_authorization_upserted_v2.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module FlowcommerceSpree
+  module Webhooks
+    class CardAuthorizationUpsertedV2
+      attr_reader :errors
+      alias full_messages errors
+
+      def self.process(data)
+        new(data).process
+      end
+
+      def initialize(data)
+        @data = data['authorization']&.to_hash
+        @data&.[]('method')&.delete('images')
+        @errors = []
+      end
+
+      def process
+        errors << { message: 'Authorization param missing' } && (return self) unless @data
+
+        errors << { message: 'Card param missing' } && (return self) unless (flow_io_card = @data.delete('card'))
+
+        if (order_number = @data.dig('order', 'number'))
+          if (order = Spree::Order.find_by(number: order_number))
+            card = upsert_card(flow_io_card, order)
+
+            order.payments.where(response_code: @data['id'])
+                 .update_all(source_id: card.id, source_type: 'Spree::CreditCard')
+
+            return card
+          else
+            errors << { message: "Order #{order_number} not found" }
+          end
+        else
+          errors << { message: 'Order number param missing' }
+        end
+
+        self
+      end
+
+      private
+
+      def upsert_card(flow_io_card, order)
+        flow_io_card_expiration = flow_io_card.delete('expiration')
+
+        card = Spree::CreditCard.find_or_initialize_by(month: flow_io_card_expiration['month'].to_s,
+                                                       year: flow_io_card_expiration['year'].to_s,
+                                                       cc_type: flow_io_card.delete('type'),
+                                                       last_digits: flow_io_card.delete('last4'),
+                                                       name: flow_io_card.delete('name'),
+                                                       user_id: order.user&.id)
+        card.flow_data ||= {}
+        if card.new_record?
+          card.flow_data.merge!(flow_io_card.except('discriminator'))
+          card.imported = true
+        end
+
+        card.push_authorization(@data.except('discriminator'))
+        card.new_record? ? card.save : card.update_column(:meta, card.meta.to_json)
+
+        card
+      end
+    end
+  end
+end

data/app/services/flowcommerce_spree/webhooks/experience_upserted_v2.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module FlowcommerceSpree
+  module Webhooks
+    class ExperienceUpsertedV2
+      attr_accessor :errors
+      alias full_messages errors
+
+      def self.process(data, opts = {})
+        new(data, opts).process
+      end
+
+      def initialize(data, opts = {})
+        @data = data
+        @opts = opts
+        @errors = []
+      end
+
+      def process
+        experience = @data['experience']
+        Spree::Zones::Product.find_or_initialize_by(name: experience['key'].titleize).store_flow_io_data(experience)
+      end
+    end
+  end
+end

data/app/services/flowcommerce_spree/webhooks/fraud_status_changed.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module FlowcommerceSpree
+  module Webhooks
+    class FraudStatusChanged
+      attr_accessor :errors
+      alias full_messages errors
+
+      def self.process(data, opts = {})
+        new(data, opts).process
+      end
+
+      def initialize(data, opts = {})
+        @data = data
+        @opts = opts
+        @errors = []
+      end
+
+      def process
+        order_number = @data.dig('order', 'number')
+        errors << { message: 'Order number param missing' } && (return self) unless order_number
+
+        order = Spree::Order.find_by(number: order_number)
+        errors << { message: "Order #{order_number} not found" } && (return self) unless order
+
+        if @data['status'] == 'declined'
+          order.update_columns(fraudulent: true)
+          order.cancel!
+        end
+
+        order
+      end
+    end
+  end
+end

data/app/services/flowcommerce_spree/webhooks/local_item_upserted.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module FlowcommerceSpree
+  module Webhooks
+    class LocalItemUpserted
+      attr_accessor :errors
+      alias full_messages errors
+
+      def self.process(data, opts = {})
+        new(data, opts).process
+      end
+
+      def initialize(data, opts = {})
+        @data = data
+        @opts = opts
+        @errors = []
+      end
+
+      def process
+        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
+    end
+  end
+end

data/config/routes.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FlowcommerceSpree::Engine.routes.draw do
-  post '/event-target', to: 'webhooks#handle_flow_web_hook_event'
+  post '/event-target', to: 'webhooks#handle_flow_io_event'
   get '/order-completed', to: 'orders#order_completed'
   post '/online-stock-availability', to: 'inventory#online_stock_availability'
 end

data/lib/flowcommerce_spree.rb

@@ -1,14 +1,16 @@
 # 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 'oj'
 
 module FlowcommerceSpree
   API_KEY = ENV.fetch('FLOW_TOKEN', 'test_key')

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
@@ -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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlowcommerceSpree
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Aurel Branzeanu
 - Sebastian De Luca
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-04-07 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
@@ -115,6 +143,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
@@ -129,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:
@@ -152,9 +208,9 @@ files:
 - 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/app_configuration_decorator.rb
 - app/models/spree/calculator/flow_io.rb
 - app/models/spree/calculator/shipping/flow_io.rb
 - app/models/spree/flow_io_credit_card_decorator.rb
@@ -170,27 +226,30 @@ 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/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
 - 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
@@ -202,14 +261,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
@@ -224,8 +281,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Integration of Spree with Flow API
 test_files: []