workarea-core 3.4.40 → 3.4.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 645f331b3405886c0d82f57d7de6da260a505fd827354b7725d21e618b4b7758
-  data.tar.gz: 42bb34aaa339295bd0312eb23b33b00e247bde4d57e86958aadb23125c49033f
+  metadata.gz: fa0ecabb9a16f7c58840b3d50dc6486c2f064c3d613c744607997105f26102fc
+  data.tar.gz: 4ec03996dd8e2bced8818056b06e3128c3b8fa6b079907e2b018e0504641e75b
 SHA512:
-  metadata.gz: 50e7704ee466d04fb2b24c36a8f85229d22fd5833fa6bd1a472f6a5a874a7272f4fe5863cff1bdc4dd594e9078d9afc351ba152e403711759c7a7511d7b4729b
-  data.tar.gz: 4deaaf2b72591659f834f0d105a94ad4f7f69abc31041817ec467beb5d0d2e3f961ca344a0ff780478e448122525a0819eab4029533b6927b4903b279d328a08
+  metadata.gz: bee72675acacaffba697db529d9d9a0897603d9327e0d29044825f71c8f114617d056714ab8e83d40b03844d912d065e629a6de2227c4afcea486a1433b99b48
+  data.tar.gz: 49ad054e62f63e717f553ad1f75d28f6cb54d9a8e911989513eb4b2d63d7013e5d46e8762040696a20937f8082a570b394b729755f77a73c2d6584f12871ea0b

data/app/controllers/workarea/current_referrer.rb

@@ -9,6 +9,7 @@ module Workarea
       @current_referrer ||= TrafficReferrer.new(
         RefererParser::Parser.new.parse(referrer).slice(:source, :medium, :uri)
       )
+    rescue RefererParser::InvalidUriError
     end
   end
 end

data/app/models/workarea/metrics/user.rb

@@ -123,6 +123,31 @@ module Workarea
         return nil if orders.zero?
         revenue / orders.to_f
       end
+
+      def merge!(other)
+        # To recalculate average_order_value
+        self.orders += other.orders
+        self.revenue += other.revenue
+
+        update = {
+          '$set' => {
+            average_order_value: average_order_value,
+            updated_at: Time.current.utc
+          },
+          '$inc' => {
+            orders: other.orders,
+            revenue: other.revenue,
+            discounts: other.discounts
+          }
+        }
+
+        update['$min'] = { first_order_at: other.first_order_at.utc } if other.first_order_at.present?
+        update['$max'] = { last_order_at: other.last_order_at.utc } if other.last_order_at.present?
+
+        self.class.collection.update_one({ _id: id }, update, upsert: true)
+        other.delete
+        reload
+      end
     end
   end
 end

data/app/models/workarea/release/changeset.rb

@@ -11,7 +11,10 @@ module Workarea
       belongs_to :release, class_name: 'Workarea::Release', index: true
       belongs_to :releasable, polymorphic: true, index: true, optional: true
 
-      index({ 'document_path.type' => 1, 'document_path.document_id' => 1})
+      index(
+        { 'document_path.type' => 1, 'document_path.document_id' => 1 },
+        { name: 'document_path' }
+      )
 
       # Whether these value changes to this field should be included when
       # saving a changeset. Used in building changeset hashes.

data/app/models/workarea/search/admin.rb

@@ -38,7 +38,7 @@ module Workarea
         aggregation = search(query)['aggregations']['grouped_by_type']['type']
         aggregation['buckets']
           .reduce([]) { |m, b| m + b['top']['hits']['hits'] }
-          .sort_by { |r| [r['_source']['jump_to_position'], r['_score']] }
+          .sort_by { |r| [r['_source']['jump_to_position'] || 999, r['_score'] || 0] }
           .map do |result|
             {
               label: result['_source']['jump_to_text'],

data/app/workers/workarea/update_email.rb

@@ -0,0 +1,33 @@
+module Workarea
+  class UpdateEmail
+    include Sidekiq::Worker
+    include Sidekiq::CallbacksWorker
+
+    sidekiq_options(
+      enqueue_on: { User => :update, with: -> { [id, changes] } }
+    )
+
+    def perform(id, changes)
+      return unless changes['email'].present? && changes['email'].first.present?
+
+      old_email, new_email = changes['email']
+      update_payment_profile(id, old_email, new_email)
+      update_metrics(old_email, new_email)
+    end
+
+    def update_payment_profile(id, old_email, new_email)
+      user = User.find(id)
+      user.email = old_email # set old email so we lookup by old email value
+
+      Payment::Profile.update_email(PaymentReference.new(user), new_email)
+    end
+
+    def update_metrics(old_email, new_email)
+      old_metrics = Metrics::User.find(old_email) rescue nil
+      return if old_metrics.blank?
+
+      new_metrics = Metrics::User.find_or_initialize_by(id: new_email)
+      new_metrics.merge!(old_metrics)
+    end
+  end
+end

data/lib/workarea/changelog.rake

@@ -38,7 +38,7 @@ namespace :workarea do
         author: author
       }
 
-      if subject.start_with?('Revert')
+      if subject.start_with?('Revert "')
         reverts << body.match(/[a-f0-9]{40}/)
         reverts << sha
       end

data/lib/workarea/core.rb

@@ -140,6 +140,7 @@ require 'workarea/ext/mongoid/find_ordered'
 require 'workarea/ext/sprockets/ruby_processor'
 require 'workarea/ext/jbuilder/jbuilder_append_partials'
 require 'workarea/ext/jbuilder/jbuilder_cache'
+require 'workarea/ext/referer_parser/parser.decorator'
 
 if Rails.env.development?
   require 'workarea/ext/freedom_patches/routes_reloader'

data/lib/workarea/ext/referer_parser/parser.decorator

@@ -0,0 +1,43 @@
+module RefererParser
+  # This code is actually in `master` branch of
+  # https://github.com/snowplow-referer-parser/ruby-referer-parser but
+  # has not yet been released. It's used to allow through android-app://
+  # URLs.
+  decorate Parser do
+    # Given a string or URI, return a hash of data
+    def parse(obj)
+      url = obj.is_a?(URI) ? obj : URI.parse(obj.to_s)
+
+      unless ['android-app', 'http', 'https'].include?(url.scheme)
+        raise InvalidUriError, "Only Android-App, HTTP, and HTTPS schemes are supported -- #{url.scheme}"
+      end
+
+      data = { known: false, uri: url.to_s }
+
+      domain, name_key = domain_and_name_key_for(url)
+      if domain && name_key
+        referer_data = @name_hash[name_key]
+        data[:known] = true
+        data[:source] = referer_data[:source]
+        data[:medium] = referer_data[:medium]
+        data[:domain] = domain
+
+        # Parse parameters if the referer uses them
+        if url.query && referer_data[:parameters]
+          query_params = CGI.parse(url.query)
+          referer_data[:parameters].each do |param|
+            # If there is a matching parameter, get the first non-blank value
+            unless (values = query_params[param]).empty?
+              data[:term] = values.reject { |v| v.strip == '' }.first
+              break if data[:term]
+            end
+          end
+        end
+      end
+
+      data
+    rescue URI::InvalidURIError
+      raise InvalidUriError.new("Unable to parse URI, not a URI? -- #{obj.inspect}", $ERROR_INFO)
+    end
+  end
+end

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 4
-    PATCH = 40
+    PATCH = 45
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/test/lib/workarea/ext/referer_parser/parser_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+module RefererParser
+  class ParserTest < Workarea::TestCase
+    def test_parse_android_app_referrers
+      referrers = [
+        'android-app://com.linkedin.android',
+        'android-app://org.telegram.plus',
+        'android-app://com.twitter.android'
+      ]
+
+      referrers.each do |uri|
+        referrer = Parser.new.parse(uri)
+
+        refute(referrer[:known])
+        assert_equal(uri, referrer[:uri])
+      end
+    end
+  end
+end

data/test/models/workarea/metrics/user_test.rb

@@ -74,6 +74,57 @@ module Workarea
         assert_equal(50, two.revenue_percentile)
         assert_equal(50, two.average_order_value_percentile)
       end
+
+      def test_merging_metrics
+        freeze_time
+
+        first = User.create!(
+          first_order_at: 2.weeks.ago,
+          last_order_at: 1.day.ago,
+          orders: 2,
+          revenue: 100,
+          discounts: -10,
+          average_order_value: 50,
+        )
+
+        first.merge!(User.new)
+        first.reload
+        assert_equal(1, Metrics::User.count)
+        assert_equal(2.weeks.ago, first.first_order_at)
+        assert_equal(1.day.ago, first.last_order_at)
+        assert_equal(2, first.orders)
+        assert_equal(100, first.revenue)
+        assert_equal(-10, first.discounts)
+        assert_equal(50, first.average_order_value)
+
+        second = User.create!(id: 'foo').tap { |u| u.merge!(first) }
+        second.reload
+        assert_equal(1, Metrics::User.count)
+        assert_equal(2.weeks.ago, second.first_order_at)
+        assert_equal(1.day.ago, second.last_order_at)
+        assert_equal(2, second.orders)
+        assert_equal(100, second.revenue)
+        assert_equal(-10, second.discounts)
+        assert_equal(50, second.average_order_value)
+
+        third = User.create!(
+          first_order_at: 3.weeks.ago,
+          last_order_at: 3.weeks.ago,
+          orders: 2,
+          revenue: 120,
+          average_order_value: 60,
+        )
+
+        third.merge!(second)
+        third.reload
+        assert_equal(1, Metrics::User.count)
+        assert_equal(3.weeks.ago, third.first_order_at)
+        assert_equal(1.day.ago, third.last_order_at)
+        assert_equal(4, third.orders)
+        assert_equal(220, third.revenue)
+        assert_equal(-10, third.discounts)
+        assert_equal(55, third.average_order_value)
+      end
     end
   end
 end

data/test/workers/workarea/update_email_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+module Workarea
+  class UpdateEmailTest < TestCase
+    def test_updating_payment_profile
+      user = create_user(email: 'user@workarea.com')
+      profile = Payment::Profile.lookup(PaymentReference.new(user))
+
+      UpdateEmail.new.perform(user.id.to_s, 'email' => [nil, 'user@workarea.com'])
+      assert_equal(profile.reload.email, 'user@workarea.com')
+
+      UpdateEmail.new.perform(
+        user.id.to_s,
+        'email' => ['user@workarea.com', 'test@workarea.com']
+      )
+      assert_equal(profile.reload.email, 'test@workarea.com')
+    end
+
+    def test_updating_metrics
+      user = create_user(email: 'user@workarea.com')
+      old_metrics = Metrics::User.find_or_initialize_by(id: 'user@workarea.com')
+      old_metrics.update!(orders: 3)
+
+      UpdateEmail.new.perform(user.id.to_s, 'email' => [nil, 'user@workarea.com'])
+      assert_equal(1, Metrics::User.count)
+      assert_equal(3, old_metrics.reload.orders)
+
+      new_metrics = Metrics::User.create!(id: 'test@workarea.com', orders: 1)
+
+      UpdateEmail.new.perform(
+        user.id.to_s,
+        'email' => ['user@workarea.com', 'test@workarea.com']
+      )
+      assert_equal(1, Metrics::User.count)
+      assert_raises(Mongoid::Errors::DocumentNotFound) { old_metrics.reload }
+      assert_equal(4, new_metrics.reload.orders)
+    end
+  end
+end

data/workarea-core.gemspec

@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'i18n-js', '~> 3.2.1'
   s.add_dependency 'local_time', '~> 1.0.3'
   s.add_dependency 'lodash-rails', '~> 4.17.4'
-  s.add_dependency 'jquery-rails', '~> 4.3.1'
+  s.add_dependency 'jquery-rails', '~> 4.4.0'
   s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
   s.add_dependency 'tooltipster-rails', '~> 4.1.2'
   s.add_dependency 'chart-js-rails', '~> 0.0.9' # TODO remove v4
@@ -67,7 +67,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'wysihtml-rails', '~> 0.6.0.beta2'
   s.add_dependency 'rack-attack', '~> 6.3.1'
   s.add_dependency 'jquery-livetype-rails', '~> 0.1.0' # TODO remove v4
-  s.add_dependency 'redcarpet', '~> 3.4.0'
+  s.add_dependency 'redcarpet', '~> 3.5.1', '>= 3.5.1'
   s.add_dependency 'jquery-unique-clone-rails', '~> 1.0.0'
   s.add_dependency 'avalanche-rails', '~> 1.2.0'
   s.add_dependency 'inline_svg', '~> 1.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.40
+  version: 3.4.45
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -632,14 +632,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -758,14 +758,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: jquery-unique-clone-rails
   requirement: !ruby/object:Gem::Requirement
@@ -882,22 +888,22 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.1
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -1711,7 +1717,7 @@ files:
 - app/workers/workarea/status_reporter.rb
 - app/workers/workarea/undo_release.rb
 - app/workers/workarea/update_elasticsearch_settings.rb
-- app/workers/workarea/update_payment_profile_email.rb
+- app/workers/workarea/update_email.rb
 - app/workers/workarea/verify_scheduled_releases.rb
 - bin/rails
 - config/i18n-js.yml
@@ -1873,6 +1879,7 @@ files:
 - lib/workarea/ext/mongoid/list_field.rb
 - lib/workarea/ext/mongoid/moped_bson.rb
 - lib/workarea/ext/mongoid/timestamps_timeless.rb
+- lib/workarea/ext/referer_parser/parser.decorator
 - lib/workarea/ext/sprockets/ruby_processor.rb
 - lib/workarea/ext/sprockets/task.rb
 - lib/workarea/geolocation.rb
@@ -2017,6 +2024,7 @@ files:
 - test/lib/workarea/ext/mongoid/except_test.rb
 - test/lib/workarea/ext/mongoid/find_ordered_test.rb
 - test/lib/workarea/ext/mongoid/list_field_test.rb
+- test/lib/workarea/ext/referer_parser/parser_test.rb
 - test/lib/workarea/geolocation_test.rb
 - test/lib/workarea/lint/inconsistent_details_test.rb
 - test/lib/workarea/lint/products_missing_images_test.rb
@@ -2366,7 +2374,7 @@ files:
 - test/workers/workarea/send_refund_email_test.rb
 - test/workers/workarea/status_reporter_test.rb
 - test/workers/workarea/undo_release_test.rb
-- test/workers/workarea/update_payment_profile_email_test.rb
+- test/workers/workarea/update_email_test.rb
 - test/workers/workarea/verify_scheduled_releases_test.rb
 - vendor/active_shipping/.gitignore
 - vendor/active_shipping/.travis.yml
@@ -2614,7 +2622,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Core of the Workarea Commerce Platform

data/app/workers/workarea/update_payment_profile_email.rb

@@ -1,22 +0,0 @@
-module Workarea
-  class UpdatePaymentProfileEmail
-    include Sidekiq::Worker
-    include Sidekiq::CallbacksWorker
-
-    sidekiq_options(
-      enqueue_on: { User => :update, with: -> { [id, changes] } }
-    )
-
-    def perform(id, changes)
-      if changes['email'].present? && changes['email'].first.present?
-        old_email = changes['email'].first
-        new_email = changes['email'].last
-
-        user = User.find(id)
-        user.email = old_email # set old email so we lookup by old email value
-
-        Payment::Profile.update_email(PaymentReference.new(user), new_email)
-      end
-    end
-  end
-end

data/test/workers/workarea/update_payment_profile_email_test.rb

@@ -1,27 +0,0 @@
-require 'test_helper'
-
-module Workarea
-  class UpdatePaymentProfileEmailTest < Workarea::TestCase
-    setup do
-      @user = create_user(email: 'user@workarea.com')
-      @profile = Payment::Profile.lookup(PaymentReference.new(@user))
-      @worker = UpdatePaymentProfileEmail.new
-    end
-
-    def test_updating_payment_profile_email_address
-      @worker.perform(
-        @user.id.to_s,
-        'email' => ['user@workarea.com', 'test@workarea.com']
-      )
-
-      @profile.reload
-      assert_equal(@profile.email, 'test@workarea.com')
-    end
-
-    def test_skipping_update_if_email_change_is_nil
-      @worker.perform(@user.id.to_s, 'email' => [nil, 'user@workarea.com'])
-      @profile.reload
-      assert_equal(@profile.email, 'user@workarea.com')
-    end
-  end
-end