Merge pull request #1038 from pod4lib/1025-conditional-model-validation

Change upload validation to avoid input error on form

app/models/upload.rb

@@ -9,7 +9,7 @@ class Upload < ApplicationRecord
   has_many :marc_profiles, dependent: :delete_all
   belongs_to :user, optional: true
   belongs_to :allowlisted_jwts, optional: true
-  validates :url, presence: true, if: proc { |upload| upload.files.blank? }
+  validate :url_presence_if_no_uploaded_files
   validates :files, presence: true, if: proc { |upload| upload.url.blank? }
   validate :valid_url, if: proc { |upload| upload.url.present? }
   scope :active, -> { where(status: %w[active processed]) }
@@ -68,6 +68,10 @@ def read_marc_record_metadata(**options, &block)
 
   private
 
+  def url_presence_if_no_uploaded_files
+    errors.add(:url, 'A URL must be provided if a file has not been uploaded') if !files.attached? && url.blank?
+  end
+
   def perform_extract_marc_record_metadata_job
     ExtractMarcRecordMetadataJob.perform_later(self)
   end

spec/models/upload_spec.rb

@@ -9,7 +9,8 @@
     it 'validates that a URL or files are present' do
       expect do
         create(:upload, files: [])
-      end.to raise_error(ActiveRecord::RecordInvalid, "Validation failed: Url can't be blank, Files can't be blank")
+      end.to raise_error(ActiveRecord::RecordInvalid,
+                         "Validation failed: Url A URL must be provided if a file has not been uploaded, Files can't be blank")
     end
 
     context 'with an invalid URL' do