-
<%= govuk_table do |table| %>
<%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
<%= render(SearchResultCaptionComponent.new(searched: @searched, count: @pagy.count, item_label:, total_count: @total_count, item: "locations", path: request.path)) %>
diff --git a/spec/factories/location.rb b/spec/factories/location.rb
index f43da0ac8..00fa0d77f 100644
--- a/spec/factories/location.rb
+++ b/spec/factories/location.rb
@@ -21,6 +21,11 @@ FactoryBot.define do
old_visible_id { "111" }
end
+ trait :incomplete do
+ units { nil }
+ confirmed { false }
+ end
+
trait :with_old_visible_id do
old_visible_id { rand(9_999_999).to_s }
end
diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb
index c88b831ec..73972c4c3 100644
--- a/spec/features/schemes_spec.rb
+++ b/spec/features/schemes_spec.rb
@@ -284,6 +284,43 @@ RSpec.describe "Schemes scheme Features" do
end
end
+ context "when filtering locations" do
+ before do
+ click_link("Locations")
+ end
+
+ context "when no filters are selected" do
+ it "displays the filters component with no clear button" do
+ expect(page).to have_content("No filters applied")
+ expect(page).not_to have_content("Clear")
+ end
+ end
+
+ context "when I have selected filters" do
+ before do
+ check("Active")
+ check("Incomplete")
+ click_button("Apply filters")
+ end
+
+ it "displays the filters component with a correct count and clear button" do
+ expect(page).to have_content("2 filters applied")
+ expect(page).to have_content("Clear")
+ end
+
+ context "when clearing the filters" do
+ before do
+ click_link("Clear")
+ end
+
+ it "clears the filters and displays the filter component as before" do
+ expect(page).to have_content("No filters applied")
+ expect(page).not_to have_content("Clear")
+ end
+ end
+ end
+ end
+
context "when the user clicks add location" do
before do
click_link("Locations")
diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb
index 1fe359136..f24a5f4fa 100644
--- a/spec/models/location_spec.rb
+++ b/spec/models/location_spec.rb
@@ -930,6 +930,79 @@ RSpec.describe Location, type: :model do
end
end
+ describe "filter by status" do
+ let!(:incomplete_location) { FactoryBot.create(:location, :incomplete, startdate: Time.zone.local(2022, 4, 1)) }
+ let!(:active_location) { FactoryBot.create(:location, startdate: Time.zone.local(2022, 4, 1)) }
+ let(:deactivating_soon_location) { FactoryBot.create(:location, startdate: Time.zone.local(2022, 4, 1)) }
+ let(:deactivated_location) { FactoryBot.create(:location, startdate: Time.zone.local(2022, 4, 1)) }
+ let(:reactivating_soon_location) { FactoryBot.create(:location, startdate: Time.zone.local(2022, 4, 1)) }
+ let!(:activating_soon_location) { FactoryBot.create(:location, startdate: Time.zone.local(2022, 7, 7)) }
+
+ before do
+ Timecop.freeze(2022, 6, 7)
+ FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 8, 8), location: deactivating_soon_location)
+ deactivating_soon_location.save!
+ FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 6), location: deactivated_location)
+ deactivated_location.save!
+ FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 7), reactivation_date: Time.zone.local(2022, 6, 8), location: reactivating_soon_location)
+ reactivating_soon_location.save!
+ end
+
+ after do
+ Timecop.unfreeze
+ end
+
+ context "when filtering by incomplete status" do
+ it "returns only incomplete locations" do
+ expect(described_class.filter_by_status(%w[incomplete]).count).to eq(1)
+ expect(described_class.filter_by_status(%w[incomplete]).first).to eq(incomplete_location)
+ end
+ end
+
+ context "when filtering by active status" do
+ it "returns only active locations" do
+ expect(described_class.filter_by_status(%w[active]).count).to eq(1)
+ expect(described_class.filter_by_status(%w[active]).first).to eq(active_location)
+ end
+ end
+
+ context "when filtering by deactivating_soon status" do
+ it "returns only deactivating_soon locations" do
+ expect(described_class.filter_by_status(%w[deactivating_soon]).count).to eq(1)
+ expect(described_class.filter_by_status(%w[deactivating_soon]).first).to eq(deactivating_soon_location)
+ end
+ end
+
+ context "when filtering by deactivated status" do
+ it "returns only deactivated locations" do
+ expect(described_class.filter_by_status(%w[deactivated]).count).to eq(1)
+ expect(described_class.filter_by_status(%w[deactivated]).first).to eq(deactivated_location)
+ end
+ end
+
+ context "when filtering by reactivating_soon status" do
+ it "returns only reactivating_soon locations" do
+ expect(described_class.filter_by_status(%w[reactivating_soon]).count).to eq(1)
+ expect(described_class.filter_by_status(%w[reactivating_soon]).first).to eq(reactivating_soon_location)
+ end
+ end
+
+ context "when filtering by activating_soon status" do
+ it "returns only activating_soon locations" do
+ expect(described_class.filter_by_status(%w[activating_soon]).count).to eq(1)
+ expect(described_class.filter_by_status(%w[activating_soon]).first).to eq(activating_soon_location)
+ end
+ end
+
+ context "when filtering by multiple statuses" do
+ it "returns relevant locations" do
+ expect(described_class.filter_by_status(%w[deactivating_soon activating_soon]).count).to eq(2)
+ expect(described_class.filter_by_status(%w[deactivating_soon activating_soon])).to include(activating_soon_location)
+ expect(described_class.filter_by_status(%w[deactivating_soon activating_soon])).to include(deactivating_soon_location)
+ end
+ end
+ end
+
describe "available_from" do
context "when there is a startdate" do
let(:location) { FactoryBot.build(:location, startdate: Time.zone.local(2022, 4, 6)) }
diff --git a/spec/requests/locations_controller_spec.rb b/spec/requests/locations_controller_spec.rb
index 52b1c087f..7dccbec1b 100644
--- a/spec/requests/locations_controller_spec.rb
+++ b/spec/requests/locations_controller_spec.rb
@@ -119,6 +119,54 @@ RSpec.describe LocationsController, type: :request do
it "returns 200" do
expect(response).to be_successful
end
+
+ context "when filtering" do
+ context "with status filter" do
+ let(:scheme) { create(:scheme, owning_organisation: user.organisation) }
+ let!(:incomplete_location) { create(:location, :incomplete, scheme:, startdate: Time.zone.local(2022, 4, 1)) }
+ let!(:active_location) { create(:location, scheme:, startdate: Time.zone.local(2022, 4, 1)) }
+ let!(:deactivated_location) { create(:location, scheme:, startdate: Time.zone.local(2022, 4, 1)) }
+
+ before do
+ create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 4, 1), location: deactivated_location)
+ end
+
+ it "shows locations for multiple selected statuses" do
+ get "/schemes/#{scheme.id}/locations?status[]=incomplete&status[]=active", headers:, params: {}
+ expect(page).to have_link(incomplete_location.postcode)
+ expect(page).to have_link(active_location.postcode)
+ end
+
+ it "shows filtered incomplete locations" do
+ get "/schemes/#{scheme.id}/locations?status[]=incomplete", headers:, params: {}
+ expect(page).to have_link(incomplete_location.postcode)
+ expect(page).not_to have_link(active_location.postcode)
+ end
+
+ it "shows filtered active locations" do
+ get "/schemes/#{scheme.id}/locations?status[]=active", headers:, params: {}
+ expect(page).to have_link(active_location.postcode)
+ expect(page).not_to have_link(incomplete_location.postcode)
+ end
+
+ it "shows filtered deactivated locations" do
+ get "/schemes/#{scheme.id}/locations?status[]=deactivated", headers:, params: {}
+ expect(page).to have_link(deactivated_location.postcode)
+ expect(page).not_to have_link(active_location.postcode)
+ expect(page).not_to have_link(incomplete_location.postcode)
+ end
+
+ it "does not reset the filters" do
+ get "/schemes/#{scheme.id}/locations?status[]=incomplete", headers:, params: {}
+ expect(page).to have_link(incomplete_location.postcode)
+ expect(page).not_to have_link(active_location.postcode)
+
+ get "/schemes/#{scheme.id}/locations", headers:, params: {}
+ expect(page).to have_link(incomplete_location.postcode)
+ expect(page).not_to have_link(active_location.postcode)
+ end
+ end
+ end
end
context "when signed in as a data coordinator user" do