AJ/KB Add support for care headers in RSV vaccine

Author: ankur-jain-nhs

.tool-versions

@@ -4,6 +4,7 @@ terraform 1.14.1
 pre-commit 4.5.0
 vale 3.13.0
 nodejs 22.13.1
+gitleaks 8.30.1
 
 # ==============================================================================
 # The section below is reserved for Docker image versions.

src/app/_components/eligibility/RSVEligibilityFallback.test.tsx

@@ -1,14 +1,7 @@
 import { RSVEligibilityFallback } from "@src/app/_components/eligibility/RSVEligibilityFallback";
-import { PharmacyBookingInfo } from "@src/app/_components/nbs/PharmacyBookingInfo";
 import { VaccineType } from "@src/models/vaccine";
 import { render, screen, within } from "@testing-library/react";
 
-jest.mock("@src/app/_components/nbs/PharmacyBookingInfo", () => ({
-  PharmacyBookingInfo: jest
-    .fn()
-    .mockImplementation(() => <p data-testid={"pharmacy-booking-info"}>Pharmacy booking test</p>),
-}));
-
 describe("RSVEligibilityFallback", () => {
   const vaccineType = VaccineType.RSV;
   const howToGetVaccineFallback = <div>How Section styled component</div>;
@@ -25,32 +18,13 @@ describe("RSVEligibilityFallback", () => {
     expect(fallbackBulletPoint2).toBeVisible();
   });
 
-  it("should include Pharmacy booking info for specified vaccine", () => {
-    render(<RSVEligibilityFallback howToGetVaccineFallback={howToGetVaccineFallback} vaccineType={vaccineType} />);
-
-    const pharmacyBookingInfo: HTMLElement = screen.getByTestId("pharmacy-booking-info");
-    expect(pharmacyBookingInfo).toBeVisible();
-
-    expect(PharmacyBookingInfo).toHaveBeenCalledWith(
-      {
-        vaccineType: vaccineType,
-      },
-      undefined,
-    );
-  });
-
-  it("should display 'If this applies' paragraph with provided how-to-get content", async () => {
+  it("should display provided how-to-get content", async () => {
     render(<RSVEligibilityFallback howToGetVaccineFallback={howToGetVaccineFallback} vaccineType={vaccineType} />);
 
     const fallback = screen.getByTestId("elid-fallback");
 
-    const fallbackHeading: HTMLElement = within(fallback).getByRole("heading", {
-      name: "If this applies to you",
-      level: 3,
-    });
     const howToGetContent: HTMLElement = within(fallback).getByText("How Section styled component");
 
-    expect(fallbackHeading).toBeVisible();
     expect(howToGetContent).toBeVisible();
   });
 });

src/app/_components/eligibility/RSVEligibilityFallback.tsx

@@ -1,6 +1,4 @@
-import { PharmacyBookingInfo } from "@src/app/_components/nbs/PharmacyBookingInfo";
 import NonUrgentCareCard from "@src/app/_components/nhs-frontend/NonUrgentCareCard";
-import { HEADINGS } from "@src/app/constants";
 import { VaccineType } from "@src/models/vaccine";
 import React, { JSX } from "react";
 
@@ -21,9 +19,7 @@ const RSVEligibilityFallback = (props: {
           </>
         }
       />
-      <h3>{HEADINGS.IF_THIS_APPLIES}</h3>
       {props.howToGetVaccineFallback}
-      <PharmacyBookingInfo vaccineType={props.vaccineType} />
     </div>
   );
 };

src/app/constants.ts

@@ -11,5 +11,4 @@ export const HEADINGS = {
   HOW_TO_GET_VACCINE: "How to get the vaccine",
   EXTRA_DOSES_SCHEDULE: "Extra doses of the vaccine",
   VACCINE_SIDE_EFFECTS: "Side effects of the vaccine",
-  IF_THIS_APPLIES: "If this applies to you",
 };

src/services/content-api/parsers/content-styling-service.test.tsx

@@ -27,6 +27,10 @@ jest.mock("@project/src/app/_components/markdown/MarkdownWithStyling", () => ({
   MarkdownWithStyling: jest.fn(),
 }));
 
+jest.mock("@src/app/_components/nbs/PharmacyBookingInfo", () => ({
+  PharmacyBookingInfo: () => <div>Pharmacy Booking Info</div>,
+}));
+
 jest.mock("sanitize-data", () => ({ sanitize: jest.fn() }));
 jest.mock("cheerio", () => ({
   load: jest.fn(() => {
@@ -69,7 +73,7 @@ describe("ContentStylingService", () => {
 
   const mockHowToGetMarkdownSubsection: VaccinePageSubsection = {
     type: "simpleElement",
-    text: "<p>para</p><h3>If you're aged 75 to 79</h3><p>para1</p><p>para2</p><h3>If you're pregnant</h3><p>para3</p><p>para4</p>",
+    text: "<p>para</p><h3>If you're aged 75 or over</h3><p>para1</p><p>para2</p><h3>If you live in a care home for older adults</h3><p>para3</p><p>para4</p><h3>If you're pregnant</h3><p>para5</p><p>para6</p>",
     name: "markdown",
     headline: "How To Get Headline",
   };
@@ -347,10 +351,11 @@ describe("ContentStylingService", () => {
       expect(styledVaccineContent.recommendation?.heading).toEqual(mockRecommendation.heading);
       expect(styledVaccineContent.additionalInformation?.heading).toEqual(mockAdditionalInformationSection.headline);
 
-      const expectedRsvHowToGetSection = "<div><p>para1</p><p>para2</p></div>";
-      const expectedRsvPregnancyHowToGetSection = `<div><div><p>para3</p><p>para4</p></div></div>`;
+      const expectedRsvHowToGetSection =
+        "<div><div><h3>If you're aged 75 or over</h3><p>para1</p><p>para2</p></div><div>Pharmacy Booking Info</div><div><h3>If you live in a care home for older adults</h3><p>para3</p><p>para4</p></div></div>";
+      const expectedRsvPregnancyHowToGetSection = `<div><div><p>para5</p><p>para6</p></div></div>`;
       const expectedGenericVaccineHowToGetSection =
-        "<div class=\"zeroMarginBottom\"><h3>How To Get Headline</h3><p>para</p><h3>If you're aged 75 to 79</h3><p>para1</p><p>para2</p><h3>If you're pregnant</h3><p>para3</p><p>para4</p></div>";
+        "<div class=\"zeroMarginBottom\"><h3>How To Get Headline</h3><p>para</p><h3>If you're aged 75 or over</h3><p>para1</p><p>para2</p><h3>If you live in a care home for older adults</h3><p>para3</p><p>para4</p><h3>If you're pregnant</h3><p>para5</p><p>para6</p></div>";
       const { container } = render(styledVaccineContent.howToGetVaccine.component);
       if (vaccine === VaccineType.RSV) {
         expect(container).toContainHTML(expectedRsvHowToGetSection);

src/services/content-api/parsers/custom/both.test.tsx

@@ -6,6 +6,9 @@ import { render } from "@testing-library/react";
 import React from "react";
 
 const mockNBSBookingActionHTML = "NBS Booking Link Test";
+jest.mock("@src/app/_components/nbs/PharmacyBookingInfo", () => ({
+  PharmacyBookingInfo: () => <p data-testid="pharmacy-booking-info">test</p>,
+}));
 jest.mock("@src/app/_components/nbs/NBSBookingAction", () => ({
   NBSBookingAction: () => mockNBSBookingActionHTML,
 }));
@@ -26,14 +29,7 @@ const mockRsvInPregnancySubsection: VaccinePageSubsection = {
 
 const mockRsvForOlderAdultsSubsection: VaccinePageSubsection = {
   type: "simpleElement",
-  text: "<h3>If you're aged 75 to 79</h3><p>Paragraph 1</p><p>Paragraph 2</p>",
-  headline: "",
-  name: "",
-};
-
-const mockRsvForOlderAdultsNewerSubsection: VaccinePageSubsection = {
-  type: "simpleElement",
-  text: "<h3>If you're aged 75 to 79 (or turned 80 after 1 September 2024)</h3><p>Paragraph 1</p><p>Paragraph 2</p>",
+  text: "<h3>If you're aged 75 or over</h3><p>Paragraph 1</p><p>Paragraph 2</p><h3>If you live in a care home for older adults</h3><p>Paragraph 3</p><p>Paragraph 4</p>",
   headline: "",
   name: "",
 };
@@ -63,12 +59,9 @@ describe("styleHowToGetSubsection for rsv in older adults", () => {
 
   it("renders HTML if subsection contains rsv for older adults", () => {
     const { container } = render(<>{styleHowToGetSubsectionForRsv(mockRsvForOlderAdultsSubsection, 0, false)}</>);
-    expect(container.innerHTML).toBe("<div><p>Paragraph 1</p><p>Paragraph 2</p></div>");
-  });
-
-  it("renders HTML if newer subsection contains rsv for older adults", () => {
-    const { container } = render(<>{styleHowToGetSubsectionForRsv(mockRsvForOlderAdultsNewerSubsection, 0, false)}</>);
-    expect(container.innerHTML).toBe("<div><p>Paragraph 1</p><p>Paragraph 2</p></div>");
+    expect(container.innerHTML).toBe(
+      '<div><div><h3>If you\'re aged 75 or over</h3><p>Paragraph 1</p><p>Paragraph 2</p></div><p data-testid="pharmacy-booking-info">test</p><div><h3>If you live in a care home for older adults</h3><p>Paragraph 3</p><p>Paragraph 4</p></div></div>',
+    );
   });
 });
 

src/services/content-api/parsers/custom/rsv.tsx

@@ -1,3 +1,5 @@
+import { PharmacyBookingInfo } from "@src/app/_components/nbs/PharmacyBookingInfo";
+import { VaccineType } from "@src/models/vaccine";
 import { ContentParsingError } from "@src/services/content-api/parsers/custom/exceptions";
 import type { StyledPageSection, VaccinePageSection, VaccinePageSubsection } from "@src/services/content-api/types";
 import { logger } from "@src/utils/logger";
@@ -7,9 +9,9 @@ import React from "react";
 
 const log: Logger = logger.child({ module: "services-content-api-parsers-custom-rsv" });
 
-const olderAdultsRegExp: RegExp =
-  /<h3>If you're aged \d+ to \d+(?: \(or turned \d+ after .*\))?<\/h3>((?:\s*<p>.*?<\/p>)+)/i;
-const paragraphsRegExp: RegExp = /<p>.*?<\/p>/g;
+const olderAdultsRegExp: RegExp = /<h3>If you're aged \d+ or over<\/h3>((?:\s*<p>.*?<\/p>)+)/i;
+const olderAdultsInCareHomeRegExp: RegExp =
+  /<h3>If you live in a care home for older adults<\/h3>((?:\s*<p>.*?<\/p>)+)/i;
 
 export const styleHowToGetSubsection = (subsection: VaccinePageSubsection, index: number, fragile: boolean) => {
   if (subsection.type !== "simpleElement") {
@@ -31,26 +33,33 @@ export const styleHowToGetSubsection = (subsection: VaccinePageSubsection, index
     }
   }
 
-  const paragraphsMatches = olderAdultsMatches[1].match(paragraphsRegExp);
-  if (!paragraphsMatches) {
+  const olderAdultsInCareHomeMatches = olderAdultsInCareHomeRegExp.exec(subsection.text);
+  if (!olderAdultsInCareHomeMatches) {
     log.warn(
-      { context: { text: olderAdultsMatches[1] } },
-      "HowToGetSubsection paragraph not found - has the content changed?",
+      { context: { text: subsection.text } },
+      "HowToGetSubsection care home header not found - has the content changed?",
     );
     if (fragile) {
-      throw new ContentParsingError("HowToGetSubsection paragraph not found - has the content changed?");
+      throw new ContentParsingError("HowToGetSubsection care home header not found - has the content changed?");
     } else {
       return <></>;
     }
   }
 
   return (
-    <div
-      key={index}
-      dangerouslySetInnerHTML={{
-        __html: sanitiseHtml(paragraphsMatches.join("")),
-      }}
-    />
+    <div key={index}>
+      <div
+        dangerouslySetInnerHTML={{
+          __html: sanitiseHtml(olderAdultsMatches[0]),
+        }}
+      />
+      <PharmacyBookingInfo vaccineType={VaccineType.RSV} />
+      <div
+        dangerouslySetInnerHTML={{
+          __html: sanitiseHtml(olderAdultsInCareHomeMatches[0]),
+        }}
+      />
+    </div>
   );
 };
 

wiremock/__files/rsv-vaccine.json

@@ -281,7 +281,7 @@
         {
           "position": 0,
           "identifier": "1",
-          "text": "<p>There are different ways to get the RSV vaccine.</p><h3>If you're pregnant</h3><p>You should be offered the RSV vaccine around the time of your 28-week antenatal appointment.</p><p>Getting vaccinated as soon as possible from 28 weeks will provide the best protection for your baby. But the vaccine can be given later if needed, including up until you go into labour.</p><p>Speak to your maternity service or GP surgery if you're 28 weeks pregnant or more and have not been offered the vaccine.</p><h3>If you're aged 75 to 79 (or turned 80 after 1 September 2024)</h3><p>If you're aged 75 to 79 (or turned 80 after 1 September 2024) contact your GP surgery to book your RSV vaccination.</p><p>Your GP surgery may contact you about getting the RSV vaccine. This may be by letter, text, phone call or email.</p><p>You do not need to wait to be contacted before booking your vaccination.</p>",
+          "text": "<p>There are different ways to get the RSV vaccine.</p><h3>If you're pregnant</h3><p>You should be offered the RSV vaccine around the time of your 28-week antenatal appointment.</p><p>Getting vaccinated as soon as possible from 28 weeks will provide the best protection for your baby. But the vaccine can be given later if needed, including up until you go into labour.</p><p>Speak to your maternity service or GP surgery if you're 28 weeks pregnant or more and have not been offered the vaccine.</p><h3>If you're aged 75 or over</h3><p>Contact your GP surgery to book your RSV vaccination.</p><p>Your GP surgery may contact you about getting the RSV vaccine. This may be by letter, text, phone call or email.</p><p>You do not need to wait to be contacted before booking your vaccination.</p><h3>If you live in a care home for older adults</h3><p>Speak to a member of staff at your care home or your GP surgery about how to get the RSV vaccine.</p><p>Your GP surgery may contact you about getting the RSV vaccine. This may be by letter, text, phone call or email.</p>",
           "@type": "WebPageElement",
           "name": "markdown",
           "headline": ""