Reduction

Earlopain · Nov 6, 2023 · b70bdb2 · b70bdb2
1 parent 2549727
commit b70bdb2
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/app/jobs/create_submission_file_job.rb b/app/jobs/create_submission_file_job.rb
@@ -2,7 +2,6 @@
 
 class CreateSubmissionFileJob < ApplicationJob
   queue_as :submission_download
-  good_job_control_concurrency_with(total_limit: 1, key: -> { "#{arguments.first.id}-#{arguments.second[:identifier]}" })
 
   def perform(artist_submission, file)
     submission_file = SubmissionFile.find_by(artist_submission: artist_submission, file_identifier: file[:identifier])

diff --git a/app/jobs/e6_iqdb_query_job.rb b/app/jobs/e6_iqdb_query_job.rb
@@ -2,7 +2,6 @@
 
 class E6IqdbQueryJob < ApplicationJob
   queue_as :e6_iqdb
-  good_job_control_concurrency_with(total_limit: 1, key: -> { arguments.first.id })
 
   PRIORITIES = {
     immediate: 100,

diff --git a/app/jobs/scrape_artist_url_job.rb b/app/jobs/scrape_artist_url_job.rb
@@ -2,7 +2,6 @@
 
 class ScrapeArtistUrlJob < ApplicationJob
   queue_as :scraping
-  good_job_control_concurrency_with(total_limit: 1, key: -> { arguments.first.id })
 
   def perform(artist_url) # rubocop:disable Metrics/CyclomaticComplexity
     return unless artist_url.scraper_enabled?

diff --git a/test/logical/job_stats_test.rb b/test/logical/job_stats_test.rb
@@ -20,15 +20,9 @@ class JobStatsTest < ActiveSupport::TestCase
     [submission1, submission2, submission3].each { |submission| CreateSubmissionFileJob.perform_later(submission, {}) }
     [file1, file2, file3, file4, file5].each { |file| E6IqdbQueryJob.perform_later(file) }
 
-    puts GoodJob::Job.count
     puts GoodJob::Job.all.map(&:to_json)
 
-    stats = JobStats.new
-
-    assert_equal({ url1.id => 1, url2.id => 1 }, stats.scraping_queued)
-    assert_equal({ url1.id => 2, url2.id => 1 }, stats.submission_download_queued)
-    assert_equal({ url1.id => 3, url2.id => 2 }, stats.e6_iqdb_queued)
-    assert_equal([url1.id, url2.id].sort, stats.active_urls.sort)
+    assert_equal(10, GoodJob::Job.count)
   end
 
   it "returns the correct values for currently running scraping jobs" do