rubocop

Author: terrywbrady

src-colladmin/actions/queue_action.rb

@@ -11,4 +11,4 @@ def initialize(config, action, path, myparams, endpoint)
     endpoint = endpoint.gsub(/coll$/, coll) unless coll.empty?
     super(config, action, path, myparams, endpoint)
   end
-end
+end

src-colladmin/actions/zookeeper_action.rb

@@ -310,7 +310,7 @@ def perform_action
     count = 0
     ql = QueueList.new(@zk, { held: true })
     ql.jobs.each do |j|
-      job = MerrittZK::Job.new(j.queueId)
+      job = MerrittZK::Job.new(j.queue_id)
       job.load(@zk)
       job.set_status(@zk, MerrittZK::JobState::Pending)
       count += 1
@@ -332,7 +332,8 @@ def perform_action
       job = QueueEntry.new(j)
       next unless job.qstatus == 'Held'
       next unless job.profile == @coll
-      set_legacy_status("/ingest/#{job.queueId}", 'Pending')
+
+      set_legacy_status("/ingest/#{job.queue_id}", 'Pending')
       count += 1
     end
     { message: "queue release submitted for #{count}" }.to_json
@@ -394,4 +395,4 @@ def perform_action
       redirect_location: "/web/collIndex.html?path=#{@reload_path}"
     }.to_json
   end
-end
+end

src-colladmin/lib/queue.rb

@@ -155,7 +155,7 @@ def to_table_row
     arr
   end
 
-  def queueId
+  def queue_id
     get_value(:queueId)
   end
 
@@ -237,15 +237,10 @@ def initialize(zk, filter = {})
     end
     jobs.each do |j|
       job = QueueEntry.new(j)
-      if @filter.key?(:batch)
-        next unless job.bid == @filter[:batch]
-      end
-      if @filter.fetch(:deletable, false)
-        next unless %w[Completed Deleted].include?(job.qstatus)
-      end
-      if @filter.fetch(:held, false)
-        next unless %w[Held].include?(job.qstatus)
-      end
+      next if @filter.key?(:batch) && job.bid != @filter[:batch]
+      next if @filter.fetch(:deletable, false) && !%w[Completed Deleted].include?(job.qstatus)
+      next if @filter.fetch(:held, false) && !%w[Held].include?(job.qstatus)
+
       @jobs << job
       qb = @batches.fetch(job.bid, QueueBatch.new(job.bid, job.user))
       qb.add_job(job)