Merge pull request #3873 from alphagov/add_guard_clause

Add additional guard clause when we fetch popular tasks from SearchAPI

app/models/popular_list_set.rb

@@ -30,6 +30,8 @@ def search_response
       fields: SearchApiFields::POPULAR_BROWSE_SEARCH_FIELDS,
     }
     Services.cached_search(params)
+  rescue GdsApi::HTTPServerError
+    {}
   end
 
   def second_level_browse_content_ids

spec/models/popular_list_spec.rb

@@ -39,5 +39,12 @@
       stub_search(params:, body: search_response)
       expect(popular_list.formatted_results).to eq expected_results
     end
+
+    context "SearchAPI is unavailable" do
+      it "returns nil" do
+        stub_search_api_isnt_available
+        expect(popular_list.formatted_results).to eq nil
+      end
+    end
   end
 end

spec/support/search_api_helpers.rb

@@ -1,6 +1,10 @@
 module SearchApiHelpers
   include SearchApiFields
 
+  def stub_search_api_isnt_available
+    stub_request(:any, /#{Plek.find('search-api')}\/.*/).to_return(status: 503)
+  end
+
   def stub_search(body:, params: nil)
     if params
       stub_any_search