workarea-core 3.5.13 → 3.5.18

data/lib/tasks/insights.rake

@@ -1,49 +1,17 @@
-require 'active_support/testing/time_helpers'
+require 'workarea/tasks/insights'
 
 namespace :workarea do
   namespace :insights do
     desc 'Creates metrics and insights based on orders'
     task generate: :environment do
-      include ActiveSupport::Testing::TimeHelpers
-      batch_size = ENV['WORKAREA_INSIGHTS_BATCH_SIZE'].presence || 1000
-
-      Workarea::Order
-        .placed
-        .each_by(batch_size.to_i) { |o| Workarea::SaveOrderMetrics.perform(o) }
-
-      8.times do |i|
-        travel_to (i.weeks.ago.beginning_of_week + 1.hour)
-        Workarea::GenerateInsights.generate_all!
-      end
-
+      Workarea::Tasks::Insights.generate
       puts "Success! Generated #{Workarea::Insights::Base.count} insights."
     end
 
     # Clear the metrics/insights environment - deletes lots of data, this task
     # is very dangerous! Useful for testing/debugging.
     task reset: :environment do
-      Workarea::Order
-        .where(:metrics_saved_at.gt => 0)
-        .update_all(metrics_saved_at: nil)
-
-
-      Workarea::Metrics::CategoryByDay.delete_all
-      Workarea::Metrics::CountryByDay.delete_all
-      Workarea::Metrics::DiscountByDay.delete_all
-      Workarea::Metrics::MenuByDay.delete_all
-      Workarea::Metrics::ProductByDay.delete_all
-      Workarea::Metrics::ProductByWeek.delete_all
-      Workarea::Metrics::ProductForLastWeek.delete_all
-      Workarea::Metrics::SalesByDay.delete_all
-      Workarea::Metrics::SearchByDay.delete_all
-      Workarea::Metrics::SearchByWeek.delete_all
-      Workarea::Metrics::SearchForLastWeek.delete_all
-      Workarea::Metrics::SkuByDay.delete_all
-      Workarea::Metrics::TenderByDay.delete_all
-      Workarea::Metrics::TrafficReferrerByDay.delete_all
-      Workarea::Metrics::User.delete_all
-      Workarea::Insights::Base.delete_all
-
+      Workarea::Tasks::Insights.reset!
       puts "Success! Insights and metrics have been cleared."
     end
   end

data/lib/tasks/migrate.rake

@@ -1,103 +1,10 @@
+require 'workarea/tasks/migrate'
+
 namespace :workarea do
   namespace :migrate do
     desc 'Migrate the database from v3.4 to v3.5'
     task v3_5: :environment do
-      count = 0
-
-      Workarea::Release.where(:undo_at.gte => Time.current).each do |release|
-        undo = release.build_undo(publish_at: release.undo_at).tap(&:save!)
-
-        release.changesets.each do |changeset|
-          changeset.build_undo(release: undo).save!
-        end
-
-        Workarea::Scheduler.delete(release.undo_job_id)
-
-        release.update_attributes!(undo_at: nil, undo_job_id: nil)
-        count += 1
-      end
-
-      Workarea::Release.all.each { |r| Workarea::IndexAdminSearch.perform(r) }
-
-      puts "✅ #{count} undo releases have been created."
-
-      count = 0
-
-      Workarea::Tax::Category.all.each_by(100) do |category|
-        category.rates.each_by(500) do |rate|
-          rate.postal_code_percentage = rate.percentage
-          rate.percentage = nil
-        end
-
-        category.save!
-        count += 1
-      end
-
-      puts "✅ #{count} tax categories updated."
-
-      count = 0
-      failed_ids = []
-      backup = Mongo::Collection.new(Mongoid::Clients.default.database, 'workarea_legacy_segments')
-
-      legacy_segments = Workarea::Segment.collection.find.to_a
-      legacy_segments.each do |doc|
-        backup.insert_one(doc)
-        Workarea::Segment.collection.delete_one(doc.slice('_id'))
-
-        segment = Workarea::Segment.new(
-          id: doc['_id'],
-          name: doc['name'],
-          subscribed_user_ids: doc['subscribed_user_ids'],
-          created_at: doc['created_at'],
-          updated_at: doc['updated_at']
-        )
-
-        doc['conditions'].each do |condition|
-          if condition['_type'] =~ /UserTag/
-            segment.rules << Workarea::Segment::Rules::Tags.new(tags: condition['tags'])
-          elsif condition['_type'] =~ /TotalSpent/
-            rule = Workarea::Segment::Rules::Revenue.new
-
-            if condition['operator'] == 'equals'
-              rule.minimum = rule.maximum = Money.demongoize(condition['amount'])
-            elsif condition['operator'] == 'less_than_or_equals'
-              rule.maximum = Money.demongoize(condition['amount'])
-            elsif condition['operator'] == 'less_than'
-              rule.maximum = (Money.demongoize(condition['amount']) - 0.01.to_m)
-            elsif condition['operator'] == 'greater_than_or_equals'
-              rule.minimum = Money.demongoize(condition['amount'])
-            elsif condition['operator'] == 'greater_than'
-              rule.minimum = (Money.demongoize(condition['amount']) + 0.01.to_m)
-            end
-
-            segment.rules << rule
-          end
-        end
-
-        if doc['conditions'].size == segment.rules.size && segment.save
-          count += 1
-        else
-          failed_ids << doc['_id']
-        end
-      end
-
-      puts "✅ #{count} segments have been migrated." if count > 0
-      if failed_ids.any?
-        puts "⛔️ #{failed_ids.count} segments failed to migrate."
-        puts "You can find copies of the original segments in the workarea_legacy_segments collection."
-        puts "The segments that failed are #{failed_ids.to_sentence}."
-      end
-
-      Workarea::Segment::LifeCycle.create!
-      puts "✅ Life cycle segments have been created."
-
-      admin_ids = Workarea::User.admins.pluck(:id)
-      admin_ids.each do |id|
-        Workarea::SynchronizeUserMetrics.new.perform(id)
-      end
-      puts "✅ #{admin_ids.count} admins have had their metrics synchronized." if admin_ids.count > 0
-
-      puts "\nMigration complete!"
+      Workarea::Tasks::Migrate.v3_5
     end
   end
 end

data/lib/tasks/search.rake

@@ -1,8 +1,9 @@
+require 'workarea/tasks/search'
+
 namespace :workarea do
   namespace :search_index do
     def setup
-      require 'sidekiq/testing/inline' unless ENV['INLINE'] == 'false'
-      Workarea.config.bulk_index_batch_size = ENV['BATCH_SIZE'].to_i if ENV['BATCH_SIZE'].present?
+      Workarea::Tasks::Search.setup
     end
 
     desc 'Reindex all data'
@@ -16,84 +17,21 @@ namespace :workarea do
     task admin: :environment do
       setup
       puts 'Indexing admin...'
-      Workarea::QueuesPauser.with_paused_queues do
-        Workarea::Search::Admin.reset_indexes!
-      end
-
-      Mongoid.models.each do |klass|
-        next unless Workarea::Search::Admin.for(klass.first).present?
-
-        klass.all.each_slice_of(Workarea.config.bulk_index_batch_size) do |models|
-          Workarea::BulkIndexAdmin.perform_by_models(models)
-        end
-      end
-
-      Workarea.config.jump_to_navigation.to_a.each do |tuple|
-        Workarea::Search::Admin::Navigation.new(tuple).save
-      end
+      Workarea::Tasks::Search.index_admin
     end
 
     desc 'Reindex storefront'
     task storefront: :environment do
       setup
       puts 'Indexing storefront...'
-
-      Workarea::QueuesPauser.with_paused_queues do
-        Workarea::Search::Storefront.reset_indexes!
-        Workarea::Search::Storefront.ensure_dynamic_mappings
-      end
-
-      # This code finds all unique filters for products so we can index a sample
-      # product for each to ensure the dynamic mappings get created.
-      #
-      # This is necessary to fix mapping errors from Elasticsearch when trying
-      # to index category percolations against fields which have no mapping.
-      #
-      map = %{
-        function() {
-          for (var key in this.filters.#{I18n.locale}) {
-            emit(key, null);
-          }
-        }
-      }
-      reduce = 'function(key) { return null; }'
-      results = Workarea::Catalog::Product.map_reduce(map, reduce).out(inline: 1)
-      unique_filters = results.map { |r| r['_id'] }
-
-      sample_products = unique_filters.reduce([]) do |memo, filter|
-        filter = "filters.#{I18n.locale}.#{filter}"
-        memo << Workarea::Catalog::Product.exists(filter => true).sample
-      end
-
-      sample_products.each do |product|
-        Workarea::Search::Storefront::Product.new(product).save
-      end
-
-      Workarea::Catalog::Category.all.each_by(Workarea.config.bulk_index_batch_size) do |category|
-        Workarea::Search::Storefront::CategoryQuery.new(category).create
-        Workarea::Search::Storefront::Category.new(category).save
-      end
-
-      Workarea::Content::Page.all.each_by(Workarea.config.bulk_index_batch_size) do |page|
-        Workarea::Search::Storefront::Page.new(page).save
-      end
-
-      Workarea::BulkIndexProducts.perform
-      Workarea::BulkIndexSearches.perform
+      Workarea::Tasks::Search.index_storefront
     end
 
     desc 'Reindex help'
     task help: :environment do
       setup
       puts 'Indexing help...'
-
-      Workarea::QueuesPauser.with_paused_queues do
-        Workarea::Search::Help.reset_indexes!
-      end
-
-      Workarea::Help::Article.all.each_by(Workarea.config.bulk_index_batch_size) do |help_article|
-        Workarea::Search::Help.new(help_article).save
-      end
+      Workarea::Tasks::Search.index_help
     end
   end
 end

data/lib/tasks/services.rake

@@ -1,73 +1,23 @@
-require 'workarea/version'
+require 'workarea/tasks/services'
 
 namespace :workarea do
   namespace :services do
-    def assert_docker_compose_installed!
-      unless system('docker-compose -v > /dev/null 2>&1')
-        STDERR.puts <<~eos
-**************************************************
-⛔️ ERROR: workarea:services tasks depend on Docker Compose being installed. \
-See https://docs.docker.com/compose/install/ for how to install.
-**************************************************
-          eos
-        exit
-      end
-    end
-
-    def compose_file_path
-      File.join(Gem::Specification.find_by_name('workarea').gem_dir, 'docker-compose.yml')
-    end
-
-    def compose_env
-      {
-        'COMPOSE_FILE' => compose_file_path,
-        'COMPOSE_PROJECT_NAME' => File.basename(Dir.pwd),
-
-        'MONGODB_VERSION' => Workarea::VERSION::MONGODB::STRING,
-        'MONGODB_PORT' => ENV['WORKAREA_MONGODB_PORT'] || '27017',
-
-        'REDIS_VERSION' => Workarea::VERSION::REDIS::STRING,
-        'REDIS_PORT' => ENV['WORKAREA_REDIS_PORT'] || '6379',
-
-        'ELASTICSEARCH_VERSION' => Workarea::VERSION::ELASTICSEARCH::STRING,
-        'ELASTICSEARCH_PORT' => ENV['WORKAREA_ELASTICSEARCH_PORT'] || '9200'
-      }
-    end
-
     desc 'Start Workarea background services for this app'
     task :up do
       puts 'Starting Workarea services...'
-      assert_docker_compose_installed!
-
-      if system(compose_env, "docker-compose up -d #{ENV['COMPOSE_ARGUMENTS']} #{ENV['WORKAREA_SERVICES']}")
-        puts '✅ Success! Workarea services are running in the background. Run workarea:services:down to stop them.'
-      else
-        STDERR.puts '⛔️ Error! There was an error starting Workarea services.'
-      end
+      Workarea::Tasks::Services.up
     end
 
     desc 'Stop Workarea external services for this app'
     task :down do
       puts 'Stopping Workarea services...'
-      assert_docker_compose_installed!
-
-      if system(compose_env, "docker-compose down #{ENV['COMPOSE_ARGUMENTS']}")
-        puts '✅ Success! Workarea services are stopped. Run workarea:services:up to start them.'
-      else
-        STDERR.puts '⛔️ Error! There was an error stopping Workarea services.'
-      end
+      Workarea::Tasks::Services.down
     end
 
     desc 'Remove data volumes associated with Workarea external services. Stops containers.'
     task :clean do
       puts 'Removing Workarea service data...'
-      assert_docker_compose_installed!
-
-      if system(compose_env, "docker-compose down -v #{ENV['COMPOSE_ARGUMENTS']}")
-        puts '✅ Success! Workarea service volumes have been removed. Run workarea:services:up to start services and recreate volumes.'
-      else
-        STDERR.puts '⛔️ Error! There was an error removing Workarea service volumes.'
-      end
+      Workarea::Tasks::Services.clean
     end
   end
 end

data/lib/workarea/configuration.rb

@@ -26,8 +26,6 @@ module Workarea
 
       config.site_name = 'Workarea'
       config.host = 'www.example.com'
-      config.email_to = 'customerservice@example.com'
-      config.email_from = 'noreply@example.com'
 
       # Config sent to the ImageMagick through Dragonfly for optimizing jpgs
       # All metadata profiles are removed, comments cleared by comment -set ""
@@ -1297,6 +1295,17 @@ module Workarea
 
       # The number of results that will show per-type in the admin jump to
       config.jump_to_results_per_type = 5
+
+      # Attributes that will be sliced out of params and persisted on
+      # the credit card tender during checkout.
+      config.credit_card_attributes = %i[
+        month
+        year
+        saved_card_id
+        number
+        cvv
+        amount
+      ]
     end
   end
 end

data/lib/workarea/configuration/administrable_options.rb

@@ -1,7 +1,7 @@
 module Workarea
   module Configuration
     class AdministrableOptions < ActiveSupport::InheritableOptions
-      def method_missing(name, *args)
+      def [](name)
         static_config = super
         return static_config if static_config.present? || static_config.to_s == 'false'
         return static_config unless check_fieldsets?(name)
@@ -9,10 +9,6 @@ module Workarea
         Configuration::Admin.instance.send(name)
       end
 
-      def respond_to_missing?(name, include_private)
-        true
-      end
-
       private
 
       def check_fieldsets?(name)

data/lib/workarea/core.rb

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

data/lib/workarea/core/engine.rb

@@ -78,6 +78,10 @@ module Workarea
         # get autoloaded. Without this, admin actions like updating product
         # attributes raises a {NameError} "uninitialized constant BulkIndexProducts".
         require_dependency 'workarea/bulk_index_products'
+
+        # Fixes a constant error raised in middleware (when doing segmentation)
+        # No idea what the cause is. TODO revisit after Zeitwerk.
+        require_dependency 'workarea/metrics/user'
       end
     end
   end

data/lib/workarea/ext/jbuilder/jbuilder_cache.rb

@@ -0,0 +1,29 @@
+decorate JbuilderTemplate, with: :workarea do
+  def _cache_fragment_for(*)
+    return yield if workarea_admin?
+
+    super
+  end
+
+  def _cache_key(*)
+    super.tap do |result|
+      result << workarea_cache_varies if workarea_cache_varies.present?
+    end
+  end
+
+  private
+
+  def workarea_admin?
+    @context&.controller&.current_user&.admin?
+  rescue ::RuntimeError
+    false
+  end
+
+  def workarea_cache_varies
+    workarea_request_env['workarea.cache_varies']
+  end
+
+  def workarea_request_env
+    @context.controller.request.env || {}
+  end
+end

data/lib/workarea/tasks/cache.rb

@@ -0,0 +1,43 @@
+module Workarea
+  module Tasks
+    module Cache
+      extend self
+
+      def prime_images
+        include Rails.application.routes.url_helpers
+        include Workarea::Storefront::ProductsHelper
+        include Workarea::Core::Engine.routes.url_helpers
+
+        built_in_jobs = [:thumb, :gif, :jpg, :png, :strip, :convert, :optimized]
+
+        jobs = Dragonfly.app(:workarea).processor_methods.reject do |job|
+          built_in_jobs.include?(job)
+        end
+
+        Workarea::Catalog::Product.all.each_by(50) do |product|
+          product.images.each do |image|
+            jobs.each do |job|
+              url = URI.join(
+                "https://#{Workarea.config.host}",
+                dynamic_product_image_url(
+                  image.product.slug,
+                  image.option,
+                  image.id,
+                  job,
+                  only_path: true
+                )
+              ).to_s
+
+              begin
+                `curl #{url}`
+                puts "Downloaded image #{url}"
+              rescue StandardError => e
+                puts e.inspect
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end