Merge pull request #605 from IU-Libraries-Joint-Development/refactor_…

…collection_banner_lookup

[ESSI-1947] refactor banner lookup fedora query to solr query, add memoization

app/views/_masthead.html.erb

@@ -18,7 +18,8 @@
     </div>
   </nav>
   <%= render '/campus' %>
-  <%= render 'shared/collection_banner'  if @presenter.respond_to?(:collection) && @presenter.collection%>
+  <% @collection_presenter = @presenter.try(:collection_banner_presenter) %>
+  <%= render 'shared/collection_banner' if @collection_presenter %>
   <%= render 'shared/collection_banner_for_collection' if @presenter.try(:collection?) && @presenter.model_name == 'Collection' %>
 
 </header>

app/views/shared/_collection_banner_link.html.erb

@@ -1,4 +1,3 @@
-<% @collection_presenter = Hyrax::CollectionPresenter.new(@presenter.collection, current_ability) %>
 <%= link_to collection_path(@collection_presenter.id) do %>
   <div class="row extended-banner extended-banner-linked hyc-banner-row">
     <div class="col-md-12">

app/views/shared/_collection_title_link.html.erb

@@ -1,5 +1,3 @@
-<% @collection_presenter = Hyrax::CollectionPresenter.new(@presenter.collection, current_ability) %>
-
 <div class="row extended-banner extended-banner-title-linked hyc-banner-row">
   <% unless @collection_presenter.banner_file.blank? %>
     <div class="col-md-12 hyc-banner-container" style="background-image:url(<%= @collection_presenter.banner_file %>)">

lib/extensions/hyrax/file_set_presenter/collection_banner.rb

@@ -2,9 +2,8 @@ module Extensions
   module Hyrax
     module FileSetPresenter
       module CollectionBanner
-        def collection
-          # return fileset collection if any, else nil
-          FileSet.find(id)&.parent&.member_of_collections&.first
+        def collection_banner_presenter
+          @collection_banner_presenter ||= parent&.collection_banner_presenter
         end
       end
     end

lib/extensions/hyrax/work_show_presenter/collection_banner.rb

@@ -2,11 +2,8 @@ module Extensions
   module Hyrax
     module WorkShowPresenter
       module CollectionBanner
-        def collection
-          # return work collection if any, else nil
-          return false if member_of_collection_ids.empty?
-
-          Collection.find(member_of_collection_ids.first)
+        def collection_banner_presenter
+          @collection_banner_presenter ||= member_of_collection_presenters.first
         end
       end
     end

spec/presenters/hyrax/file_set_presenter_spec.rb

@@ -14,8 +14,8 @@
   end
 
   context 'When initialized' do
-    it '.collection is available' do
-      expect(subject).to respond_to(:collection)
+    it '.collection_banner_presenter is available' do
+      expect(subject).to respond_to(:collection_banner_presenter)
     end
     it '.campus_logo is available' do
       expect(subject).to respond_to(:campus_logo)

spec/presenters/hyrax/work_show_presenter_spec.rb

@@ -13,8 +13,8 @@
   end
 
   context 'When initialized' do
-    it '.collection is available' do
-      expect(subject).to respond_to(:collection)
+    it '.collection_banner_presenter is available' do
+      expect(subject).to respond_to(:collection_banner_presenter)
     end
     it '.campus_logo is available' do
       expect(subject).to respond_to(:campus_logo)