From ea8fa01f9b08f49472f1686cbf92a47e8df3684a Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Thu, 6 Mar 2025 11:51:01 +0200 Subject: [PATCH] refactor --- app/jobs/org_registrant_phone_checker_job.rb | 3 --- test/jobs/org_registrant_phone_checker_job_test.rb | 4 ---- 2 files changed, 7 deletions(-) diff --git a/app/jobs/org_registrant_phone_checker_job.rb b/app/jobs/org_registrant_phone_checker_job.rb index d42a64407..1d791acac 100644 --- a/app/jobs/org_registrant_phone_checker_job.rb +++ b/app/jobs/org_registrant_phone_checker_job.rb @@ -90,17 +90,14 @@ class OrgRegistrantPhoneCheckerJob < ApplicationJob def fetch_phone_number_from_company_register(company_code) cache_key = "company_register:#{company_code}:phone_numbers" - # Skip cache in test environment if environment variable is set return fetch_from_company_register(company_code) if Rails.env.test? && ENV['SKIP_COMPANY_REGISTER_CACHE'] - # Try to get data from cache Rails.cache.fetch(cache_key, expires_in: CACHE_EXPIRES_IN) do fetch_from_company_register(company_code) end end def fetch_from_company_register(company_code) - # If not in cache, request API with retries with_retry( exceptions: API_EXCEPTIONS, logger: Rails.logger, diff --git a/test/jobs/org_registrant_phone_checker_job_test.rb b/test/jobs/org_registrant_phone_checker_job_test.rb index f5764c2c4..651a5dfd7 100644 --- a/test/jobs/org_registrant_phone_checker_job_test.rb +++ b/test/jobs/org_registrant_phone_checker_job_test.rb @@ -13,15 +13,11 @@ class OrgRegistrantPhoneCheckerJobTest < ActiveSupport::TestCase ident: '12345678' ) - # Set environment variable to skip cache in tests ENV['SKIP_COMPANY_REGISTER_CACHE'] = 'true' - - # Clear cache before each test to avoid interference Rails.cache.clear if defined?(Rails.cache) end teardown do - # Reset environment variable after tests ENV['SKIP_COMPANY_REGISTER_CACHE'] = nil end