about summary refs log tree commit diff
path: root/app/validators
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-11-17 11:42:20 +0100
committerGitHub <noreply@github.com>2022-11-17 11:42:20 +0100
commitab7d99e035f5b880ef77440e7c2e76f8e8728992 (patch)
tree90b4fed3f19bbe4eaa9ad43444260c9e84236119 /app/validators
parent23ea0e75080e427e5ec6be08f7fa75fc8508cd94 (diff)
Fix various issues with domain block import (#1944)
- stop using Paperclip for processing domain allow/block imports
- stop leaving temporary files
- better error handling
- assume CSV files are UTF-8-encoded
Diffstat (limited to 'app/validators')
-rw-r--r--app/validators/admin_import_validator.rb19
1 files changed, 0 insertions, 19 deletions
diff --git a/app/validators/admin_import_validator.rb b/app/validators/admin_import_validator.rb
deleted file mode 100644
index 338ceb3a7..000000000
--- a/app/validators/admin_import_validator.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class AdminImportValidator < ActiveModel::Validator
-  FIRST_HEADER = '#domain'
-
-  def validate(import)
-    return if import.type.blank? || import.data.blank?
-
-    # We parse because newlines could be part of individual rows. This
-    # runs on create so we should be reading the local file here before
-    # it is uploaded to object storage or moved anywhere...
-    csv_data = CSV.parse(import.data.queued_for_write[:original].read)
-
-    row_count  = csv_data.size
-    row_count -= 1 if csv_data.first&.first == FIRST_HEADER
-
-    import.errors.add(:data, I18n.t('imports.errors.over_rows_processing_limit', count: Admin::DomainBlocksController::ROWS_PROCESSING_LIMIT)) if row_count > Admin::DomainBlocksController::ROWS_PROCESSING_LIMIT
-  end
-end