rocketjob_mission_control 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e285d14af9fde45c1fec22bc89a89f96b9eb6e59dbb1cbf5baeac2946b9b4a63
-  data.tar.gz: fdff6c5fa69deec469be289f340fb4d82f910d8a1a9c819f703edb984e9fb773
+  metadata.gz: 80f6b3973c176cdfe7a2f0d0f20b51fa066fc0013ad86e1f01b400e45b75466f
+  data.tar.gz: 7d781ed535a84e4783ad6bc8efb6c4dbc53e76d8baf9092498665d20ce675788
 SHA512:
-  metadata.gz: 2b24c8dfebb108b5d91dfe848f80f6b62feda9ff6bfd48d5e6f85a90cffb9d865dd10c071f646e34c25ca1e4962ffc8ea62e05d21c3c1bde441f4bb48fb1b3a2
-  data.tar.gz: 06da811e1d6e9da338b948c463754dcced2512aac7177eea184b0a4f328872a9ceec707ccfc37d0f5f83353ab0fab6c469dc950b6ea4469edadaf7dab5098cee
+  metadata.gz: 5f3c5353ad000737226601f20e7fe2b287a3b942f97a1fce84cd40e6de70e0abbaca1f996557ee8933e2f450e4a5368d1b4ba4f6b3d9379b9565ef3437776b94
+  data.tar.gz: da41863c1b1e8668b2176cdca70331e519d194fc157638eff61cac5037c6e6f3d7ef07609204e88f1008d4e324ca654202200bf4f7843ff82a1757e07e340a4d

data/app/datatables/rocket_job_mission_control/jobs_datatable.rb

@@ -30,15 +30,17 @@ module RocketJobMissionControl
     QUEUED_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type'},
       {display: 'Description', value: :description, field: 'description'},
+      {display: 'Record Count', value: :record_count, field: 'record_count'},
       {display: 'Priority', value: :priority, field: 'priority'},
       {display: 'Queued For', value: :duration, field: 'duration', orderable: false},
       {display: 'Actions', value: :action_buttons, orderable: false}
     ]
-    QUEUED_FIELDS  = (COMMON_FIELDS + [:run_at, :priority]).freeze
+    QUEUED_FIELDS  = (COMMON_FIELDS + [:record_count, :run_at, :priority]).freeze
 
     RUNNING_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type'},
       {display: 'Description', value: :description, field: 'description'},
+      {display: 'Record Count', value: :record_count, field: 'record_count'},
       {display: 'Progress', value: :progress, field: 'percent_complete', orderable: false},
       {display: 'Workers', value: :worker_count, field: 'worker_count', orderable: false},
       {display: 'Priority', value: :priority, field: 'priority'},
@@ -118,6 +120,10 @@ module RocketJobMissionControl
       h(job.worker_count)
     end
 
+    def record_count(job)
+      job.attributes.key?('record_count') ? h(job.record_count) : 0
+    end
+
     def started(job)
       "#{RocketJob.seconds_as_duration(Time.now - (job.started_at || Time.now))} ago" if job.started_at
     end

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = '4.1.0'.freeze
+  VERSION = '4.2.0'.freeze
 end

data/test/helpers/rocket_job_mission_control/servers_helper_test.rb

@@ -23,6 +23,7 @@ module RocketJobMissionControl
           let(:server) do
             server = RocketJob::Server.new
             server.started
+            server.build_heartbeat(updated_at: 1.hour.ago, workers: 0)
             server
           end
 
@@ -50,6 +51,7 @@ module RocketJobMissionControl
           let(:server) do
             server = RocketJob::Server.new
             server.started
+            server.build_heartbeat(updated_at: 1.hour.ago, workers: 0)
             server
           end
 

data/test/models/rocket_job_mission_control/query_test.rb

@@ -3,6 +3,7 @@ require_relative '../../test_helper'
 class QueryTest < Minitest::Test
 
   class NoopJob < RocketJob::Job
+    field :record_count, type: Integer, default: 0
     def perform(record)
       # noop
     end
@@ -10,7 +11,7 @@ class QueryTest < Minitest::Test
 
   describe RocketJobMissionControl::Query do
     before do
-      @jobs = (1..10).collect { |i| NoopJob.create(description: "Job #{i}") }
+      @jobs = (1..10).collect { |i| NoopJob.create(description: "Job #{i}", record_count: i) }
     end
 
     after do
@@ -98,6 +99,27 @@ class QueryTest < Minitest::Test
         assert_equal 3, count
       end
 
+      it 'sorts ascending by record_count' do
+        count    = 0
+        previous = nil
+        RocketJobMissionControl::Query.new(NoopJob.all, record_count: 1).query.each do |job|
+          assert(previous < job.record_count, "Wrong sort order. #{previous} < #{job.record_count}") if previous
+          previous = job.record_count
+          count   += 1
+        end
+        assert_equal @jobs.count, count
+      end
+
+      it 'sorts descending by record_count' do
+        count    = 0
+        previous = nil
+        RocketJobMissionControl::Query.new(NoopJob.all, record_count: -1).query.each do |job|
+          assert(previous > job.record_count, "Wrong sort order. #{previous} > #{job.record_count}") if previous
+          previous = job.record_count
+          count   += 1
+        end
+        assert_equal @jobs.count, count
+      end
     end
 
     describe '#count' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob_mission_control
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Michael Cloutier
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails