Merge pull request #3623 from nhsuk/filter-year-groups

Query full subset of year groups

Author: thomasleese

app/controllers/api/locations_controller.rb

@@ -14,7 +14,7 @@ def index
 
     if (year_groups = params[:year_groups]).present?
       @locations =
-        @locations.where("year_groups && ARRAY[?]::integer[]", year_groups)
+        @locations.where("ARRAY[?]::integer[] <@ year_groups", year_groups)
     end
 
     if (

spec/requests/api/locations_spec.rb

@@ -75,6 +75,22 @@
 
         expect(locations).to eq([primary_school.as_json])
       end
+
+      context "with multiple year groups" do
+        before { create(:school, year_groups: [8, 9]) }
+
+        let!(:secondary_school) { create(:school, year_groups: [8, 9, 10]) }
+
+        it "includes locations with all those year groups" do
+          get "/api/locations", params: { year_groups: [8, 9, 10] }
+
+          expect(response).to have_http_status(:ok)
+
+          locations = JSON.parse(response.body)
+
+          expect(locations).to eq([secondary_school.as_json])
+        end
+      end
     end
 
     context "when filtering by attached to organisation" do