workarea-core 3.4.42 → 3.4.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb1a7c0e5cf9108b58d636eca7349f0ec61c1c24b91e3356d6978a70048fb745
-  data.tar.gz: 46609e92ace1945db58648ce33306fb2000532d9b1867bbf1a8530484e2a2ba0
+  metadata.gz: 30d5b2273f510412bf81387ac4d229e05ef322219dba42166dffd16c2a30d458
+  data.tar.gz: 0163e5cd44474ad11c119debb3dd116a0637be8f514b8d920cab4e093f3f4578
 SHA512:
-  metadata.gz: 4320bf6ca0537e6aa5e5ca6c3c5afd68cd269579fc38f8acff6d669064c8d8aaf37b2afadc160edf8c55fb4857834cb9d9a38a1a6e9fdb9e2f36bae62781d286
-  data.tar.gz: 353ee66c41b45fe5695a19c444fb8f21e4c35140cdfa804f03b8da50bb6cd2e6e70d05e1ee06b61cc4577c666d68dca09f4e58915a04b1974f7b916eacc531b0
+  metadata.gz: 00d52ab3b83bb7057218e4b70d668a98e85b1c953f2607b15826599d75d6970fdd681eea595b1270533889f90e75be3db8a539f4a16016578acd6c285fffb4aa
+  data.tar.gz: d73e489b510f361b0a75cbd705c1731ae6bea3693fd25ed3ee76d502ff4802724ba744442bade25b99171d444c0ec0f805591650a852fe74f8f7a5bfef83d5df

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.42
+  version: 3.4.43
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-14 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
@@ -2368,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