Merge pull request #1768 from sul-dlss/move-primary

Move primary method to the resource level
sul-dlss · Nov 17, 2023 · 60d0bf4 · 60d0bf4
2 parents 8a0aa94 + aa13f67
commit 60d0bf4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/models/embed/purl/resource.rb b/app/models/embed/purl/resource.rb
@@ -43,7 +43,11 @@ def size
 
       # @return [ResourceFile]
       def primary_file
-        files.find(&:primary?)
+        files.find { |file| primary_types.include?(file.mimetype) }
+      end
+
+      def primary_types
+        @primary_types ||= Array(Settings.primary_mimetypes[type])
       end
 
       # @return [ResourceFile]

diff --git a/app/models/embed/purl/resource_file.rb b/app/models/embed/purl/resource_file.rb
@@ -46,10 +46,6 @@ def hierarchical_title
         title.split('/').last
       end
 
-      def primary?
-        Array(Settings.primary_mimetypes[resource.type]).include?(mimetype)
-      end
-
       def thumbnail?
         image? && Settings.resource_types_that_contain_thumbnails.include?(resource.type)
       end