canvas_sync 0.17.31 → 0.17.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09cebb9b63254bcdf9e96ae0133d882fcf800ad405f6d53080793e8f3f0c052f'
-  data.tar.gz: 40d27ea858ac931d006ccbab54f7ee1b725166ad3fec4ecb369f6e3f0fa611f1
+  metadata.gz: ac101dc1c7a2d590408677aac25218ac20b762d993413c57ae9f8164b50fb3ad
+  data.tar.gz: c1d4785903974a78e8efc0612e5b36b0c342c6fb8bcfb615616c1e6002cb2186
 SHA512:
-  metadata.gz: de38e11de998bef7cca15c875d63b29984d2cdf4dd90436854484e5686c5aca4eb249fd864e24b66d532afcba63b3f7ddb62c5e5abf55d1e2c621fa6cb566af7
-  data.tar.gz: 8493bc7a6f100da697840f65aeaceacbacc95c224aa53c66129e19d5a88d61b1f59202252ac80b2e8d42fc4661f974b30bd1825b448e58b477ce9e33f71a9f2c
+  metadata.gz: 61f0685f874a9476d8130923b191e7ee1389fcf1cd7374f7b482c11c1e073b30a69796f43b02894cfd37800f7d2240e52d5e48291e8b0f8f8c3698d4f3e84938
+  data.tar.gz: d2a76163cf0a26ba32a96811c1d9e5ac63b6cc7bb23255a27416562e71bd25ee7ae1d57c0d8b21c8043701c9f76eed219469cf48c82883d68d403f938d4f6b0a

data/lib/canvas_sync/job_batches/batch.rb

@@ -28,7 +28,7 @@ module CanvasSync
 
       delegate :redis, to: :class
 
-      BID_EXPIRE_TTL = 2_592_000
+      BID_EXPIRE_TTL = 90.days.to_i
       SCHEDULE_CALLBACK = RedisScript.new(Pathname.new(__FILE__) + "../schedule_callback.lua")
       BID_HIERARCHY = RedisScript.new(Pathname.new(__FILE__) + "../hier_batch_ids.lua")
 
@@ -101,6 +101,8 @@ module CanvasSync
               r.hincrby("BID-#{parent_bid}", "children", 1)
               r.expire("BID-#{parent_bid}", BID_EXPIRE_TTL)
               r.zadd("BID-#{parent_bid}-bids", created_at, bid)
+            else
+              r.zadd("BID-ROOT-bids", created_at, bid)
             end
           end
 
@@ -369,6 +371,7 @@ module CanvasSync
           logger.debug {"Cleaning redis of batch #{bid}"}
           redis do |r|
             r.zrem("batches", bid)
+            r.zrem("BID-ROOT-bids", bid)
             r.unlink(
               "BID-#{bid}",
               "BID-#{bid}-callbacks-complete",

data/lib/canvas_sync/job_batches/sidekiq/web.rb

@@ -10,6 +10,8 @@ require_relative "web/helpers"
 module CanvasSync::JobBatches::Sidekiq
   module Web
     DEV_MODE = (defined?(Rails) && !Rails.env.production?) || !!ENV["SIDEKIQ_WEB_TESTING"]
+    Sidekiq::WebHelpers::SAFE_QPARAMS << 'all_batches'
+    Sidekiq::WebHelpers::SAFE_QPARAMS << 'count'
 
     def self.registered(app) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       app.helpers do
@@ -24,7 +26,9 @@ module CanvasSync::JobBatches::Sidekiq
 
       app.get "/batches" do
         @count = (params['count'] || 25).to_i
-        @current_page, @total_size, @batches = page('batches', params['page'], @count)
+
+        source_key = params['all_batches'] ? "batches" : "BID-ROOT-bids"
+        @current_page, @total_size, @batches = page(source_key, params['page'], @count)
         @batches = @batches.map {|b, score| CanvasSync::JobBatches::Batch.new(b) }
 
         erb(get_template(:batches))

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.31".freeze
+  VERSION = "0.17.32".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.17.31
+  version: 0.17.32
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails