thecore_background_jobs 2.1.4 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25822f9c80f3f04065323e8a959852aacff9a4d8fa9bc81997e8c4a3e9208b2b
-  data.tar.gz: 3c1b4fe01ac7612d52e45e87774df6ae8b5de26d463c0d98b1a13db31bc70fef
+  metadata.gz: 82d56e31e4c201976784d25f1e1c98e3a62c530b9a01b4dfcabd7893330ea637
+  data.tar.gz: b19cc142777c04aab1182ad8b837ac3135b1177e86107966d580720fbc56bfcc
 SHA512:
-  metadata.gz: 914a95a8a3ae73a3436bb93ce3bac566d5895ae6e8fb553a5efc88ccd44da26bfdb6c9c57df0594b07bb4d69c7459ef0824e38c7a717961733df03294da5feb1
-  data.tar.gz: 2c11d53d3822056e05e047f01af74c5e9ec2e48c8a78edef97a6272761649c93096aac4183d42e60cd3cf080bf11d9d03c210f8654dc83470d07380cf5097894
+  metadata.gz: a87ee9329bb3412c8c3e849fe6ad7ca78abc8a824c2ff315c9ba755a83cbb72bf33803ce0d66ad185e8084922de3d26e3286a4bd641506042398c7813840e933
+  data.tar.gz: 7ed11c0f63c76547e0a493e23b295c97419e8fe39df06e6f6500735c269981649d823c634c283829fc664c920441fe5510162b0a998d6308f26d7d923b9d01ca

data/config/initializers/after_initialize_for_thecore_backgrond_commons.rb

@@ -0,0 +1,10 @@
+Rails.application.configure do
+  config.after_initialize do
+    ThecoreBackgroundJobs.update_cron_schedules
+    # Good place for sending concerns about modules
+    # i.e.
+    # ModelName.send(:include, ModelNameConcern)
+    # - ModelNameConcern can be defined in config/initializers folder in order to be sure it's automatically loaded during engine bootstrap
+    ThecoreSettings::Setting.send(:include, ThecoreBackgroundSettingsConcern)
+  end
+end

data/config/initializers/thecore_background_settings_concern.rb

@@ -0,0 +1,13 @@
+require 'active_support/concern'
+
+module ThecoreBackgroundSettingsConcern
+  extend ActiveSupport::Concern
+  included do
+    after_save :reload_schedules, if: :saved_change_to_raw?
+
+    def reload_schedules
+      # Reload changes to schedule
+      ThecoreBackgroundJobs.update_cron_schedules if self.ns == "schedules" && !self.raw.blank?
+    end
+  end
+end

data/lib/thecore_background_jobs.rb

@@ -15,4 +15,46 @@ module ThecoreBackgroundJobs
     delivery_options.merge!({authentication: Settings.ns(:smtp).authentication}) unless Settings.ns(:smtp).authentication.blank? 
     delivery_options
   end
+
+  def self.update_cron_schedules
+    # {
+    #  "AlertForLongTermStockJob"=>{"cron"=>"0 0 9 * * *", "queue"=>"notset_default", "description"=>"This job Alerts a reference email for items in stock for too long", "enabled"=>true, "class"=>"AlertForLongTermStockJob"}, 
+    #  "ScheduleEmployeeReminderForInStockParcelsJob"=>{"cron"=>"0 0 8,14 * * *", "queue"=>"notset_default", "description"=>"This job checks periodically for new received parcels", "enabled"=>true, "class"=>"ScheduleEmployeeReminderForInStockParcelsJob"}
+    # }
+    Sidekiq.get_all_schedules.each_pair do |key, config|
+      puts "Key: #{key}, Config: #{config}"
+      schedule = "cron_for_#{key.underscore}"
+      setting = ThecoreSettings::Setting.where(ns: "schedules", key: schedule).pluck(:raw).first
+      puts "Setting is #{schedule} = #{setting}"
+      # Installing initial sidekiq.yml configuration if setting is not present
+      if setting.blank?
+        puts "Setting #{schedule} doesn't exist, creating based on current value: #{config["cron"]}"
+        ThecoreSettings::Setting.create(ns: "schedules", key: schedule, raw: config["cron"])
+        # Settings.ns("schedules").send("#{schedule}=", config["cron"])
+      elsif config["cron"].squeeze(" ").strip != setting.squeeze(" ").strip
+        # If we have a setting and is different from the currently loaded, then replace it 
+        # in scheduler configuration
+        puts "Setting #{schedule} exists: #{setting}"
+        begin
+          puts "Setting the schedule from DB value in Setting"
+          Sidekiq.set_schedule(key.underscore, { cron: setting.squeeze(" ").strip, queue: "#{ENV["COMPOSE_PROJECT_NAME"]}_default", class: key })
+          puts "Reloading schedules"
+          SidekiqScheduler::Scheduler.instance.reload_schedule!
+        rescue => exception
+          puts exception.message
+        end
+      end
+    end
+    # check_in_stock_parcels = ThecoreSettings::Setting.where(ns: "schedules", key: "cron_for_check_in_stock_parcels").pluck(:raw).first
+    # unless check_in_stock_parcels.blank?
+    #   begin
+    #     puts "Setting the schedule during initialization"
+    #     Sidekiq.set_schedule('check_in_stock_parcels', { cron: check_in_stock_parcels, queue: "#{ENV["COMPOSE_PROJECT_NAME"]}_default", class: 'ScheduleEmployeeReminderForInStockParcelsJob' })
+    #     puts "Reloading schedules during initialization"
+    #     SidekiqScheduler::Scheduler.instance.reload_schedule!
+    #   rescue => exception
+    #     puts exception.message
+    #   end
+    # end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_background_jobs
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.1
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +91,9 @@ files:
 - README.md
 - Rakefile
 - app/workers/demo_worker.rb
+- config/initializers/after_initialize_for_thecore_backgrond_commons.rb
 - config/initializers/sidekiq-thecore.rb
+- config/initializers/thecore_background_settings_concern.rb
 - config/routes.rb
 - lib/admin_constraint.rb
 - lib/tasks/thecore_background_jobs_tasks.rake