<%= item[:description].html_safe %>
+ <% end %> +The following timeline shows how this child's NHS number was found by searching the NHS Patient Demographics Service (PDS)
+ +<%= render AppTimelineComponent.new(@timeline_items) %> + +A fuzzy search finds text that matches a term closely as well as exactly. + For example, a fuzzy search can identify Jon Smith even if the term entered was John Smith.
+ +A wildcard searches for unknown parts of text. For example, if you only + have part of a postcode: CV1, you can use a wildcard to search all records with a postcode + that includes CV1.
+ +History refers to the child’s history, for example if they have changed + their name or address.
diff --git a/config/locales/en.yml b/config/locales/en.yml index 33ae700522..c3eb0867c7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -214,6 +214,19 @@ en: types: father: dad mother: mum + pds_search_result: + steps: + no_fuzzy_with_history: "Non-fuzzy search (with history)" + no_fuzzy_with_history_daily: "Non-fuzzy search (with history)" + no_fuzzy_without_history: "Non-fuzzy search (without history)" + no_fuzzy_with_wildcard_postcode: "Non-fuzzy search (with history and wildcard postcode)" + no_fuzzy_with_wildcard_given_name: "Non-fuzzy search (with history and wildcard first name)" + no_fuzzy_with_wildcard_family_name: "Non-fuzzy search (with history and wildcard surname)" + fuzzy: "Fuzzy search" + results: + no_matches: "No matches found" + one_match: "Found %{nhs_number}" + too_many_matches: "Too many matches found" programme: types: flu: Flu diff --git a/config/routes.rb b/config/routes.rb index 609c8375cb..8955f7d728 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -175,8 +175,9 @@ end member do - get "log" post "invite-to-clinic" + get "log" + get "pds-search-history" get "edit/nhs-number", controller: "patients/edit", diff --git a/spec/components/app_child_summary_component_spec.rb b/spec/components/app_child_summary_component_spec.rb index 0714955b8a..d456598ed6 100644 --- a/spec/components/app_child_summary_component_spec.rb +++ b/spec/components/app_child_summary_component_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true describe AppChildSummaryComponent do - subject { render_inline(component) } + subject(:rendered) { render_inline(component) } let(:component) { described_class.new(patient) } @@ -124,4 +124,34 @@ it { should have_text("Archive reason") } it { should have_text("Other: Some details.") } end + + context "with a PDS lookup match" do + let(:patient) { create(:patient) } + + before { allow(patient).to receive(:pds_lookup_match?).and_return(true) } + + it "shows a PDS history action link" do + expect(rendered).to have_link( + "PDS history", + href: + Rails.application.routes.url_helpers.pds_search_history_patient_path( + patient + ) + ) + end + end + + context "without a PDS lookup match" do + let(:patient) { create(:patient) } + + before { allow(patient).to receive(:pds_lookup_match?).and_return(false) } + + it { should_not have_link("PDS history") } + + context "when the record is not a Patient" do + let(:consent_form) { create(:consent_form) } + + it { should_not have_link("PDS history") } + end + end end diff --git a/spec/components/app_timeline_component_spec.rb b/spec/components/app_timeline_component_spec.rb new file mode 100644 index 0000000000..0f1361533e --- /dev/null +++ b/spec/components/app_timeline_component_spec.rb @@ -0,0 +1,66 @@ +# frozen_string_literal: true + +describe AppTimelineComponent do + subject(:rendered) { render_inline(described_class.new(items)) } + + context "when there are no items" do + let(:items) { [] } + + it "does not render" do + expect(rendered.to_html).to be_blank + end + end + + context "when items are present" do + let(:items) do + [ + { heading_text: "Step 1", description: "First step", active: true }, + { + heading_text: "Step 2", + description: "Past step", + is_past_item: true + }, + { heading_text: "Step 3", description: "Future step" } + ] + end + + it "renders a list of timeline items" do + expect(rendered.css("ul.app-timeline li.app-timeline__item").count).to eq( + 3 + ) + end + + it "renders the heading text" do + expect(rendered).to have_text("Step 1") + expect(rendered).to have_text("Step 2") + expect(rendered).to have_text("Step 3") + end + + it "renders the description text" do + expect(rendered).to have_text("First step") + expect(rendered).to have_text("Past step") + expect(rendered).to have_text("Future step") + end + + it "renders a bold header for active items" do + expect(rendered.css("h3.nhsuk-u-font-weight-bold")).to have_text("Step 1") + end + + it "renders a large badge for active and past items" do + expect(rendered.css("svg.app-timeline__badge")).to be_present + end + + it "renders a small badge for future items" do + expect(rendered.css("svg.app-timeline__badge--small")).to be_present + end + end + + context "when an item is blank" do + let(:items) { [nil, { heading_text: "Step X", description: "Valid" }] } + + it "skips rendering blank items" do + expect(rendered.css("li.app-timeline__item").count).to eq(1) + expect(rendered).to have_text("Step X") + end + end +end diff --git a/spec/features/import_child_pds_lookup_extravaganza_spec.rb b/spec/features/import_child_pds_lookup_extravaganza_spec.rb index 14d5fe5fa1..77e26e5006 100644 --- a/spec/features/import_child_pds_lookup_extravaganza_spec.rb +++ b/spec/features/import_child_pds_lookup_extravaganza_spec.rb @@ -24,9 +24,12 @@ # Case 1: Patient with existing NHS number (Albert) - nothing should happen and_i_see_the_patient_uploaded_with_nhs_number and_parents_are_created_for_albert + when_i_click_on_alberts_pds_history + then_i_see_the_pds_lookup_history # Case 2: Existing patient without NHS number (Betty) - should not show duplicate review - and_i_do_not_see_an_import_review_for_the_first_patient_uploaded_without_nhs_number + when_i_go_back_to_the_import_page + then_i_do_not_see_an_import_review_for_the_first_patient_uploaded_without_nhs_number when_i_click_on_the_patient_without_review then_i_see_the_new_patient_has_an_nhs_number and_betty_has_correct_parent_relationships @@ -296,12 +299,14 @@ def and_pds_lookups_dont_return_any_matches def and_pds_lookup_during_import_is_enabled Flipper.enable(:pds_lookup_during_import) - stub_pds_search_to_return_a_patient( - "9999075320", - "family" => "Tweedle", - "given" => "Albert", - "birthdate" => "eq2009-12-29", - "address-postalcode" => "SW11 1EH" + stub_pds_cascading_search( + family_name: "Tweedle", + given_name: "Albert", + birthdate: "eq2009-12-29", + address_postcode: "SW11 1EH", + steps: { + wildcard_family_name: "9999075320" + } ) stub_pds_search_to_return_a_patient( @@ -421,6 +426,30 @@ def stub_pds_cascading_search( end end + def when_i_visit_the_import_page + visit "/" + click_link "Import", match: :first + end + + def when_i_go_back_to_the_import_page + visit "/imports" + click_link "1 September 2025 at 12:00pm" + end + + def when_i_click_on_alberts_pds_history + click_on "TWEEDLE, Albert" + click_link "PDS history" + end + + def when_i_click_review_for(name) + within( + :xpath, + "//div[h3[contains(text(), 'records with import issues')]]" + ) do + within(:xpath, ".//tr[contains(., '#{name}')]") { click_link "Review" } + end + end + def and_i_upload_import_file(filename) travel 1.minute @@ -444,6 +473,26 @@ def then_i_should_see_the_import_failed expect(page).to have_content("12 unmatched records") end + def and_i_start_adding_children_to_the_session + click_on "Import class lists" + end + + def and_i_select_the_year_groups + check "Year 8" + check "Year 9" + check "Year 10" + check "Year 11" + click_on "Continue" + end + + def then_i_should_see_the_import_page + expect(page).to have_content("Import class list") + end + + def then_i_see_the_pds_lookup_history + expect(page).to have_content("NHS number lookup history") + end + def when_i_upload_a_valid_file attach_file( "class_import[csv]", @@ -520,7 +569,7 @@ def and_an_existing_patient_records_exist_in_school ) end - def and_i_do_not_see_an_import_review_for_the_first_patient_uploaded_without_nhs_number + def then_i_do_not_see_an_import_review_for_the_first_patient_uploaded_without_nhs_number expect(page).not_to have_content("Actions Review SAMSON, Betty") end diff --git a/spec/models/patient_spec.rb b/spec/models/patient_spec.rb index 4899e4befb..73b6b5fada 100644 --- a/spec/models/patient_spec.rb +++ b/spec/models/patient_spec.rb @@ -1296,4 +1296,86 @@ end end end + + describe "#latest_pds_search_result" do + subject(:latest_pds_search_result) { patient.latest_pds_search_result } + + let(:patient) { create(:patient) } + + context "with no PDS search results" do + it { should be_nil } + end + + context "with PDS search results but no changeset" do + let(:import) { create(:class_import) } + + before { create(:pds_search_result, patient:, import:) } + + it { should be_nil } + end + + context "with PDS search results and changeset" do + let(:import) { create(:class_import) } + + before do + create( + :patient_changeset, + patient:, + import:, + pds_nhs_number: "9449304130" + ) + create(:pds_search_result, patient:, import:) + end + + it { should eq("9449304130") } + end + end + + describe "#pds_lookup_match?" do + subject(:pds_lookup_match?) { patient.pds_lookup_match? } + + let(:patient) { create(:patient, nhs_number: "9449304130") } + + context "when patient has no NHS number" do + let(:patient) { create(:patient, nhs_number: nil) } + + it { should be(false) } + end + + context "with no PDS search results" do + it { should be(false) } + end + + context "with matching PDS search result" do + let(:import) { create(:class_import) } + + before do + create( + :patient_changeset, + patient:, + import:, + pds_nhs_number: "9449304130" + ) + create(:pds_search_result, patient:, import:) + end + + it { should be(true) } + end + + context "with non-matching PDS search result" do + let(:import) { create(:class_import) } + + before do + create( + :patient_changeset, + patient:, + import:, + pds_nhs_number: "9449310475" + ) + create(:pds_search_result, patient:, import:) + end + + it { should be(false) } + end + end end diff --git a/spec/models/pds_search_result_spec.rb b/spec/models/pds_search_result_spec.rb index 9a6ef10dce..cf2c4d3ff2 100644 --- a/spec/models/pds_search_result_spec.rb +++ b/spec/models/pds_search_result_spec.rb @@ -30,4 +30,141 @@ it { should belong_to(:patient) } it { should belong_to(:import).optional } end + + describe ".grouped_sets" do + subject(:grouped_sets) { described_class.grouped_sets } + + let(:patient) { create(:patient) } + + context "with no records" do + it { should be_empty } + end + + context "with records grouped by import" do + let(:import) { create(:class_import) } + + before do + create(:pds_search_result, patient:, import:) + create(:pds_search_result, patient:, import:) + end + + it "groups records by import" do + expect(grouped_sets.size).to eq(1) + expect(grouped_sets.first.size).to eq(2) + end + end + + context "with records grouped by date" do + before do + travel_to(1.day.ago) do + create(:pds_search_result, patient:, import: nil) + end + create(:pds_search_result, patient:, import: nil) + end + + it "groups records by date when no import" do + expect(grouped_sets.size).to eq(2) + expect(grouped_sets.all? { |set| set.size == 1 }).to be(true) + end + end + end + + describe ".latest_set" do + subject(:latest_set) { described_class.latest_set } + + let(:patient) { create(:patient) } + + context "with no records" do + it { should be_nil } + end + + context "with multiple sets" do + before do + create( + :pds_search_result, + patient:, + import: nil, + created_at: 4.days.ago + ) + create(:pds_search_result, patient:, import: nil, created_at: 1.day.ago) + end + + it "returns the most recent set" do + expect(latest_set.size).to eq(1) + expect(latest_set.first.created_at.to_date).to eq(1.day.ago.to_date) + end + end + end + + describe "#pds_nhs_number" do + subject(:pds_nhs_number) { pds_search_result.pds_nhs_number } + + let(:pds_search_result) { create(:pds_search_result, patient:, import:) } + let(:patient) { create(:patient) } + let(:import) { create(:class_import) } + + context "without a changeset" do + it { should be_nil } + end + + context "with a changeset" do + before do + create( + :patient_changeset, + patient:, + import:, + pds_nhs_number: "9449304130" + ) + end + + it { should eq("9449304130") } + end + end + + describe "#changeset" do + subject(:changeset) { pds_search_result.changeset } + + let(:pds_search_result) { create(:pds_search_result, patient:, import:) } + let(:patient) { create(:patient) } + let(:import) { create(:class_import) } + + context "without import_id" do + let(:pds_search_result) do + create(:pds_search_result, patient:, import: nil) + end + + it { should be_nil } + end + + context "with matching changeset" do + let!(:patient_changeset) { create(:patient_changeset, patient:, import:) } + + it { should eq(patient_changeset) } + end + + context "without matching changeset" do + it { should be_nil } + end + end + + describe "#timeline_item" do + subject(:timeline_item) { pds_search_result.timeline_item } + + let(:pds_search_result) do + create( + :pds_search_result, + step: :fuzzy, + result: :one_match, + nhs_number: "9449304130" + ) + end + + it "returns timeline item hash" do + expect(timeline_item).to include( + is_past_item: true, + heading_text: "Fuzzy search", + description: kind_of(String) + ) + end + end end