Merge pull request #1392 from alphagov/solr-400

Show Not Found page for Solr 400 Bad Request errors
alphagov · Jan 3, 2025 · 2e16e50 · 2e16e50
2 parents 3cb8eef + 2981f4b
commit 2e16e50
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/models/solr_dataset.rb b/app/models/solr_dataset.rb
@@ -101,7 +101,7 @@ def self.get_by_query(query:)
         fl: Search::Solr.field_list,
       }
     rescue RSolr::Error::Http => e
-      if e.response[:status] == 404
+      if e.response[:status] == 404 || e.response[:status] == 400
         raise NotFound
       else
         raise e

diff --git a/spec/models/solr_dataset_spec.rb b/spec/models/solr_dataset_spec.rb
@@ -80,6 +80,14 @@
         }.to raise_error(described_class::NotFound)
       end
 
+      it "raises an exeption if Solr returns 400 response" do
+        mock_solr_http_error(status: 400)
+
+        expect {
+          described_class.get_by_uuid(uuid: "does-not-exist")
+        }.to raise_error(described_class::NotFound)
+      end
+
       it "raises an exeption if Solr returns zero results" do
         response = { "response" => {
           "numFound" => 0,