Allow matching any authority-level

Author: KludgeKML

app/models/data_set.rb

@@ -52,9 +52,9 @@ def number_of_places
   #
   # Returns:
   #   an array of Place objects
-  def places_near(location, distance = nil, limit = nil, snac = nil)
+  def places_near(location, distance = nil, limit = nil, snac = [])
     query = places
-    query = query.where(snac: snac) if snac
+    query = query.where(:snac.in => snac) if snac.any?
     query = query.limit(limit) if limit
     query = query.geo_near([location.longitude, location.latitude])
     query = query.max_distance(distance.in(:degrees)) if distance
@@ -73,23 +73,23 @@ def places_for_postcode(postcode, distance = nil, limit = nil)
     # involve some frontend work though. For now, do this to
     # match the existing (not totally correct) behaviour
     snac = appropriate_snac_for_postcode(postcode)
-    return [] unless snac
+    return [] unless snac.any?
 
     places_near(location, distance, limit, snac)
   end
 
   def appropriate_snac_for_postcode(postcode)
     local_custodian_codes = GdsApi.locations_api.local_custodian_code_for_postcode(postcode)
-    return nil if local_custodian_codes.compact.empty?
+    return [] if local_custodian_codes.compact.empty?
 
     local_authorities_response = GdsApi.local_links_manager.local_authority_by_custodian_code(local_custodian_codes.first)
     filtered_authorities = local_authorities_response.to_hash["local_authorities"].select do |la|
-      [service.local_authority_hierarchy_match_type, "unitary"].include?(la["tier"])
+      service.local_authority_hierarchy_match_type == Service::LOCAL_AUTHORITY_EITHER_MATCH || [service.local_authority_hierarchy_match_type, "unitary"].include?(la["tier"])
     end
 
-    filtered_authorities.first&.dig("snac") # there should be 0-1, return nil or first snac
+    filtered_authorities.map { |a| a["snac"] }
   rescue GdsApi::HTTPNotFound
-    nil
+    []
   end
 
   def duplicating?

app/models/service.rb

@@ -4,7 +4,8 @@ class Service
   LOCATION_MATCH_TYPES = %w[nearest local_authority].freeze
   LOCAL_AUTHORITY_DISTRICT_MATCH = "district".freeze
   LOCAL_AUTHORITY_COUNTY_MATCH = "county".freeze
-  LOCAL_AUTHORITY_HIERARCHY_MATCH_TYPES = [LOCAL_AUTHORITY_DISTRICT_MATCH, LOCAL_AUTHORITY_COUNTY_MATCH].freeze
+  LOCAL_AUTHORITY_EITHER_MATCH = "either".freeze
+  LOCAL_AUTHORITY_HIERARCHY_MATCH_TYPES = [LOCAL_AUTHORITY_DISTRICT_MATCH, LOCAL_AUTHORITY_COUNTY_MATCH, LOCAL_AUTHORITY_EITHER_MATCH].freeze
   MAX_ARCHIVES_TO_STORE = 3
 
   field :name,                    type: String

test/integration/places_api_test.rb

@@ -282,6 +282,36 @@ class PlacesAPITest < ActionDispatch::IntegrationTest
           assert_equal @place3.name, data[1]["name"]
         end
       end
+
+      context "when the service is bounded to either districts or counties" do
+        setup do
+          @service.update(local_authority_hierarchy_match_type: Service::LOCAL_AUTHORITY_EITHER_MATCH)
+        end
+
+        should "return all places in order of nearness for postcodes in a county+district council hierarchy" do
+          stub_locations_api_has_location("EX39 1QS", [{ "latitude" => 51.05318361810428, "longitude" => -4.191071523498792, "local_custodian_code" => 1234 }])
+          stub_local_links_manager_has_a_district_and_county_local_authority("my-district", "my-county", district_snac: "18UK", county_snac: "18", local_custodian_code: 1234)
+
+          get "/places/#{@service.slug}.json?postcode=EX39+1QS"
+          data = JSON.parse(last_response.body)
+          assert_equal 4, data.length
+          assert_equal @place6.name, data[0]["name"]
+          assert_equal @place2.name, data[1]["name"]
+          assert_equal @place5.name, data[2]["name"]
+          assert_equal @place1.name, data[3]["name"]
+        end
+
+        should "return all places in order of nearness for postcodes not in a county+district council hierarchy" do
+          stub_locations_api_has_location("WC2B 6NH", [{ "latitude" => 51.51695975170424, "longitude" => -0.12058693935709164, "local_custodian_code" => 1234 }])
+          stub_local_links_manager_has_a_local_authority("county1", country_name: "England", snac: "00AG", local_custodian_code: 1234)
+
+          get "/places/#{@service.slug}.json?postcode=WC2B+6NH"
+          data = JSON.parse(last_response.body)
+          assert_equal 2, data.length
+          assert_equal @place4.name, data[0]["name"]
+          assert_equal @place3.name, data[1]["name"]
+        end
+      end
     end
   end
 end