lib/ddr/models/solr_document.rb in ddr-models-3.0.0.rc4 vs lib/ddr/models/solr_document.rb in ddr-models-3.0.0.rc5

@@ -87,13 +87,18 @@
     def attached_files
       (get_json(Ddr::Index::Fields::ATTACHED_FILES) || {}).with_indifferent_access
     end
 
     def has_datastream?(dsID)
-      attached_files.key?(dsID) && attached_files[dsID]["size"].present?
+      Deprecation.warn(SolrDocument, "Use `has_attached_file?` instead.")
+      has_attached_file?(dsID)
     end
 
+    def has_attached_file?(file_id)
+      attached_files.key?(file_id)
+    end
+
     def has_admin_policy?
       admin_policy_uri.present?
     end
 
     def admin_policy_uri
@@ -132,18 +137,18 @@
     def source
       self[ActiveFedora::SolrService.solr_name(:source, :stored_searchable, type: :text)]
     end
 
     def has_thumbnail?
-      has_datastream?(Ddr::Models::File::THUMBNAIL)
+      has_attached_file?(Ddr::Models::File::THUMBNAIL)
     end
 
     def has_content?
-      has_datastream?(Ddr::Models::File::CONTENT)
+      has_attached_file?(Ddr::Models::File::CONTENT)
     end
 
     def has_extracted_text?
-      has_datastream?(Ddr::Datastreams::EXTRACTED_TEXT)
+      has_attached_file?(Ddr::Datastreams::EXTRACTED_TEXT)
     end
 
     def content_ds
       datastreams[Ddr::Models::File::CONTENT]
     end