From 5c929238b7400c76440258ef0f6852f3aab007ec Mon Sep 17 00:00:00 2001 From: "Stanko K.R." Date: Mon, 2 Feb 2026 18:22:07 +0100 Subject: [PATCH] Rename jobs --- .../data_import_job.rb} | 2 +- app/jobs/{export_data_job.rb => data_export_job.rb} | 2 +- app/models/account/import.rb | 2 +- app/models/export.rb | 2 +- test/controllers/accounts/exports_controller_test.rb | 2 +- test/controllers/users/data_exports_controller_test.rb | 2 +- .../data_import_job_test.rb} | 4 ++-- test/models/account/export_test.rb | 4 ++-- test/models/user/data_export_test.rb | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) rename app/jobs/{import_account_data_job.rb => account/data_import_job.rb} (91%) rename app/jobs/{export_data_job.rb => data_export_job.rb} (75%) rename test/jobs/{import_account_data_job_test.rb => account/data_import_job_test.rb} (90%) diff --git a/app/jobs/import_account_data_job.rb b/app/jobs/account/data_import_job.rb similarity index 91% rename from app/jobs/import_account_data_job.rb rename to app/jobs/account/data_import_job.rb index 6c2e5ff87..ec2877bd5 100644 --- a/app/jobs/import_account_data_job.rb +++ b/app/jobs/account/data_import_job.rb @@ -1,4 +1,4 @@ -class ImportAccountDataJob < ApplicationJob +class Account::DataImportJob < ApplicationJob include ActiveJob::Continuable queue_as :backend diff --git a/app/jobs/export_data_job.rb b/app/jobs/data_export_job.rb similarity index 75% rename from app/jobs/export_data_job.rb rename to app/jobs/data_export_job.rb index e342ea34b..fc4bff904 100644 --- a/app/jobs/export_data_job.rb +++ b/app/jobs/data_export_job.rb @@ -1,4 +1,4 @@ -class ExportDataJob < ApplicationJob +class DataExportJob < ApplicationJob queue_as :backend discard_on ActiveJob::DeserializationError diff --git a/app/models/account/import.rb b/app/models/account/import.rb index 4e3edc0ec..814e6b00c 100644 --- a/app/models/account/import.rb +++ b/app/models/account/import.rb @@ -15,7 +15,7 @@ class Account::Import < ApplicationRecord end def process_later - ImportAccountDataJob.perform_later(self) + Account::DataImportJob.perform_later(self) end def check(start: nil, callback: nil) diff --git a/app/models/export.rb b/app/models/export.rb index f3425258d..98bc0799e 100644 --- a/app/models/export.rb +++ b/app/models/export.rb @@ -14,7 +14,7 @@ class Export < ApplicationRecord end def build_later - ExportDataJob.perform_later(self) + DataExportJob.perform_later(self) end def build diff --git a/test/controllers/accounts/exports_controller_test.rb b/test/controllers/accounts/exports_controller_test.rb index 1ebe7e5ea..ebcf26117 100644 --- a/test/controllers/accounts/exports_controller_test.rb +++ b/test/controllers/accounts/exports_controller_test.rb @@ -7,7 +7,7 @@ class Account::ExportsControllerTest < ActionDispatch::IntegrationTest test "create creates an export record and enqueues job" do assert_difference -> { Account::Export.count }, 1 do - assert_enqueued_with(job: ExportDataJob) do + assert_enqueued_with(job: DataExportJob) do post account_exports_path end end diff --git a/test/controllers/users/data_exports_controller_test.rb b/test/controllers/users/data_exports_controller_test.rb index f89f121b1..c48254705 100644 --- a/test/controllers/users/data_exports_controller_test.rb +++ b/test/controllers/users/data_exports_controller_test.rb @@ -8,7 +8,7 @@ class Users::DataExportsControllerTest < ActionDispatch::IntegrationTest test "create creates an export record and enqueues job" do assert_difference -> { User::DataExport.count }, 1 do - assert_enqueued_with(job: ExportDataJob) do + assert_enqueued_with(job: DataExportJob) do post user_data_exports_path(@user) end end diff --git a/test/jobs/import_account_data_job_test.rb b/test/jobs/account/data_import_job_test.rb similarity index 90% rename from test/jobs/import_account_data_job_test.rb rename to test/jobs/account/data_import_job_test.rb index c1be20e51..d677c4369 100644 --- a/test/jobs/import_account_data_job_test.rb +++ b/test/jobs/account/data_import_job_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class ImportAccountDataJobTest < ActiveJob::TestCase +class Account::DataImportJobTest < ActiveJob::TestCase test "performs import via continuable steps" do source_account = accounts("37s") exporter = users(:david) @@ -20,7 +20,7 @@ class ImportAccountDataJobTest < ActiveJob::TestCase import.file.attach(io: File.open(export_tempfile.path), filename: "export.zip", content_type: "application/zip") end - ImportAccountDataJob.perform_now(import) + Account::DataImportJob.perform_now(import) assert import.reload.completed? ensure diff --git a/test/models/account/export_test.rb b/test/models/account/export_test.rb index cb975ce6e..68f95c5a0 100644 --- a/test/models/account/export_test.rb +++ b/test/models/account/export_test.rb @@ -1,10 +1,10 @@ require "test_helper" class Account::ExportTest < ActiveSupport::TestCase - test "build_later enqueues ExportDataJob" do + test "build_later enqueues DataExportJob" do export = Account::Export.create!(account: Current.account, user: users(:david)) - assert_enqueued_with(job: ExportDataJob, args: [ export ]) do + assert_enqueued_with(job: DataExportJob, args: [ export ]) do export.build_later end end diff --git a/test/models/user/data_export_test.rb b/test/models/user/data_export_test.rb index f855f960d..b584da99d 100644 --- a/test/models/user/data_export_test.rb +++ b/test/models/user/data_export_test.rb @@ -60,10 +60,10 @@ class User::DataExportTest < ActiveSupport::TestCase end end - test "build_later enqueues ExportDataJob" do + test "build_later enqueues DataExportJob" do export = User::DataExport.create!(account: Current.account, user: users(:david)) - assert_enqueued_with(job: ExportDataJob, args: [ export ]) do + assert_enqueued_with(job: DataExportJob, args: [ export ]) do export.build_later end end