thecore_background_jobs 2.2.3 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 308eed28d763fd5e8cc373dcb1e4a6c972bdf36f6e5c57a36cbeceb5fa315ed3
-  data.tar.gz: dcd23fcc082b34804513a049ba27f02beae9593f54be6f6ec5951f239624b1fd
+  metadata.gz: fd7c37d9c19471417017d79ffd5b8a02dcb594fb2c8e6103958b58093fde23d9
+  data.tar.gz: ac87a1589246976f3a4792f7063fd5dc8a4cfe314541654ec86bfcf1fcd6bc41
 SHA512:
-  metadata.gz: 9ce274757e53ab219c5f868f1d11469df27610c9f300098276d298872fcdfca28613438da9b9e4f738c20b833e8945da8b565bfd51e5073d3e67c3bed9051505
-  data.tar.gz: b551544d56b8dc68b0cb8f4821dceec36c4b622d5a3cdcafd3eeb40bda3998f28945d4374558fabffbce02b9d9b1c470bdef2ff32a80967d14eb67e496fcd03c
+  metadata.gz: 3cc5197dfcf9092baecc0264821130e9ff00d9245b5f2a9258f7924f39db5bcc003b561ed54e5d5ac5d8cef162c1b43d7ea1d7b59f5aa90d6e1a48db587448fb
+  data.tar.gz: 2cb70b6be9a466d0400e73f677f267a0d5f584e8c0ef72517e63e6a97e2ca07d38dc8394cb0a776eb707251ad532f6a16d073b6750ede6068ede110c2ae4768d

data/lib/thecore_background_jobs.rb

@@ -8,11 +8,25 @@ require "thecore_background_jobs/engine"
 module ThecoreBackgroundJobs
   # Your code goes here...
   def self.email_setup
-    delivery_options = { domain: Settings.ns(:smtp).domain, address: Settings.ns(:smtp).address, port: Settings.ns(:smtp).port.to_i, enable_starttls_auto: (Settings.ns(:smtp).enable_starttls_auto == "true")}
+    # Fill variables with the correct values
+    domain = ThecoreSettings::Setting.where(ns: :smtp, key: :domain).first.raw
+    address = ThecoreSettings::Setting.where(ns: :smtp, key: :address).first.raw
+    port = ThecoreSettings::Setting.where(ns: :smtp, key: :port).first.raw.to_i
+    enable_starttls_auto = ThecoreSettings::Setting.where(ns: :smtp, key: :enable_starttls_auto).first.raw == "true"
+    user_name = ThecoreSettings::Setting.where(ns: :smtp, key: :user_name).first.raw
+    password = ThecoreSettings::Setting.where(ns: :smtp, key: :password).first.raw
+    authentication = ThecoreSettings::Setting.where(ns: :smtp, key: :authentication).first.raw
+
+    delivery_options = { 
+      domain: domain, 
+      address: address, 
+      port: port, 
+      enable_starttls_auto: enable_starttls_auto
+    }
     # Other Options
-    delivery_options.merge!({user_name: Settings.ns(:smtp).user_name}) unless Settings.ns(:smtp).user_name.blank?
-    delivery_options.merge!({password: Settings.ns(:smtp).password}) unless Settings.ns(:smtp).password.blank?
-    delivery_options.merge!({authentication: Settings.ns(:smtp).authentication}) unless Settings.ns(:smtp).authentication.blank? 
+    delivery_options.merge!({user_name: user_name}) unless user_name.blank?
+    delivery_options.merge!({password: password}) unless password.blank?
+    delivery_options.merge!({authentication: authentication}) unless authentication.blank? || authentication == "none"
     delivery_options
   end
 
@@ -36,7 +50,7 @@ module ThecoreBackgroundJobs
           # If we have a setting and is different from the currently loaded, then replace it 
           # in scheduler configuration
           Rails.logger.info "Setting #{schedule} exists: #{setting}"
-          Sidekiq.set_schedule(key.underscore, { cron: setting.squeeze(" ").strip, queue: "#{ENV["COMPOSE_PROJECT_NAME"]}_default", class: key })
+          Sidekiq.set_schedule(key, { cron: setting.squeeze(" ").strip, queue: "#{ENV["COMPOSE_PROJECT_NAME"]}_default", class: key })
           Rails.logger.info "Reloading schedules"
           SidekiqScheduler::Scheduler.instance.reload_schedule!
         end
@@ -45,16 +59,5 @@ module ThecoreBackgroundJobs
       Rails.logger.info "Thecore Background Jobs: REDIS not reachable:"
       Rails.logger.info exception.message
     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
-    #     Rails.logger.info "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' })
-    #     Rails.logger.info "Reloading schedules during initialization"
-    #     SidekiqScheduler::Scheduler.instance.reload_schedule!
-    #   rescue => exception
-    #     Rails.logger.info 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.2.3
+  version: 2.2.5
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Thecorized thecore_background_jobs