VIA-629 SB Make buildFilteredContentForCovid19Vaccine async, so we can get config in there, plus fallout.

Author: acerathereinspirative-nhs-nvir

src/_lambda/content-cache-hydrator/handler.ts

@@ -67,7 +67,7 @@ async function hydrateCacheForVaccine(
         return delayMillis;
       },
     });
-    const filteredContent: VaccinePageContent = getFilteredContentForVaccine(vaccineType, content);
+    const filteredContent: VaccinePageContent = await getFilteredContentForVaccine(vaccineType, content);
 
     if (!approvalEnabled) {
       await checkContentPassesStylingAndWriteToCache(vaccineType, content, filteredContent);
@@ -96,7 +96,10 @@ async function hydrateCacheForVaccine(
 
     if (cacheStatus === "valid") {
       if (
-        vitaContentChangedSinceLastApproved(filteredContent, getFilteredContentForVaccine(vaccineType, cacheContent))
+        vitaContentChangedSinceLastApproved(
+          filteredContent,
+          await getFilteredContentForVaccine(vaccineType, cacheContent),
+        )
       ) {
         log.info(
           { context: { vaccineType } },

src/services/content-api/content-service.ts

@@ -29,7 +29,7 @@ const getContentForVaccine = async (vaccineType: VaccineType): Promise<GetConten
     const vaccineContent = await readContentFromCache(cachePath, vaccineCacheFilename, vaccineType);
 
     // filter and style content
-    const filteredContent: VaccinePageContent = getFilteredContentForVaccine(vaccineType, vaccineContent);
+    const filteredContent: VaccinePageContent = await getFilteredContentForVaccine(vaccineType, vaccineContent);
     const styledVaccineContent: StyledVaccineContent = await getStyledContentForVaccine(
       vaccineType,
       filteredContent,

src/services/content-api/parsers/content-filter-service.test.ts

@@ -547,15 +547,15 @@ describe("Content Filter", () => {
           overview: { content: "Generic Vaccine Lead Paragraph (overview)", containsHtml: false },
         };
 
-        const pageCopyForRsv = getFilteredContentForVaccine(
+        const pageCopyForRsv = await getFilteredContentForVaccine(
           VaccineType.RSV,
           JSON.stringify(genericVaccineContentAPIResponse),
         );
 
         expect(pageCopyForRsv).toEqual(expect.objectContaining(expectedOverview));
       });
 
-      it("should return all parts for whatVaccineIsFor section", () => {
+      it("should return all parts for whatVaccineIsFor section", async () => {
         const expectedWhatVaccineIsFor = {
           whatVaccineIsFor: {
             headline: "Benefits Health Aspect headline",
@@ -570,15 +570,15 @@ describe("Content Filter", () => {
           },
         };
 
-        const pageCopyForRsv = getFilteredContentForVaccine(
+        const pageCopyForRsv = await getFilteredContentForVaccine(
           VaccineType.RSV,
           JSON.stringify(genericVaccineContentAPIResponse),
         );
 
         expect(pageCopyForRsv).toEqual(expect.objectContaining(expectedWhatVaccineIsFor));
       });
 
-      it("should return all parts for whoVaccineIsFor section", () => {
+      it("should return all parts for whoVaccineIsFor section", async () => {
         const expectedWhoVaccineIsFor = {
           whoVaccineIsFor: {
             headline: "Suitability Health Aspect headline",
@@ -617,15 +617,15 @@ describe("Content Filter", () => {
           },
         };
 
-        const pageCopyForRsv = getFilteredContentForVaccine(
+        const pageCopyForRsv = await getFilteredContentForVaccine(
           VaccineType.RSV,
           JSON.stringify(genericVaccineContentAPIResponse),
         );
 
         expect(pageCopyForRsv).toEqual(expect.objectContaining(expectedWhoVaccineIsFor));
       });
 
-      it("should return all parts for howToGetVaccine section", () => {
+      it("should return all parts for howToGetVaccine section", async () => {
         const expectedHowToGetVaccine = {
           howToGetVaccine: {
             headline: "Getting Access Health Aspect headline",
@@ -646,15 +646,15 @@ describe("Content Filter", () => {
           },
         };
 
-        const pageCopyForRsv = getFilteredContentForVaccine(
+        const pageCopyForRsv = await getFilteredContentForVaccine(
           VaccineType.RSV,
           JSON.stringify(genericVaccineContentAPIResponse),
         );
 
         expect(pageCopyForRsv).toEqual(expect.objectContaining(expectedHowToGetVaccine));
       });
 
-      it("should return all parts for vaccineSideEffects section", () => {
+      it("should return all parts for vaccineSideEffects section", async () => {
         const expectedVaccineSideEffects: VaccinePageSection = {
           headline: "Side effects of the generic vaccine",
           subsections: [
@@ -679,57 +679,57 @@ describe("Content Filter", () => {
           ],
         };
 
-        const pageCopyForRsv: VaccinePageContent = getFilteredContentForVaccine(
+        const pageCopyForRsv: VaccinePageContent = await getFilteredContentForVaccine(
           VaccineType.RSV,
           JSON.stringify(genericVaccineContentAPIResponse),
         );
 
         expect(pageCopyForRsv.vaccineSideEffects).toEqual(expectedVaccineSideEffects);
       });
 
-      it("should include nhs webpage link to vaccine info", () => {
+      it("should include nhs webpage link to vaccine info", async () => {
         const expectedWebpageLink = {
           webpageLink: new URL("https://www.nhs.uk/vaccinations/generic-vaccine/"),
         };
 
-        const pageCopyForRsv = getFilteredContentForVaccine(
+        const pageCopyForRsv = await getFilteredContentForVaccine(
           VaccineType.RSV,
           JSON.stringify(genericVaccineContentAPIResponse),
         );
 
         expect(pageCopyForRsv).toEqual(expect.objectContaining(expectedWebpageLink));
       });
 
-      it("should not return whatVaccineIsFor section when BenefitsHealthAspect is missing", () => {
+      it("should not return whatVaccineIsFor section when BenefitsHealthAspect is missing", async () => {
         const responseWithoutBenefitsHealthAspect = contentWithoutBenefitsHealthAspect();
 
-        const pageCopyForFlu: VaccinePageContent = getFilteredContentForVaccine(
+        const pageCopyForFlu: VaccinePageContent = await getFilteredContentForVaccine(
           VaccineType.RSV,
           JSON.stringify(responseWithoutBenefitsHealthAspect),
         );
 
         expect(pageCopyForFlu.whatVaccineIsFor).toBeUndefined();
       });
 
-      it("should return all parts for callout section", () => {
+      it("should return all parts for callout section", async () => {
         const expectedCallout: HeadingWithTypedContent = {
           heading: "Callout heading",
           content: "<p>Callout content</p>",
           contentType: "html",
         };
 
-        const pageCopyForRsv: VaccinePageContent = getFilteredContentForVaccine(
+        const pageCopyForRsv: VaccinePageContent = await getFilteredContentForVaccine(
           VaccineType.RSV,
           JSON.stringify(genericVaccineContentAPIResponse),
         );
 
         expect(pageCopyForRsv.callout).toEqual(expectedCallout);
       });
 
-      it("should not return callout section when Callout is missing", () => {
+      it("should not return callout section when Callout is missing", async () => {
         const responseWithoutCallout = contentWithoutCallout();
 
-        const pageCopyForFlu: VaccinePageContent = getFilteredContentForVaccine(
+        const pageCopyForFlu: VaccinePageContent = await getFilteredContentForVaccine(
           VaccineType.RSV,
           JSON.stringify(responseWithoutCallout),
         );
@@ -739,49 +739,49 @@ describe("Content Filter", () => {
     });
 
     describe("for specific vaccines", () => {
-      it("should call getFilteredContentForWhoopingCoughVaccine for whooping cough vaccine", () => {
+      it("should call getFilteredContentForWhoopingCoughVaccine for whooping cough vaccine", async () => {
         const mockApiContent = "testContent";
 
-        getFilteredContentForVaccine(VaccineType.WHOOPING_COUGH, mockApiContent);
+        await getFilteredContentForVaccine(VaccineType.WHOOPING_COUGH, mockApiContent);
 
         expect(buildFilteredContentForWhoopingCoughVaccine).toHaveBeenCalledWith(mockApiContent);
       });
 
-      it("should call getFilteredContentForFluVaccine for flu vaccine", () => {
+      it("should call getFilteredContentForFluVaccine for flu vaccine", async () => {
         const mockApiContent = "testContent";
 
-        getFilteredContentForVaccine(VaccineType.FLU_FOR_ADULTS, mockApiContent);
+        await getFilteredContentForVaccine(VaccineType.FLU_FOR_ADULTS, mockApiContent);
 
         expect(buildFilteredContentForFluVaccine).toHaveBeenCalledWith(mockApiContent);
       });
 
-      it("should call getFilteredContentForFluInPregnancyVaccine for flu in pregnancy vaccine", () => {
+      it("should call getFilteredContentForFluInPregnancyVaccine for flu in pregnancy vaccine", async () => {
         const mockApiContent = "testContent";
 
-        getFilteredContentForVaccine(VaccineType.FLU_IN_PREGNANCY, mockApiContent);
+        await getFilteredContentForVaccine(VaccineType.FLU_IN_PREGNANCY, mockApiContent);
 
         expect(buildFilteredContentForFluInPregnancyVaccine).toHaveBeenCalledWith(mockApiContent);
       });
 
-      it("should call getFilteredContentForFluForChildrenVaccine for flu for children vaccine", () => {
+      it("should call getFilteredContentForFluForChildrenVaccine for flu for children vaccine", async () => {
         const mockApiContent = "testContent";
 
-        getFilteredContentForVaccine(VaccineType.FLU_FOR_CHILDREN, mockApiContent);
+        await getFilteredContentForVaccine(VaccineType.FLU_FOR_CHILDREN, mockApiContent);
 
         expect(buildFilteredContentForFluForChildrenVaccine).toHaveBeenCalledWith(mockApiContent);
       });
 
-      it("should return standard vaccine content and recommendation for school aged children's flu vaccine", () => {
+      it("should return standard vaccine content and recommendation for school aged children's flu vaccine", async () => {
         const mockApiContent = "testContent";
 
-        getFilteredContentForVaccine(VaccineType.FLU_FOR_SCHOOL_AGED_CHILDREN, mockApiContent);
+        await getFilteredContentForVaccine(VaccineType.FLU_FOR_SCHOOL_AGED_CHILDREN, mockApiContent);
         expect(buildFilteredContentForFluForSchoolAgedChildrenVaccine).toHaveBeenCalledWith(mockApiContent);
       });
 
-      it("should call buildFilteredContentForCovid19Vaccine for flu in pregnancy vaccine", () => {
+      it("should call buildFilteredContentForCovid19Vaccine for flu in pregnancy vaccine", async () => {
         const mockApiContent = "testContent";
 
-        getFilteredContentForVaccine(VaccineType.COVID_19, mockApiContent);
+        await getFilteredContentForVaccine(VaccineType.COVID_19, mockApiContent);
 
         expect(buildFilteredContentForCovid19Vaccine).toHaveBeenCalledWith(mockApiContent);
       });

src/services/content-api/parsers/content-filter-service.ts

@@ -209,7 +209,10 @@ function _extractHeadlineForContraindicationsAspect(content: ContentApiVaccineRe
   ];
 }
 
-const getFilteredContentForVaccine = (vaccineType: VaccineType, apiContent: string): VaccinePageContent => {
+const getFilteredContentForVaccine = async (
+  vaccineType: VaccineType,
+  apiContent: string,
+): Promise<VaccinePageContent> => {
   const filteredContentBuilders = new Map([
     [VaccineType.WHOOPING_COUGH, buildFilteredContentForWhoopingCoughVaccine],
     [VaccineType.FLU_IN_PREGNANCY, buildFilteredContentForFluInPregnancyVaccine],
@@ -219,10 +222,10 @@ const getFilteredContentForVaccine = (vaccineType: VaccineType, apiContent: stri
     [VaccineType.COVID_19, buildFilteredContentForCovid19Vaccine],
   ]);
   const filteredContentBuilder = filteredContentBuilders.get(vaccineType) || buildFilteredContentForStandardVaccine;
-  return filteredContentBuilder(apiContent);
+  return await filteredContentBuilder(apiContent);
 };
 
-const buildFilteredContentForStandardVaccine = (apiContent: string): VaccinePageContent => {
+const buildFilteredContentForStandardVaccine = async (apiContent: string): Promise<VaccinePageContent> => {
   const content: ContentApiVaccineResponse = JSON.parse(apiContent);
 
   const overview: Overview = { content: _extractDescriptionForVaccine(content, "lead paragraph"), containsHtml: false };

src/services/content-api/parsers/custom/covid-19.tsx

@@ -10,7 +10,7 @@ const log: Logger = logger.child({ module: "covid-19" });
 export const buildFilteredContentForCovid19Vaccine = async (apiContent: string): Promise<VaccinePageContent> => {
   const campaigns = await config.CAMPAIGNS;
 
-  const standardFilteredContent = buildFilteredContentForStandardVaccine(apiContent);
+  const standardFilteredContent = await buildFilteredContentForStandardVaccine(apiContent);
 
   let callout: HeadingWithTypedContent | undefined;
   if (campaigns.isActive(VaccineType.COVID_19)) {

src/services/content-api/parsers/custom/flu-for-children.test.tsx

@@ -9,12 +9,14 @@ describe("getFilteredContentForFluVaccine", () => {
       overview: { content: "Generic Vaccine Lead Paragraph (overview)", containsHtml: false },
     };
 
-    const pageCopy = buildFilteredContentForFluForChildrenVaccine(JSON.stringify(genericVaccineContentAPIResponse));
+    const pageCopy = await buildFilteredContentForFluForChildrenVaccine(
+      JSON.stringify(genericVaccineContentAPIResponse),
+    );
 
     expect(pageCopy).toEqual(expect.objectContaining(expectedOverview));
   });
 
-  it("should return warning callout", () => {
+  it("should return warning callout", async () => {
     const expected = {
       callout: {
         heading: "Booking service closed",
@@ -23,20 +25,24 @@ describe("getFilteredContentForFluVaccine", () => {
       },
     };
 
-    const pageCopy = buildFilteredContentForFluForChildrenVaccine(JSON.stringify(genericVaccineContentAPIResponse));
+    const pageCopy = await buildFilteredContentForFluForChildrenVaccine(
+      JSON.stringify(genericVaccineContentAPIResponse),
+    );
 
     expect(pageCopy).toEqual(expect.objectContaining(expected));
   });
 
-  it("should return recommendation", () => {
+  it("should return recommendation", async () => {
     const expected = {
       recommendation: {
         heading: "The flu vaccine is recommended for children who:",
         content: "* are aged 2 or 3 years (born between September 2021 and 31 August 2023)",
       },
     };
 
-    const pageCopy = buildFilteredContentForFluForChildrenVaccine(JSON.stringify(genericVaccineContentAPIResponse));
+    const pageCopy = await buildFilteredContentForFluForChildrenVaccine(
+      JSON.stringify(genericVaccineContentAPIResponse),
+    );
 
     expect(pageCopy).toEqual(expect.objectContaining(expected));
   });

src/services/content-api/parsers/custom/flu-for-children.tsx

@@ -1,8 +1,8 @@
 import { buildFilteredContentForStandardVaccine } from "@src/services/content-api/parsers/content-filter-service";
 import { HeadingWithContent, HeadingWithTypedContent, VaccinePageContent } from "@src/services/content-api/types";
 
-export const buildFilteredContentForFluForChildrenVaccine = (apiContent: string): VaccinePageContent => {
-  const standardFilteredContent = buildFilteredContentForStandardVaccine(apiContent);
+export const buildFilteredContentForFluForChildrenVaccine = async (apiContent: string): Promise<VaccinePageContent> => {
+  const standardFilteredContent = await buildFilteredContentForStandardVaccine(apiContent);
 
   const callout: HeadingWithTypedContent = {
     heading: "Booking service closed",

src/services/content-api/parsers/custom/flu-for-school-aged-children.test.tsx

@@ -41,15 +41,15 @@ describe("buildFilteredContentForFluForSchoolAgedChildrenVaccine", () => {
       overview: { content: "Generic Vaccine Lead Paragraph (overview)", containsHtml: false },
     };
 
-    const pageCopy = buildFilteredContentForFluForSchoolAgedChildrenVaccine(
+    const pageCopy = await buildFilteredContentForFluForSchoolAgedChildrenVaccine(
       JSON.stringify(genericVaccineContentAPIResponse),
     );
 
     expect(pageCopy).toEqual(expect.objectContaining(expectedOverview));
   });
 
   it("should set the standard vaccine content", async () => {
-    const pageCopy = buildFilteredContentForFluForSchoolAgedChildrenVaccine(
+    const pageCopy = await buildFilteredContentForFluForSchoolAgedChildrenVaccine(
       JSON.stringify(genericVaccineContentAPIResponse),
     );
 
@@ -60,30 +60,30 @@ describe("buildFilteredContentForFluForSchoolAgedChildrenVaccine", () => {
     expect(pageCopy.webpageLink).toBeDefined();
   });
 
-  it("should return recommendation", () => {
+  it("should return recommendation", async () => {
     const expected = {
       recommendation: {
         heading: "The flu vaccine is recommended for children who:",
         content: "* are of school age (Reception to Year 1)",
       },
     };
 
-    const pageCopy = buildFilteredContentForFluForSchoolAgedChildrenVaccine(
+    const pageCopy = await buildFilteredContentForFluForSchoolAgedChildrenVaccine(
       JSON.stringify(genericVaccineContentAPIResponse),
     );
 
     expect(pageCopy).toEqual(expect.objectContaining(expected));
   });
 
-  it("should return overviewConclusion", () => {
+  it("should return overviewConclusion", async () => {
     const expected = {
       overviewConclusion: {
         content: '<h2 class="nhsuk-heading-m">How to get the vaccine</h2><p>School age how-to-get</p>',
         containsHtml: true,
       },
     };
 
-    const pageCopy = buildFilteredContentForFluForSchoolAgedChildrenVaccine(
+    const pageCopy = await buildFilteredContentForFluForSchoolAgedChildrenVaccine(
       JSON.stringify(childFluVaccineContentAPIResponse),
     );
 

src/services/content-api/parsers/custom/flu-for-school-aged-children.tsx

@@ -1,8 +1,10 @@
 import { buildFilteredContentForStandardVaccine } from "@src/services/content-api/parsers/content-filter-service";
 import { ExpanderSubsection, HeadingWithContent, VaccinePageContent } from "@src/services/content-api/types";
 
-export const buildFilteredContentForFluForSchoolAgedChildrenVaccine = (apiContent: string): VaccinePageContent => {
-  const standardFilteredContent = buildFilteredContentForStandardVaccine(apiContent);
+export const buildFilteredContentForFluForSchoolAgedChildrenVaccine = async (
+  apiContent: string,
+): Promise<VaccinePageContent> => {
+  const standardFilteredContent = await buildFilteredContentForStandardVaccine(apiContent);
 
   const schoolAgeHowToGet = standardFilteredContent.howToGetVaccine.subsections.find(
     (subsection) => subsection.type == "expanderElement" && subsection.headline.startsWith("School"),