workarea-core 3.4.38 → 3.4.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ffbb2028cd43e91abbc3601126483073b55997738eba74759b902e353590b67
-  data.tar.gz: 70acccdddb99146faaf878e862bc8a1e2161f5c2a62a10cd0f3f1f5f97bc4b19
+  metadata.gz: 30d5b2273f510412bf81387ac4d229e05ef322219dba42166dffd16c2a30d458
+  data.tar.gz: 0163e5cd44474ad11c119debb3dd116a0637be8f514b8d920cab4e093f3f4578
 SHA512:
-  metadata.gz: fb66b15c9317d085e8dbd97262ddf4ae85ef31eb5cbb77b1bf6375f69b284a6ce439579c534b6ec05c337644b022e4b186e4f55c51cabf555a29c490f131bc8e
-  data.tar.gz: db47bf0b35f4f7f12a27b05759d242301e7b0b6779670d41fab803129fd391c9246ecc08f494314e3865c5f8190a636d6f1df521b3b31d545dec53c624c5a6dd
+  metadata.gz: 00d52ab3b83bb7057218e4b70d668a98e85b1c953f2607b15826599d75d6970fdd681eea595b1270533889f90e75be3db8a539f4a16016578acd6c285fffb4aa
+  data.tar.gz: d73e489b510f361b0a75cbd705c1731ae6bea3693fd25ed3ee76d502ff4802724ba744442bade25b99171d444c0ec0f805591650a852fe74f8f7a5bfef83d5df

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/controllers/workarea/impersonation.rb

@@ -50,7 +50,8 @@ module Workarea
     end
 
     def current_impersonation
-      @current_impersonation ||= User.find(cookies.signed[:user_id])
+      return @current_impersonation if defined?(@current_impersonation)
+      @current_impersonation = User.find(cookies.signed[:user_id]) rescue nil
     end
 
     def touch_impersonation

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/queries/workarea/search/admin_search.rb

@@ -11,6 +11,10 @@ module Workarea
       def self.available_sorts
         AdminSorting.available_sorts
       end
+
+      def default_admin_sort
+        [{ _score: :desc }, { updated_at: :desc }]
+      end
     end
   end
 end

data/app/queries/workarea/search/admin_sorting.rb

@@ -16,7 +16,7 @@ module Workarea
       end
 
       def default_admin_sort
-        [{ _score: :desc },  { updated_at: :desc }]
+        [{ updated_at: :desc }, { _score: :desc }]
       end
 
       def user_selected_sort

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 = 38
+    PATCH = 43
     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/queries/workarea/search/admin_search_test.rb

@@ -81,6 +81,16 @@ module Workarea
         assert_equal(results.reverse, search.results)
       end
 
+      def test_default_sort_by_score
+        # Unlike other admin searches (primarily indexes), we want searching to
+        # default sort by score. Testing scores directly is unreliable so just
+        # do a simple check here.
+        assert_equal(
+          [{ _score: :desc }, { updated_at: :desc }],
+          AdminSearch.new.default_admin_sort
+        )
+      end
+
       def test_selected_sorting
         results = [
           create_product(name: 'A', variants: []),

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.38
+  version: 3.4.43
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1711,7 +1711,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 +1873,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 +2018,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 +2368,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

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