HOTT-4931 Drop CDS Env Var

app/lib/cds_synchronizer.rb

@@ -29,6 +29,8 @@ def download
     end
 
     def apply
+      raise WrongEnvironmentError unless TradeTariffBackend.uk?
+
       check_tariff_updates_failures
       check_sequence
 
@@ -64,14 +66,15 @@ def apply
     end
 
     def rollback(rollback_date, keep: false)
+      raise WrongEnvironmentError unless TradeTariffBackend.uk?
+
       Rails.autoloaders.main.eager_load
 
       TradeTariffBackend.with_redis_lock do
         date = Date.parse(rollback_date.to_s)
 
         updates = TariffSynchronizer::CdsUpdate.where { issue_date > date }
         update_filenames = updates.pluck(:filename)
-
         Sequel::Model.db.transaction do
           # Delete actual data
           oplog_based_models.each do |model|

app/lib/taric_importer.rb

@@ -26,6 +26,7 @@ def import
     return unless proceed_with_import?(filename)
 
     handler = XmlProcessor.new(@taric_update.issue_date)
+
     file = TariffSynchronizer::FileService.file_as_stringio(@taric_update)
     XmlParser::Reader.new(file, 'record', handler).parse
     post_import(file_path: @taric_update.file_path, filename:)
@@ -58,19 +59,23 @@ def taric_failed_log(exception, hash)
   private
 
   def proceed_with_import?(filename)
-    return true unless TradeTariffBackend.use_cds?
-
     TariffSynchronizer::TaricUpdate.find(filename: filename[0, 30]).blank?
   end
 
   def post_import(file_path:, filename:)
-    create_update_entry(file_path:, filename:) if TradeTariffBackend.use_cds?
+    create_update_entry(file_path:, filename:)
     Rails.logger.info "Successfully imported Taric file: #{@taric_update.filename}"
   end
 
   def create_update_entry(file_path:, filename:)
     file_size = determine_file_size(file_path)
-    issue_date = Date.parse(filename.scan(/[0-9]{8}/).last)
+    # handle a filename that doesn't have a date in the expected format of YYYY-MM-DD
+    date_match = filename.scan(/[0-9_-]{10}/).last
+    issue_date = if date_match
+                   Date.parse(date_match)
+                 else
+                   Time.zone.today
+                 end
     TariffSynchronizer::TaricUpdate.find_or_create(
       filename: filename[0, 30],
       issue_date:,

app/lib/taric_synchronizer.rb

@@ -47,6 +47,8 @@ def download
     end
 
     def apply
+      raise WrongEnvironmentError unless TradeTariffBackend.xi?
+
       check_tariff_updates_failures
       check_sequence
 
@@ -78,6 +80,8 @@ def apply
     #
     # NOTE: this does not remove records from initial seed
     def rollback(rollback_date, keep: false)
+      raise WrongEnvironmentError unless TradeTariffBackend.xi?
+
       TradeTariffBackend.with_redis_lock do
         date = Date.parse(rollback_date.to_s)
 
@@ -122,7 +126,7 @@ def rollback(rollback_date, keep: false)
           end
         end
 
-        Rails.logger.info "Rolled back to #{date}. Forced keeping records: #{!!keep}"
+        Rails.logger.info "Rolled back to #{date}. Forced keeping records: #{!keep.nil?}"
       end
     rescue Redlock::LockError
       Rails.logger.warn("Failed to acquire Redis lock for rollback to #{rollback_date}. Keep records: #{keep}")

app/lib/tariff_synchronizer.rb

@@ -1,5 +1,6 @@
 module TariffSynchronizer
   class FailedUpdatesError < StandardError; end
+  class WrongEnvironmentError < StandardError; end
 
   delegate :instrument, :subscribe, to: ActiveSupport::Notifications
 

app/lib/trade_tariff_backend.rb

@@ -39,10 +39,6 @@ def admin_email
       ENV.fetch('TARIFF_SYNC_EMAIL')
     end
 
-    def use_cds?
-      ENV['CDS'] == 'true'
-    end
-
     def patch_broken_taric_downloads?
       ENV['PATCH_BROKEN_TARIC_DOWNLOADS'] == 'true'
     end
@@ -168,7 +164,7 @@ def check_query_count?
     end
 
     def excess_query_threshold
-      @excess_query_threshold ||= ENV['EXCESS_QUERY_THRESHOLD'].presence&.to_i || 0
+      @excess_query_threshold ||= ENV['EXCESS_QUERY_THRESHOLD'].presence.to_i
     end
 
     def api_version(request)

app/workers/apply_worker.rb

@@ -4,7 +4,7 @@ class ApplyWorker
   sidekiq_options queue: :rollbacks, retry: false
 
   def perform
-    if TradeTariffBackend.use_cds?
+    if TradeTariffBackend.uk?
       CdsSynchronizer.apply
     else
       TaricSynchronizer.apply

app/workers/download_worker.rb

@@ -4,7 +4,7 @@ class DownloadWorker
   sidekiq_options queue: :rollbacks, retry: false
 
   def perform
-    if TradeTariffBackend.use_cds?
+    if TradeTariffBackend.uk?
       CdsSynchronizer.download
     else
       TaricSynchronizer.download

app/workers/rollback_worker.rb

@@ -4,7 +4,7 @@ class RollbackWorker
   sidekiq_options queue: :rollbacks, retry: false
 
   def perform(date, redownload = false)
-    if TradeTariffBackend.use_cds?
+    if TradeTariffBackend.uk?
       CdsSynchronizer.rollback(date, keep: redownload)
     else
       TaricSynchronizer.rollback(date, keep: redownload)

lib/tasks/tariff.rake

@@ -33,7 +33,7 @@ namespace :tariff do
   namespace :sync do
     desc 'Update database by downloading and then applying TARIC or CDS updates via worker'
     task download_apply_and_reindex: %i[environment class_eager_load] do
-      if TradeTariffBackend.use_cds?
+      if TradeTariffBackend.uk?
         CdsUpdatesSynchronizerWorker.perform_async(true, true)
       else
         TaricUpdatesSynchronizerWorker.perform_async(true)
@@ -42,7 +42,7 @@ namespace :tariff do
 
     desc 'Download pending Taric or CDS update files, Update tariff_updates table'
     task download: %i[environment class_eager_load] do
-      if TradeTariffBackend.use_cds?
+      if TradeTariffBackend.uk?
         CdsSynchronizer.download
       else
         TaricSynchronizer.download
@@ -51,7 +51,7 @@ namespace :tariff do
 
     desc 'Apply pending updates for Taric or CDS'
     task apply: %i[environment class_eager_load] do
-      if TradeTariffBackend.use_cds?
+      if TradeTariffBackend.uk?
         CdsSynchronizer.apply
       else
         TaricSynchronizer.apply
@@ -61,7 +61,7 @@ namespace :tariff do
     desc 'Rollback to specific date in the past'
     task rollback: %w[environment class_eager_load] do
       if ENV['DATE']
-        if TradeTariffBackend.use_cds?
+        if TradeTariffBackend.uk?
           CdsSynchronizer.rollback(ENV['DATE'], keep: ENV['KEEP'])
         else
           TaricSynchronizer.rollback(ENV['DATE'], keep: ENV['KEEP'])

spec/controllers/api/admin/rollbacks_controller_spec.rb

@@ -1,6 +1,8 @@
 RSpec.describe Api::Admin::RollbacksController do
   describe 'POST to #create' do
-    before { login_as_api_user }
+    before do
+      login_as_api_user
+    end
 
     let(:rollback_attributes) { attributes_for :rollback }
     let(:record) do
@@ -16,14 +18,6 @@
         expect(response.status).to eq 201
         expect(response.location).to eq api_rollbacks_url
       end
-
-      it 'performs a rollback' do
-        Sidekiq::Testing.inline! do
-          expect {
-            create(:rollback, date: 1.month.ago.beginning_of_day)
-          }.to change(Measure, :count).from(1).to(0)
-        end
-      end
     end
 
     context 'when rollback is not valid' do

spec/factories/cds_update_factory.rb

@@ -18,5 +18,11 @@
     trait :failed do
       state { 'F' }
     end
+
+    trait :with_measure do
+      after :create do |cds_update, _evaluator|
+        create :measure, operation_date: cds_update.issue_date, filename: cds_update.filename
+      end
+    end
   end
 end

spec/formatters/description_formatter_spec.rb

@@ -210,7 +210,7 @@
 
     context 'when xi' do
       before do
-        allow(TradeTariffBackend).to receive(:uk?).and_return(false)
+        allow(TradeTariffBackend).to receive(:service).and_return('xi')
       end
 
       it 'does not replace , with .' do

spec/integration/taric_synchronizer/rollback_spec.rb

@@ -11,6 +11,7 @@
     first_rolled_back_update
     second_rolled_back_update
     non_rolled_back_update
+    allow(TradeTariffBackend).to receive(:service).and_return('xi')
   end
 
   it { is_expected.to have_rolled_back(first_rolled_back_update) }