active_job_store 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df269c0cadf76b1981c02b87f77ac89c81b4dc13896c5162956942cfe274855f
-  data.tar.gz: 2a864cb0aa3573e77f83d8050cc40ce93988c7100838bce05de73e4db0b99f3b
+  metadata.gz: 913b4d81b0dfb938f013f907696dc04354a106818140d25003ae44ab4e4ed9f9
+  data.tar.gz: 39874892b9ee2443311d54cfedf7589697959c5ccb4184d8d934d67960838c7d
 SHA512:
-  metadata.gz: 4881d10048838fecb729eb48309aacebd77c4071636f7077fe2e3f2f1f3a1f4a8cce0b90ccad6ae59446790c635880c9ede070b245eb5354b2bb9d8e2dedd02d
-  data.tar.gz: 8245277be9b2e65d7b9479a2f9c9740a3167cca1be20e680530d9dedc9ea6fabb8f6cb597f7a7ecabfb633421ce88362118908faafc10e7f889af2f428d30e49
+  metadata.gz: 18b9c5696a4b4092ae9ea5d6ae8ed74ed45aaef567804f53a7b59fee306038f6ce2e63f0832b9bdc6f6ad61dbb7d69b81239c5801fe39db2b163be50f0e468ad
+  data.tar.gz: 0ad46829f63b6a6347812df19f0b0a3ef8b9e0c092ecf6f8f1743b08ddfeef9077735cdcb19690421222ca9557b2c6338b9e122d7e747f76a50d3357d62e3534

data/README.md

@@ -10,7 +10,7 @@ It can be useful to:
 - improve jobs logging capabilities;
 - query historical data about job executions;
 - extract job's statistical data;
-- track a job's state or add custom data to the jobs.
+- track a job's state / set progress value / add custom data to the jobs.
 
 Support some customizations:
 - set custom data attributes (via `active_job_store_custom_data` accessor);
@@ -79,7 +79,28 @@ SomeJob.job_executions.completed.map { |job| { id: job.id, execution_time: job.c
 
 ## Customizations
 
-If you need to store custom data, use `active_job_store_custom_data` accessor:
+To store the custom data (ex. a progress value):
+
+```rb
+class AnotherJob < ApplicationJob
+  include ActiveJobStore
+
+  def perform
+    # do something...
+    save_job_custom_data(progress: 0.5)
+    # do something else...
+    save_job_custom_data(progress: 1.0)
+
+    'some_result'
+  end
+end
+
+# Usage example:
+AnotherJob.perform_later(456)
+AnotherJob.job_executions.last.custom_data['progress'] # 1.0 (at the end)
+```
+
+If you need to manipulate the custom data, there is the `active_job_store_custom_data` accessor:
 
 ```rb
 class AnotherJob < ApplicationJob
@@ -96,6 +117,7 @@ class AnotherJob < ApplicationJob
   end
 end
 
+# Usage example:
 AnotherJob.perform_now(123)
 AnotherJob.job_executions.last.custom_data
 # => [{"time"=>"2022-11-09T21:20:57.580Z", "message"=>"SomeJob step 1"}, {"time"=>"2022-11-09T21:20:58.581Z", "message"=>"SomeJob step 2"}]
@@ -116,6 +138,7 @@ class AnotherJob < ApplicationJob
   end
 end
 
+# Usage example:
 AnotherJob.perform_now(123)
 AnotherJob.job_executions.last.result
 # => 84

data/lib/active_job_store/store.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module ActiveJobStore
+  class Store
+    DETAILS_ATTRS = %w[exception_executions executions priority queue_name scheduled_at timezone].freeze
+
+    attr_reader :record
+
+    def job_competed!(result:, custom_data:)
+      record.update!(state: :completed, completed_at: Time.current, result: result, custom_data: custom_data)
+      record
+    end
+
+    def job_enqueued!
+      record.lock! # NOTE: needed to avoid update conflicts with perform when setting the state to enqueued
+      yield
+      record.update!(state: :enqueued, enqueued_at: Time.current)
+      record
+    end
+
+    def job_failed!(exception:, custom_data:)
+      record.update!(state: :error, exception: exception.inspect, custom_data: custom_data)
+      record
+    end
+
+    def job_started!
+      record.update!(state: :started, started_at: Time.current)
+      record
+    end
+
+    def prepare_record_on_enqueue(job)
+      @record = ::ActiveJobStore::Record.find_or_create_by!(record_reference(job)) do |record|
+        record.arguments = job.arguments
+        record.details = DETAILS_ATTRS.zip(DETAILS_ATTRS.map { job.send(_1) }).to_h
+        record.state = :initialized
+      end
+    end
+
+    def prepare_record_on_perform(job)
+      @record = ::ActiveJobStore::Record.find_or_initialize_by(record_reference(job)) do |record|
+        record.arguments = job.arguments
+      end
+      record.details = DETAILS_ATTRS.zip(DETAILS_ATTRS.map { job.send(_1) }).to_h
+      record
+    end
+
+    def update_job_custom_data(custom_data)
+      record.update!(custom_data: custom_data)
+    end
+
+    private
+
+    def record_reference(job)
+      {
+        job_id: job.job_id,
+        job_class: job.class.to_s
+      }
+    end
+  end
+end

data/lib/active_job_store/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module ActiveJobStore
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end
 # :nocov:

data/lib/active_job_store.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 require_relative 'active_job_store/engine'
+require_relative 'active_job_store/store'
 
 module ActiveJobStore
-  IGNORE_ATTRS = %w[arguments job_id successfully_enqueued].freeze
-
   attr_accessor :active_job_store_custom_data
 
   class << self
@@ -12,31 +11,20 @@ module ActiveJobStore
       base.extend(ClassMethods)
 
       base.around_enqueue do |job, block|
-        store_record = ::ActiveJobStore::Record.find_or_create_by!(job.active_job_store_reference) do |record|
-          record.arguments = job.arguments
-          record.details = job.as_json.except(*IGNORE_ATTRS)
-          record.state = :initialized
+        store.prepare_record_on_enqueue(job)
+        store.job_enqueued! do
+          block.call
         end
-        store_record.lock! # NOTE: needed to avoid update conflicts with perform when setting the state to enqueued
-        block.call
-        store_record.update!(state: :enqueued, enqueued_at: Time.current)
       end
 
       base.around_perform do |job, block|
-        store_record = ::ActiveJobStore::Record.find_or_initialize_by(job.active_job_store_reference) do |record|
-          record.arguments = job.arguments
-        end
-        store_record.update!(details: job.as_json.except(*IGNORE_ATTRS), state: :started, started_at: Time.current)
+        store.prepare_record_on_perform(job)
+        store.job_started!
         result = block.call
         formatted_result = job.active_job_store_format_result(result)
-        store_record.update!(
-          state: :completed,
-          completed_at: Time.current,
-          result: formatted_result,
-          custom_data: active_job_store_custom_data
-        )
+        store.job_competed!(custom_data: active_job_store_custom_data, result: formatted_result)
       rescue StandardError => e
-        store_record.update!(state: :error, exception: e.inspect, custom_data: active_job_store_custom_data)
+        store.job_failed!(exception: e, custom_data: active_job_store_custom_data)
         raise
       end
     end
@@ -46,8 +34,9 @@ module ActiveJobStore
     result
   end
 
-  def active_job_store_reference
-    { job_id: job_id, job_class: self.class.to_s }
+  def save_job_custom_data(custom_data = nil)
+    self.active_job_store_custom_data = custom_data if custom_data
+    store.update_job_custom_data(active_job_store_custom_data)
   end
 
   module ClassMethods
@@ -55,4 +44,10 @@ module ActiveJobStore
       ::ActiveJobStore::Record.where(job_class: to_s)
     end
   end
+
+  private
+
+  def store
+    @store ||= ::ActiveJobStore::Store.new
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_job_store
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -36,6 +36,7 @@ files:
 - db/migrate/20221101010101_create_active_job_store.rb
 - lib/active_job_store.rb
 - lib/active_job_store/engine.rb
+- lib/active_job_store/store.rb
 - lib/active_job_store/version.rb
 homepage: https://github.com/blocknotes/active_job_store
 licenses: