workarea-core 3.5.12 → 3.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07f92725a7deefad82f4df41734ec888981896e7ed23948b809da43495f3234c
-  data.tar.gz: be8b5ee9228c3c3c073f2e0456d2dcb60abb77bae48f904f75b608b6e5ce3fb3
+  metadata.gz: 8d24b6af137b806311dbd5d13fb13a57f8693f99d767f94fb3144994fe9c7028
+  data.tar.gz: dbbfb80358c11fc03b2e470ac741f615dc2d68e5f9c6c0d55b3b69567eaa4d02
 SHA512:
-  metadata.gz: 252398a30da73f5e643367f8c63628a7cbbd739d5ec7bf945ffa71d59065b7b7b60b22cf2a9867f96a0e7047136a4b7ff3bddb7e0943fd8c388c88458645d82b
-  data.tar.gz: 29fbc57881073fabc8294289477c1ff548f640c10dba07aa8c1409dd2757ff9b78c3ed34236efc22ee99c8c2c9e06006363eb2bb8ca7ba43fd422418e163084f
+  metadata.gz: a7f587ddc4e1e9c425eaace526f562f99ec5885002f833fd33a134164d3d20a405938a1e762b3cfd221824a77f435ebb79383591ae2bd0c3b81bd407ba0ceb12
+  data.tar.gz: 61da7b2aa4a72d5e0b5456b401f9124769fa5f43c601d33e6e14b6a64bf820910bed36faf6992a1865e603455710b05647fa62b62488fa8fd973d33edac02564

data/app/mailers/workarea/application_mailer.rb

@@ -8,7 +8,10 @@ module Workarea
     default from: -> (*) { Workarea.config.email_from }
 
     def default_url_options(options = {})
-      super.merge(host: Workarea.config.host)
+      # super isn't returning the configured options, so manually merge them in
+      super
+        .merge(Rails.application.config.action_mailer.default_url_options.to_h)
+        .merge(host: Workarea.config.host)
     end
   end
 end

data/app/models/workarea/checkout.rb

@@ -47,11 +47,7 @@ module Workarea
     def inventory
       @inventory ||= Inventory::Transaction.from_order(
         order.id,
-        order.items.inject({}) do |memo, item|
-          memo[item.sku] ||= 0
-          memo[item.sku] += item.quantity
-          memo
-        end
+        order.sku_quantities
       )
     end
 
@@ -158,10 +154,14 @@ module Workarea
     # Used in auto completing an order for a logged in user.
     #
     # @param [Hash] parameters for updating
-    # @return [self]
+    # @return [Boolean] whether the update was successful.
     #
     def update(params = {})
-      steps.each { |s| s.new(self).update(params) }
+      return true if params.blank?
+
+      steps.reduce(true) do |result, step|
+        result &= step.new(self).update(params)
+      end
     end
 
     # Whether this checkout needs any further information

data/app/models/workarea/data_file/csv.rb

@@ -17,7 +17,15 @@ module Workarea
           assign_attributes(root, attrs)
           assign_embedded_attributes(root, attrs)
 
-          if root.save || failed_new_record_ids.exclude?(id)
+          possibly_affected_models = root.embedded_children + [root]
+          was_successful = true
+
+          possibly_affected_models.each do |model|
+            meaningful_changes = model.changes.except('updated_at')
+            was_successful &= model.save if model.changed? && meaningful_changes.present?
+          end
+
+          if was_successful || failed_new_record_ids.exclude?(id)
             log(index, root)
           else
             operation.total += 1 # ensure line numbers remain consistent

data/app/models/workarea/inquiry.rb

@@ -15,7 +15,8 @@ module Workarea
     validate :subject_exists
 
     def full_subject
-      Workarea.config.inquiry_subjects[subject]
+      I18n.t('workarea.inquiry.subjects')[subject.optionize.to_sym].presence ||
+        Workarea.config.inquiry_subjects[subject]
     end
 
     private

data/app/models/workarea/inventory/sku.rb

@@ -142,11 +142,11 @@ module Workarea
       end
 
       def policy_class
-        "Workarea::Inventory::Policies::#{policy.classify}".constantize
+        "Workarea::Inventory::Policies::#{policy.camelize}".constantize
       rescue NameError
         raise(
           InvalidPolicy,
-          "Workarea::Inventory::Policies::#{policy.classify} must be a policy class"
+          "Workarea::Inventory::Policies::#{policy.camelize} must be a policy class"
         )
       end
 

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

@@ -110,14 +110,28 @@ module Workarea
       end
 
       def merge!(other)
-        %w(orders revenue discounts cancellations refund).each do |field|
-          self.send("#{field}=", send(field) + other.send(field))
-        end
-
-        self.first_order_at = [first_order_at, other.first_order_at].compact.min
-        self.last_order_at = [last_order_at, other.last_order_at].compact.max
-        self.average_order_value = average_order_value
-        save!
+        # 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,
+            cancellations: other.cancellations,
+            refund: other.refund
+          }
+        }
+
+        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)
 
         self.class.save_affinity(
           id: id,
@@ -133,6 +147,8 @@ module Workarea
           category_ids: other.purchased.category_ids,
           search_ids: other.purchased.search_ids
         )
+
+        reload
       end
     end
   end

data/app/models/workarea/order.rb

@@ -47,13 +47,13 @@ module Workarea
       {
         placed_at: 1,
         reminded_at: 1,
+        fraud_suspected_at: 1,
         checkout_started_at: 1,
         email: 1,
-        "items[0]._id": 1,
-        fraud_suspected_at: 1
+        "items[0]._id": 1
       },
       {
-        name: 'abandoned_order_email_with_fraud_index',
+        name: 'abandoned_order_email_with_fraud_index_v2',
         background: true
       }
     )
@@ -375,6 +375,16 @@ module Workarea
       )
     end
 
+    # A hash with the quantity of each SKU in the order
+    #
+    # @return [Hash]
+    #
+    def sku_quantities
+      items.each_with_object(Hash.new(0)) do |item, quantities|
+        quantities[item.sku] += item.quantity
+      end
+    end
+
     private
 
     def item_count_limit

data/app/models/workarea/payment.rb

@@ -80,12 +80,7 @@ module Workarea
       build_credit_card unless credit_card
       credit_card.saved_card_id = nil
       credit_card.attributes = attrs.slice(
-        :month,
-        :year,
-        :saved_card_id,
-        :number,
-        :cvv,
-        :amount
+        *Workarea.config.credit_card_attributes
       )
       save
     end

data/app/models/workarea/releasable.rb

@@ -72,7 +72,9 @@ module Workarea
         release.preview.changesets_for(self).each { |cs| cs.apply_to(result) }
         result
       else
-        Release.with_current(release) { self.class.find(id) }
+        Release.with_current(release) do
+          Mongoid::QueryCache.uncached { self.class.find(id) }
+        end
       end
     end
 

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

@@ -18,6 +18,7 @@ module Workarea
       index({ 'document_path.type' => 1, 'document_path.document_id' => 1 })
       index('changeset.product_ids' => 1)
       index('original.product_ids' => 1)
+      index('releasable_type' => 1, 'releasable_id' => 1)
 
       # Finds changeset by whether the passed document is in the document
       # path of the changeset. Useful for showing embedded changes in the

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

@@ -21,7 +21,7 @@ module Workarea
         end
 
         def keywords
-          super + model.promo_codes
+          super + Array.wrap(model.try(:promo_codes))
         end
 
         def facets

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

@@ -82,6 +82,14 @@ module Workarea
         @changesets ||= Array.wrap(model.try(:changesets_with_children))
       end
 
+      def releases
+        changesets
+          .uniq(&:release)
+          .reject { |cs| cs.release.blank? }
+          .flat_map { |cs| [cs.release] + cs.release.scheduled_after }
+          .uniq
+      end
+
       def as_document
         Release.with_current(release_id) do
           {
@@ -91,7 +99,7 @@ module Workarea
             active: active,
             active_segment_ids: active_segment_ids,
             release_id: release_id,
-            changeset_release_ids: changesets.map(&:release_id),
+            changeset_release_ids: releases.map(&:id),
             suggestion_content: suggestion_content,
             created_at: model.created_at,
             updated_at: model.updated_at,

data/app/models/workarea/search/storefront/category_query.rb

@@ -144,7 +144,7 @@ module Workarea
             .where(releasable_type: ProductRule.name)
             .any_in(releasable_id: category.product_rules.map(&:id))
             .includes(:release)
-            .to_a
+            .select(&:release)
         end
       end
     end

data/app/models/workarea/search/storefront/product.rb

@@ -122,12 +122,21 @@ module Workarea
           ProductPrimaryImageUrl.new(model).path
         end
 
-        # Override to include release changesets for pricing, featured products, etc.
+        # All {Releasable}s that could affect the product's Elasticsearch document
+        # should add their changesets to this method.
+        #
+        # @example Add to the changesets affecting a product in a decorator
+        #   def changesets
+        #     super.merge(SomeReleasable.for_product(product.id).changesets_with_children)
+        #   end
         #
         # @return [Mongoid::Criteria]
         #
         def changesets
-          @product_changesets ||= ProductReleases.new(model).changesets
+          criteria = model.changesets_with_children
+          pricing.each { |ps| criteria.merge!(ps.changesets_with_children) }
+          criteria.merge!(FeaturedProducts.changesets(model.id))
+          criteria.includes(:release)
         end
 
         private

data/app/queries/workarea/product_releases.rb

@@ -1,4 +1,10 @@
 module Workarea
+  #
+  # TODO remove in v3.6
+  #
+  # This is no longer used, this logic was moved into the search models to allow
+  # it to be used for any model (not just products).
+  #
   class ProductReleases
     attr_reader :product
 

data/app/services/workarea/direct_upload.rb

@@ -8,7 +8,12 @@ module Workarea
       url += ":#{uri.port}" unless uri.port.in? [80, 443]
       id = "direct_upload_#{url}"
 
-      response = Workarea.s3.get_bucket_cors(Configuration::S3.bucket)
+      response = begin
+        Workarea.s3.get_bucket_cors(Configuration::S3.bucket)
+      rescue Excon::Error::NotFound
+        Excon::Response.new(body: { 'CORSConfiguration' => [] })
+      end
+
       cors = response.data[:body]
 
       unless cors['CORSConfiguration'].pluck('ID').include?(id)

data/app/services/workarea/index_release_schedule_previews.rb

@@ -0,0 +1,37 @@
+module Workarea
+  class IndexReleaseSchedulePreviews
+    attr_reader :release, :starts_at, :ends_at
+
+    def initialize(release: nil, starts_at: nil, ends_at: nil)
+      @release = release
+      @starts_at = starts_at
+      @ends_at = ends_at
+    end
+
+    def affected_releases
+      result = Release
+        .scheduled(after: starts_at, before: ends_at)
+        .includes(:changesets)
+        .to_a
+
+      result << release if release.present?
+      result.uniq
+    end
+
+    def affected_models
+      affected_releases.flat_map(&:changesets).flat_map(&:releasable).compact
+    end
+
+    def perform
+      affected_releases.each do |release|
+        affected_models.each do |releasable|
+          Search::Storefront.new(releasable.in_release(release)).destroy
+
+          # Different models have different indexing workers, running callbacks
+          # ensures the appropriate worker is triggered
+          releasable.run_callbacks(:save_release_changes)
+        end
+      end
+    end
+  end
+end

data/app/workers/workarea/index_category_changes.rb

@@ -4,16 +4,29 @@ module Workarea
     include Sidekiq::CallbacksWorker
 
     sidekiq_options(
-      enqueue_on: { Catalog::Category => [:save, :save_release_changes], with: -> { [changes] } },
+      enqueue_on: {
+        Catalog::Category => [:save, :save_release_changes],
+        with: -> { [changes, Release.current.present?] }
+      },
       ignore_if: -> { changes['product_ids'].blank? },
       lock: :until_executing,
       query_cache: true
     )
 
-    def perform(changes)
+    def perform(changes, for_release = false)
       return unless changes['product_ids'].present?
 
-      ids = require_index_ids(*changes['product_ids'])
+      ids = if for_release
+        # This is a shortcut because if you're resorting products within a release,
+        # the `changes` hash doesn't reflect the repositioning within the release,
+        # only the difference between what's live and what's in the release.
+        #
+        # Reindexing all of them is a shortcut to having to manually build a diff
+        # between the changesets in the possible affected releases.
+        changes['product_ids'].flatten.uniq
+      else
+        require_index_ids(*changes['product_ids'])
+      end
 
       if ids.size > max_count
         ids.each { |id| IndexProduct.perform_async(id) }

data/app/workers/workarea/index_release_schedule_change.rb

@@ -0,0 +1,32 @@
+module Workarea
+  class IndexReleaseScheduleChange
+    include Sidekiq::Worker
+    include Sidekiq::CallbacksWorker
+
+    sidekiq_options(
+      enqueue_on: {
+        Release => [:save, :destroy],
+        only_if: -> { publish_at_changed? || destroyed? },
+        with: -> { [id, publish_at_was, publish_at] }
+      },
+      queue: 'releases'
+    )
+
+    def perform(id, previous_publish_at, new_publish_at)
+      # When destroyed, changesets for the release ID will still exist and be used to update the index
+      rescheduled_release = Release.find_or_initialize_by(id: id)
+
+      earlier, later = if rescheduled_release.persisted? && previous_publish_at.present? && new_publish_at.present?
+        [previous_publish_at, new_publish_at].sort
+      elsif previous_publish_at.present?
+        [previous_publish_at, nil]
+      else
+        [new_publish_at, nil]
+      end
+
+      IndexReleaseSchedulePreviews
+        .new(release: rescheduled_release, starts_at: earlier, ends_at: later)
+        .perform
+    end
+  end
+end

data/app/workers/workarea/publish_release.rb

@@ -8,6 +8,7 @@ module Workarea
       system_user = User.find_system_user!(release.name, 'Release')
 
       Mongoid::AuditLog.record(system_user) { release.publish! }
+      IndexReleaseSchedulePreviews.new(release: release).perform
 
     rescue Mongoid::Errors::DocumentNotFound
       # Doesn't matter, release has been removed

data/config/locales/en.yml

@@ -102,6 +102,8 @@ en:
       name: "Fulfillment SKU %{id}"
     inventory_sku:
       name: "Inventory %{id}"
+    inquiry:
+      subjects: {}
     order:
       name: "Order %{id}"
       traffic_referrer:

data/lib/generators/workarea/install/install_generator.rb

@@ -55,6 +55,19 @@ module Workarea
       remove_file 'public/favicon.ico'
     end
 
+    def add_development_mailer_port
+      development_port = <<-CODE
+
+  config.action_mailer.default_url_options = { port: 3000 }
+      CODE
+
+      inject_into_file(
+        'config/environments/development.rb',
+        development_port,
+        before: /^end/
+      )
+    end
+
     private
 
     def app_name