Change from GoodJob::Execution to GoodJob::Job for upload tracking.

Only one Job is created per job, but an upload which is failed or
retried could result in more than one execution.

Author: fspeirs

app/controllers/api/school_import_jobs_controller.rb

@@ -19,10 +19,7 @@ def show
     private
 
     def find_job
-      # GoodJob stores jobs in the good_jobs table as Executions
-      # The job_id returned to users is the ActiveJob ID
-      # We need to query by active_job_id, not by execution id
-      job = GoodJob::Execution.find_by(active_job_id: params[:id])
+      job = GoodJob::Job.find_by(active_job_id: params[:id])
 
       # Verify this is an import job (security check)
       return nil unless job && job.job_class == SchoolImportJob.name
@@ -40,7 +37,7 @@ def build_job_response(job)
       }
 
       # If job is finished successfully, get results from dedicated table
-      if job.finished_at.present? && job.error.blank?
+      if job.succeeded?
         result = SchoolImportResult.find_by(job_id: job.active_job_id)
         if result
           response[:results] = result.results
@@ -49,20 +46,21 @@ def build_job_response(job)
         end
       end
 
-      # Include error if job failed
+      # Include error if job failed or was discarded
       if job.error.present?
         response[:error] = job.error
-        response[:status] = 'failed'
+        response[:status] = job.discarded? ? 'discarded' : 'failed'
       end
 
       response
     end
 
     def job_status(job)
-      return 'failed' if job.error.present?
-      return 'completed' if job.finished_at.present?
+      return 'discarded' if job.discarded?
+      return 'succeeded' if job.succeeded?
+      return 'failed' if job.finished? && job.error.present?
+      return 'running' if job.running?
       return 'scheduled' if job.scheduled_at.present? && job.scheduled_at > Time.current
-      return 'running' if job.performed_at.present? && job.finished_at.nil?
 
       'queued'
     end

app/fields/status_field.rb

@@ -10,21 +10,24 @@ def to_s
   def job_status
     return 'unknown' if data.blank?
 
-    job = GoodJob::Execution.find_by(active_job_id: data)
+    job = GoodJob::Job.find_by(active_job_id: data)
     return 'not_found' unless job
 
-    return 'failed' if job.error.present?
-    return 'completed' if job.finished_at.present?
+    return 'discarded' if job.discarded?
+    return 'succeeded' if job.succeeded?
+    return 'failed' if job.finished? && job.error.present?
+    return 'running' if job.running?
     return 'scheduled' if job.scheduled_at.present? && job.scheduled_at > Time.current
-    return 'running' if job.performed_at.present? && job.finished_at.nil?
 
     'queued'
   end
 
   def status_class
     case job_status
+    when 'succeeded' then 'status-completed'
     when 'completed' then 'status-completed'
     when 'failed' then 'status-failed'
+    when 'discarded' then 'status-failed'
     when 'running' then 'status-running'
     when 'queued', 'scheduled' then 'status-queued'
     else 'status-unknown'

spec/features/school/importing_schools_spec.rb

@@ -81,7 +81,7 @@
 
     context 'when job exists and is completed' do
       before do
-        GoodJob::Execution.create!(
+        GoodJob::Job.create!(
           id: SecureRandom.uuid,
           active_job_id: job_id,
           queue_name: 'import_schools_job',
@@ -107,7 +107,7 @@
         expect(response).to have_http_status(:ok)
         data = JSON.parse(response.body, symbolize_names: true)
 
-        expect(data[:status]).to eq('completed')
+        expect(data[:status]).to eq('succeeded')
         expect(data[:results][:successful].count).to eq(1)
       end
     end