workarea-core 3.4.45 → 3.5.0.beta.1

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

@@ -1,34 +1,23 @@
+# This fixes Release::Changes == Mongoid::AuditLog::Changes in development
+require_dependency 'workarea/release/changes'
+
 module Workarea
   class Release
     class Changeset
       include ApplicationDocument
 
       field :changeset, type: Hash, default: {}
-      field :undo, type: Hash, default: {}
+      field :original, type: Hash, default: {}
+      field :undo, type: Hash, default: {} # TODO deprecated, remove in v3.6
 
       embeds_many :document_path, class_name: 'Mongoid::DocumentPath::Node'
 
       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 },
-        { name: 'document_path' }
-      )
-
-      # Whether these value changes to this field should be included when
-      # saving a changeset. Used in building changeset hashes.
-      #
-      # @param attribute [String]
-      # @param old_value [Object]
-      # @param new_value [Object]
-      #
-      # @return [Boolean]
-      #
-      def self.track_change?(attribute, old_value, new_value)
-        !attribute.in?(Workarea.config.untracked_release_changes_fields) &&
-          (old_value.present? || new_value.present?)
-      end
+      index({ 'document_path.type' => 1, 'document_path.document_id' => 1 })
+      index('changeset.product_ids' => 1)
+      index('original.product_ids' => 1)
 
       # Finds changeset by whether the passed document is in the document
       # path of the changeset. Useful for showing embedded changes in the
@@ -61,6 +50,10 @@ module Workarea
         changeset.keys
       end
 
+      def includes_change?(key, new_value)
+        changed_fields.include?(key) && changeset[key] == new_value
+      end
+
       # Apply (but do not save) the changes represented by this changeset to
       # the model passed in.
       #
@@ -73,45 +66,44 @@ module Workarea
       # Make the changes represented by this changeset live. Used when
       # publishing a release.
       #
-      # Builds and saves the undo in case that's desired later.
-      #
       # @return [Boolean]
       #
       def publish!
         return false if releasable_from_document_path.blank?
 
-        build_undo
         apply_to(releasable_from_document_path)
 
         releasable_from_document_path.skip_changeset do
           releasable_from_document_path.save!
         end
 
-        save! # saves undo
+        save!
       end
 
-      # Apply the changes in the undo hash on this changeset and save to make
-      # them live. Used when undoing a release.
-      #
-      # @return [Boolean]
-      #
-      def undo!
-        apply_changeset(releasable_from_document_path, undo)
-
-        releasable_from_document_path.skip_changeset do
-          releasable_from_document_path.save!
+      def build_undo(attributes = {})
+        # Ensure the appropriate Release.current for building the undo
+        # This can be nil, which is essential if there is some other arbitrary
+        # release as Release.current.
+        Release.with_current(release.previous) do
+          releasable_from_document_path.reload
+
+          Changeset.new(
+            attributes.reverse_merge(
+              releasable: releasable,
+              document_path: document_path,
+              changeset: changeset.keys.inject({}) do |memo, key|
+                old_value = releasable_from_document_path.attributes[key]
+                new_value = changeset[key]
+
+                memo[key] = old_value if Changes.tracked_change?(key, old_value, new_value)
+                memo
+              end
+            )
+          )
         end
-      end
 
-      def releasable_from_document_path
-        return @releasable_from_document_path if defined?(@releasable_from_document_path)
-
-        @releasable_from_document_path =
-          begin
-            Mongoid::DocumentPath.find(document_path)
-          rescue Mongoid::Errors::DocumentNotFound
-            nil
-          end
+      ensure
+        releasable_from_document_path.reload
       end
 
       private
@@ -123,17 +115,15 @@ module Workarea
         end
       end
 
-      def build_undo(model = releasable_from_document_path)
-        self.undo = changeset.keys.inject({}) do |memo, key|
-          old_value = model.attributes[key]
-          new_value = changeset[key]
+      def releasable_from_document_path
+        return @releasable_from_document_path if defined?(@releasable_from_document_path)
 
-          if self.class.track_change?(key, old_value, new_value)
-            memo[key] = old_value
+        @releasable_from_document_path =
+          begin
+            Mongoid::DocumentPath.find(document_path)
+          rescue Mongoid::Errors::DocumentNotFound
+            nil
           end
-
-          memo
-        end
       end
     end
   end

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

@@ -0,0 +1,28 @@
+module Workarea
+  class Release
+    class Preview
+      attr_reader :release
+
+      def initialize(release)
+        @release = release
+      end
+
+      def releases
+        @releases ||= release.scheduled_before + [release]
+      end
+
+      def changesets
+        @changesets ||= releases.flat_map(&:changesets)
+      end
+
+      def changesets_for(model)
+        changesets.select do |changeset|
+          # Check this way because loading the releasable will cause `load_release_changes`
+          # to run this, resulting in a stack overflow.
+          changeset.releasable_type == model.class.name &&
+            changeset.releasable_id.to_s == model.id.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -5,9 +5,7 @@ module Workarea
         include StatusCalculator::Status
 
         def in_status?
-          model.publish_at.blank? &&
-          model.published_at.blank? &&
-          model.undo_at.blank?
+          model.publish_at.blank? && model.published_at.blank?
         end
       end
 
@@ -24,27 +22,7 @@ module Workarea
         include StatusCalculator::Status
 
         def in_status?
-          model.published_at.present? &&
-          model.publish_at.blank?
-        end
-      end
-
-      class Undone
-        include StatusCalculator::Status
-
-        def in_status?
-          model.published_at.present? &&
-          model.undone_at.present?
-        end
-      end
-
-      class ScheduledUndo
-        include StatusCalculator::Status
-
-        def in_status?
-          return false unless model.undo_at.present?
-          model.published_at.present? &&
-          model.undo_at >= Time.current
+          model.published_at.present? && model.publish_at.blank?
         end
       end
     end

data/app/models/workarea/release.rb

@@ -8,27 +8,25 @@ module Workarea
     field :publish_at, type: Time
     field :published_at, type: Time
     field :publish_job_id, type: String
-    field :undo_at, type: Time
-    field :undone_at, type: Time
-    field :undo_job_id, type: String
+    field :undo_at, type: Time # TODO deprecated, remove in v3.6
+    field :undone_at, type: Time # TODO deprecated, remove in v3.6
+    field :undo_job_id, type: String # TODO deprecated, remove in v3.6
 
     has_many :changesets, class_name: 'Workarea::Release::Changeset'
+    has_one :undo, class_name: 'Workarea::Release', inverse_of: :undoes
+    belongs_to :undoes, class_name: 'Workarea::Release', inverse_of: :undo, optional: true
 
     index({ publish_at: 1 })
     index({ published_at: 1 })
-    index({ undo_at: 1 })
-    index({ undone_at: 1 })
 
     validates :name, presence: true
     validate :publish_at_status
-    validate :undoable_release, if: :undo_at?
 
+    after_find :reset_preview
     before_save :remove_publish_job, if: Proc.new { |r| r.publish_at.blank? }
-    before_save :remove_undo_job, if: Proc.new { |r| r.undo_at.blank? }
     before_save :schedule_publish
-    before_save :schedule_undo
+    after_save :reset_preview
     before_destroy :remove_publish_job
-    before_destroy :remove_undo_job
 
     scope :not_published, (lambda do
       any_of({ :published_at.exists => false }, { published_at: nil })
@@ -36,11 +34,21 @@ module Workarea
     scope :published, (lambda do
       where(:published_at.exists => true)
     end)
+    scope :published_between, ->(starts_at: nil, ends_at: nil) do
+      where(
+        :published_at.gte => starts_at,
+        :published_at.lte => ends_at
+      )
+    end
     scope :not_scheduled, (lambda do
       any_of({ :publish_at.exists => false }, { publish_at: nil })
     end)
-    scope :scheduled, -> { where(:publish_at.gt => Time.current) }
-    scope :to_undo, -> { where(:undo_at.gt => Time.current) }
+    scope :scheduled, ->(before: nil, after: nil) do
+      criteria = where(:publish_at.gt => Time.current)
+      criteria = criteria.where(:publish_at.lte => before) if before.present?
+      criteria = criteria.where(:publish_at.gte => after) if after.present?
+      criteria
+    end
     scope :soonest, -> { scheduled.asc(:publish_at) }
     scope :tomorrow, -> do
       where(
@@ -57,15 +65,28 @@ module Workarea
       Thread.current[:current_release] = release
     end
 
-    def self.with_current(release_id, &block)
+    def self.with_current(release)
       previous = current
-      self.current = release_id.blank? ? nil : find(release_id) rescue nil
 
-      return_value = block.call
+      new_current = if release.is_a?(Release)
+        release
+      elsif release.present?
+        find(release) rescue nil
+      end
+
+      self.current = new_current
+      current&.reset_preview
+      yield
 
     ensure
       self.current = previous
-      return_value
+
+      current&.reset_preview
+      previous&.reset_preview
+    end
+
+    def self.without_current(&block)
+      with_current(nil, &block)
     end
 
     # Gets a list of unscheduled releases
@@ -104,29 +125,12 @@ module Workarea
       results.uniq.sort_by { |r| [r.publish_at || 0, r.published_at || 0] }
     end
 
-    # Get a list of releases undone or to be undone
-    # within a given range
-    #
-    # @ return [Array<Release>]
-    #
-    def self.undone_within(start_date, end_date)
-      results = where(
-        :undo_at.gte => start_date.to_time,
-        :undo_at.lte => end_date.to_time
-      )
-
-      results += where(
-        :undone_at.gte => start_date.to_time,
-        :undone_at.lte => end_date.to_time
-      )
-
-      results.uniq.sort_by { |r| [r.undo_at || 0, r.undone_at || 0] }
+    def self.sort_by_publish
+      scoped.sort_by { |r| [r.publish_at, r.created_at] }
     end
 
     def as_current
-      self.class.with_current(id) do
-        yield
-      end
+      self.class.with_current(self) { yield }
     end
 
     def scheduled?
@@ -141,31 +145,48 @@ module Workarea
       scheduled? || (!scheduled? && !published?)
     end
 
-    def undone?
-      !!undone_at
-    end
-
     def has_changes?
       changesets.present?
     end
 
-    def publish!
-      self.published_at = Time.current
-      self.undone_at = nil
-      self.publish_at = nil
-      save!
+    def preview
+      @preview ||= Preview.new(self)
+    end
+
+    def reset_preview
+      @preview = nil
+    end
+
+    def scheduled_before
+      return [] unless scheduled?
+      self.class.scheduled(before: publish_at).ne(id: id).sort_by_publish
+    end
 
-      ordered_changesets.each(&:publish!)
-      touch_releasables
+    def scheduled_after
+      return [] unless scheduled?
+      self.class.scheduled(after: publish_at).ne(id: id).sort_by_publish
     end
 
-    def undo!
-      self.undo_at = nil if undo_at.present? && undo_at >= Time.current
-      self.undone_at = Time.current
+    def previous
+      scheduled_before.last
+    end
+
+    def build_undo(attributes = {})
+      result = undo || Release.new(attributes)
+
+      result.name ||= I18n.t('workarea.release.undo', name: name)
+      result.tags = %w(undo) if result.tags.blank?
+      self.undo = result
+
+      result
+    end
+
+    def publish!
+      self.published_at = Time.current
+      self.publish_at = nil
       save!
 
-      ordered_changesets.each(&:undo!)
-      touch_releasables
+      changesets.each(&:publish!)
     end
 
     def set_publish_job
@@ -177,15 +198,6 @@ module Workarea
       )
     end
 
-    def set_undo_job
-      self.undo_job_id = Scheduler.schedule(
-        worker: UndoRelease,
-        at: undo_at,
-        args: [id.to_s],
-        job_id: undo_job_id
-      )
-    end
-
     # Get all statuses of this release.
     #
     # @return [Array<Symbol>]
@@ -195,18 +207,6 @@ module Workarea
       StatusCalculator.new(calculators, self).results
     end
 
-    # Get changesets ordered based on publish priority set by configuration.
-    #
-    # @return [Array<Workarea::Release::Changeset>]
-    #
-    def ordered_changesets
-      ordering = Workarea.config.release_changeset_ordering
-
-      changesets.sort_by do |changeset|
-        ordering[changeset.releasable_type].presence || 999
-      end
-    end
-
     private
 
     def publish_at_status
@@ -219,38 +219,11 @@ module Workarea
       set_publish_job if publish_at_changed? && publish_at.present?
     end
 
-    def schedule_undo
-      set_undo_job if undo_at_changed? && undo_at.present?
-    end
-
     def remove_publish_job
       return if publish_job_id.blank?
 
       Scheduler.delete(publish_job_id)
       self.publish_job_id = nil
     end
-
-    def remove_undo_job
-      return if undo_job_id.blank?
-
-      Scheduler.delete(undo_job_id)
-      self.undo_job_id = nil
-    end
-
-    def undoable_release
-      unless publish_at.present? || published_at.present?
-        errors.add(:undo_at, I18n.t('workarea.errors.messages.undo_unpublished_release'))
-      end
-    end
-
-    def touch_releasables
-      Sidekiq::Callbacks.disable do
-        changesets
-          .map(&:releasable_from_document_path)
-          .compact
-          .uniq
-          .each(&:touch)
-      end
-    end
   end
 end

data/app/models/workarea/release_session.rb

@@ -1,7 +1,7 @@
 module Workarea
   class ReleaseSession
-    def initialize(cookies)
-      @cookies = cookies
+    def initialize(session)
+      @session = session
     end
 
     def remind?
@@ -9,8 +9,8 @@ module Workarea
     end
 
     def expired_by_time?
-      @cookies.permanent[:release_changed_at].present? &&
-        Time.zone.parse(@cookies.permanent[:release_changed_at]) < timeout
+      @session[:release_changed_at].present? &&
+        Time.zone.parse(@session[:release_changed_at]) < timeout
     end
 
     def timeout
@@ -18,8 +18,8 @@ module Workarea
     end
 
     def expired_by_page_views?
-      @cookies.permanent[:release_page_views].present? &&
-        @cookies.permanent[:release_page_views].to_i > max_page_views
+      @session[:release_page_views].present? &&
+        @session[:release_page_views].to_i > max_page_views
     end
 
     def max_page_views
@@ -27,19 +27,19 @@ module Workarea
     end
 
     def save_page_view
-      incremented = @cookies.permanent[:release_page_views].to_i + 1
-      @cookies.permanent[:release_page_views] = incremented
+      incremented = @session[:release_page_views].to_i + 1
+      @session[:release_page_views] = incremented
     end
 
     def save_release_change
       reset!
-      @cookies.permanent[:release_changed_at] = Time.current.to_s
+      @session[:release_changed_at] = Time.current.to_s
     end
     alias_method :touch, :save_release_change
 
     def reset!
-      @cookies.permanent[:release_page_views] = nil
-      @cookies.permanent[:release_changed_at] = nil
+      @session.delete(:release_page_views)
+      @session.delete(:release_changed_at)
     end
   end
 end

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

@@ -80,8 +80,7 @@ module Workarea
         end
 
         def low_inventory?
-          available = Inventory::Sku.in(id: model.skus).sum(&:available_to_sell)
-          available < Workarea.config.low_inventory_threshold
+          Inventory::Collection.new(model.skus).low_inventory?
         end
 
         def variant_missing_details?

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

@@ -0,0 +1,27 @@
+module Workarea
+  module Search
+    class Admin
+      class FulfillmentSku < Search::Admin
+        def type
+          'fulfillment_sku'
+        end
+
+        def search_text
+          model.name
+        end
+
+        def jump_to_text
+          "#{model.id} - (#{model.policy})"
+        end
+
+        def jump_to_position
+          12
+        end
+
+        def facets
+          super.merge(policy: model.policy)
+        end
+      end
+    end
+  end
+end

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

@@ -29,7 +29,7 @@ module Workarea
         end
 
         def should_be_indexed?
-          model.placed?
+          model.placed? || model.fraud_suspected?
         end
 
         def facets

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

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

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

@@ -27,10 +27,7 @@ module Workarea
         end
 
         def as_document
-          super.merge(
-            published_at: model.published_at,
-            undo_at: model.undo_at
-          )
+          super.merge(published_at: model.published_at)
         end
       end
     end

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

@@ -0,0 +1,19 @@
+module Workarea
+  module Search
+    class Admin
+      class Segment < Search::Admin
+        def type
+          'segment'
+        end
+
+        def search_text
+          "segment #{model.name}"
+        end
+
+        def jump_to_text
+          model.name
+        end
+      end
+    end
+  end
+end