Chore: [AEA-4156] - Address Sonar issues (#1929)

## Summary

- Routine Change

### Details

Clearing out the issues listed in
[Sonar](https://sonarcloud.io/project/issues?impactSoftwareQualities=SECURITY&issueStatuses=OPEN%2CCONFIRMED&id=NHSDigital_prescriptionsforpatients)

Author: wildjames

packages/capabilityStatement/tests/test-handler.test.ts

@@ -1,9 +1,15 @@
+import {expect, describe, it} from "@jest/globals"
+
 import {APIGatewayProxyEvent, APIGatewayProxyResult} from "aws-lambda"
+
 import {handler} from "../src/capabilityStatement"
-import {expect, describe, it} from "@jest/globals"
-import {helloworldContext} from "@prescriptionsforpatients_common/testing"
 import capabilityStatement from "../examples/CapabilityStatement/apim-medicines-prescriptionsforpatients.json"
-import {mockAPIGatewayProxyEvent, test_append_trace_ids, test_mime_type} from "@prescriptionsforpatients_common/testing"
+import {
+  mockAPIGatewayProxyEvent,
+  helloworldContext,
+  test_append_trace_ids,
+  test_mime_type
+} from "@prescriptionsforpatients_common/testing"
 
 const dummyContext = helloworldContext
 const mockEvent: APIGatewayProxyEvent = mockAPIGatewayProxyEvent

packages/distanceSelling/src/distanceSelling.ts

@@ -111,9 +111,8 @@ export class DistanceSelling {
   }
 
   addToTelecom(url: string, organisation: Organization) {
-    if (!organisation.telecom) {
-      organisation.telecom = []
-    }
+    organisation.telecom ??= []
+
     const urlEntryAbsent: boolean = organisation.telecom.filter(entry => entry.system === "url").length === 0
     if (urlEntryAbsent) {
       const telecom: ContactPoint = {system: "url", use: "work", value: url}

packages/enrichPrescriptions/src/enrichPrescriptions.ts

@@ -1,9 +1,11 @@
 import {Logger} from "@aws-lambda-powertools/logger"
 import {injectLambdaContext} from "@aws-lambda-powertools/logger/middleware"
 import {LogLevel} from "@aws-lambda-powertools/logger/types"
+
 import middy from "@middy/core"
 import inputOutputLogger from "@middy/input-output-logger"
 import {Bundle} from "fhir/r4"
+
 import {
   StatusUpdateRequest,
   StatusUpdates,
@@ -41,13 +43,12 @@ export async function lambdaHandler(event: EnrichPrescriptionsEvent) {
   switch (updatesScenario) {
     case UpdatesScenario.Present: {
       logger.info("Applying status updates.")
-      applyStatusUpdates(searchsetBundle, statusUpdates!)
+      applyStatusUpdates(logger, searchsetBundle, statusUpdates!)
       break
     }
     case UpdatesScenario.ExpectedButAbsent: {
       logger.info("Call to get status updates was unsuccessful. Applying temporary status updates.")
-      const statusUpdateRequest = event.statusUpdateData!
-      applyTemporaryStatusUpdates(searchsetBundle, statusUpdateRequest)
+      applyTemporaryStatusUpdates(logger, searchsetBundle, event.statusUpdateData)
       break
     }
     default: {

packages/enrichPrescriptions/src/fhirUtils.ts

@@ -48,7 +48,7 @@ export function isolatePerformerReference(medicationRequests: Array<MedicationRe
 }
 
 export function isolatePerformerOrganisation(reference: string, prescription: Bundle): Organization {
-  const filter = (entry: Entry) => entry.fullUrl! === reference
+  const filter = (entry: Entry) => (!!entry.fullUrl && entry.fullUrl === reference)
   return filterAndTypeBundleEntries<Organization>(prescription, filter)[0]
 }
 

packages/enrichPrescriptions/src/statusUpdates.ts

@@ -1,12 +1,14 @@
+import {Logger} from "@aws-lambda-powertools/logger"
+
 import {Bundle, Extension, MedicationRequest} from "fhir/r4"
 import moment, {Moment} from "moment"
+
 import {
   isolateMedicationRequests,
   isolatePerformerOrganisation,
   isolatePerformerReference,
   isolatePrescriptions
 } from "./fhirUtils"
-import {logger} from "./enrichPrescriptions"
 
 export const EXTENSION_URL = "https://fhir.nhs.uk/StructureDefinition/Extension-DM-PrescriptionStatusHistory"
 export const VALUE_CODING_SYSTEM = "https://fhir.nhs.uk/CodeSystem/task-businessStatus-nppt"
@@ -71,7 +73,7 @@ function determineStatus(updateItem: UpdateItem): MedicationRequestStatus {
   return updatedOverSevenDaysAgo ? "completed" : "active"
 }
 
-function updateMedicationRequest(medicationRequest: MedicationRequest, updateItem: UpdateItem) {
+function updateMedicationRequest(logger: Logger, medicationRequest: MedicationRequest, updateItem: UpdateItem) {
   const status = determineStatus(updateItem)
   const relevantExtension = medicationRequest.extension?.find((ext) => ext.url === EXTENSION_URL)
   const statusCoding = relevantExtension?.extension?.find((innerExt) => innerExt.url === "status")?.valueCoding?.code
@@ -135,7 +137,7 @@ function statusHistoryExtensionReplacementIndex(medicationRequest: MedicationReq
   })
 }
 
-export function applyStatusUpdates(searchsetBundle: Bundle, statusUpdates: StatusUpdates) {
+export function applyStatusUpdates(logger: Logger, searchsetBundle: Bundle, statusUpdates: StatusUpdates) {
   isolatePrescriptions(searchsetBundle).forEach((prescription) => {
     const medicationRequests = isolateMedicationRequests(prescription)
     const prescriptionID = medicationRequests![0].groupIdentifier!.value!.toUpperCase()
@@ -150,8 +152,8 @@ export function applyStatusUpdates(searchsetBundle: Bundle, statusUpdates: Statu
 
     logger.info(`Applying updates for prescription ${prescriptionID}.`)
 
-    const prescriptionUpdate = statusUpdates.prescriptions.filter((p) => p.prescriptionID === prescriptionID)[0]
-    if (!prescriptionUpdate || !prescriptionUpdate.onboarded) {
+    const prescriptionUpdate = statusUpdates.prescriptions.find(p => p.prescriptionID === prescriptionID)
+    if (!prescriptionUpdate?.onboarded) {
       logger.info(`Supplier of prescription ${prescriptionID} not onboarded. Applying default updates.`)
       medicationRequests?.forEach((medicationRequest) => {
         if (delayWithPharmacyStatus(medicationRequest)) {
@@ -169,10 +171,10 @@ export function applyStatusUpdates(searchsetBundle: Bundle, statusUpdates: Statu
             lastUpdateDateTime: moment().utc().toISOString(),
             latestStatus: APPROVED_STATUS
           }
-          updateMedicationRequest(medicationRequest, update)
+          updateMedicationRequest(logger, medicationRequest, update)
           return
         }
-        updateMedicationRequest(medicationRequest, defaultUpdate(false))
+        updateMedicationRequest(logger, medicationRequest, defaultUpdate(false))
       })
       return
     }
@@ -184,10 +186,10 @@ export function applyStatusUpdates(searchsetBundle: Bundle, statusUpdates: Statu
       const itemUpdates = prescriptionUpdate.items.filter((item) => item.itemId === medicationRequestID)
       if (itemUpdates.length > 0) {
         logger.info(`Update found for MedicationRequest with id ${medicationRequestID}. Applying.`)
-        updateMedicationRequest(medicationRequest, itemUpdates[0])
+        updateMedicationRequest(logger, medicationRequest, itemUpdates[0])
       } else {
         logger.info(`No update found for MedicationRequest with id ${medicationRequestID}. Applying default.`)
-        updateMedicationRequest(medicationRequest, defaultUpdate())
+        updateMedicationRequest(logger, medicationRequest, defaultUpdate())
       }
     })
   })
@@ -249,7 +251,11 @@ export function getUpdatesScenario(statusUpdates: StatusUpdates | undefined): Up
   return UpdatesScenario.NotExpected
 }
 
-export function applyTemporaryStatusUpdates(searchsetBundle: Bundle, statusUpdateRequest: StatusUpdateRequest) {
+export function applyTemporaryStatusUpdates(
+  logger: Logger,
+  searchsetBundle: Bundle,
+  statusUpdateRequest: StatusUpdateRequest
+) {
   const update: UpdateItem = {
     isTerminalState: false,
     lastUpdateDateTime: moment().utc().toISOString(),
@@ -269,7 +275,7 @@ export function applyTemporaryStatusUpdates(searchsetBundle: Bundle, statusUpdat
       )
       if (updates.length > 0) {
         logger.info(`Updates expected for medication requests in prescription ${prescriptionID}. Applying temporary.`)
-        medicationRequests?.forEach((medicationRequest) => updateMedicationRequest(medicationRequest, update))
+        medicationRequests?.forEach((medicationRequest) => updateMedicationRequest(logger, medicationRequest, update))
       }
     }
   })

packages/enrichPrescriptions/tests/testFhirUtils.test.ts

@@ -9,8 +9,8 @@ describe("Unit tests for fhirUtils", function () {
     const searchsetBundle = richRequestBundle()
     const result = isolatePrescriptions(searchsetBundle)
 
-    expect(result!.length).toEqual(3)
-    result!.forEach(r =>
+    expect(result.length).toEqual(3)
+    result.forEach(r =>
       expect(r.resourceType).toEqual("Bundle")
     )
   })

packages/enrichPrescriptions/tests/testStatusUpdate.test.ts

@@ -40,8 +40,11 @@ import {Logger} from "@aws-lambda-powertools/logger"
 import {isolateMedicationRequests, isolatePrescriptions} from "../src/fhirUtils"
 
 describe("Unit tests for statusUpdate", function () {
+  let logger: Logger
+
   beforeEach(() => {
     jest.useFakeTimers().setSystemTime(SYSTEM_DATETIME)
+    logger = new Logger({serviceName: "testStatusUpdate", logLevel: "INFO"})
   })
 
   it("when no update is present for a prescription, the not-onboarded update is applied", async () => {
@@ -55,7 +58,7 @@ describe("Unit tests for statusUpdate", function () {
     medicationRequest.extension = defaultExtension(false)
     medicationRequest.status = "active"
 
-    applyStatusUpdates(requestBundle, statusUpdates)
+    applyStatusUpdates(logger, requestBundle, statusUpdates)
 
     expect(requestBundle).toEqual(expectedResponseBundle)
   })
@@ -71,7 +74,7 @@ describe("Unit tests for statusUpdate", function () {
     medicationRequest.extension = defaultExtension(false)
     medicationRequest.status = "active"
 
-    applyStatusUpdates(requestBundle, statusUpdates)
+    applyStatusUpdates(logger, requestBundle, statusUpdates)
 
     expect(requestBundle).toEqual(expectedResponseBundle)
   })
@@ -80,7 +83,7 @@ describe("Unit tests for statusUpdate", function () {
     const requestBundle = simpleRequestBundle()
     const statusUpdates = simpleStatusUpdatesPayload()
 
-    applyStatusUpdates(requestBundle, statusUpdates)
+    applyStatusUpdates(logger, requestBundle, statusUpdates)
 
     expect(requestBundle).toEqual(simpleResponseBundle())
   })
@@ -100,7 +103,7 @@ describe("Unit tests for statusUpdate", function () {
 
     medicationRequest.extension![0].extension![1].valueDateTime = lessThanOneWeekAgo
 
-    applyStatusUpdates(requestBundle, statusUpdates)
+    applyStatusUpdates(logger, requestBundle, statusUpdates)
 
     expect(requestBundle).toEqual(expected)
   })
@@ -121,7 +124,7 @@ describe("Unit tests for statusUpdate", function () {
     medicationRequest.status = "completed"
     medicationRequest.extension![0].extension![1].valueDateTime = moreThanOneWeekAgo
 
-    applyStatusUpdates(requestBundle, statusUpdates)
+    applyStatusUpdates(logger, requestBundle, statusUpdates)
 
     expect(requestBundle).toEqual(expected)
   })
@@ -159,7 +162,7 @@ describe("Unit tests for statusUpdate", function () {
 
       addExtensionToMedicationRequest(responseMedicationRequest, "Collected", moreThanOneWeekAgo)
 
-      applyStatusUpdates(requestBundle, statusUpdates)
+      applyStatusUpdates(logger, requestBundle, statusUpdates)
 
       expect(requestBundle).toEqual(expectedResponseBundle)
     })
@@ -191,7 +194,7 @@ describe("Unit tests for statusUpdate", function () {
     responseMedicationRequest.extension!.push(existingExtension)
     responseMedicationRequest.extension!.reverse()
 
-    applyStatusUpdates(requestBundle, statusUpdates)
+    applyStatusUpdates(logger, requestBundle, statusUpdates)
 
     expect(requestBundle).toEqual(expectedResponseBundle)
   })
@@ -211,7 +214,7 @@ describe("Unit tests for statusUpdate", function () {
       addExtensionToMedicationRequest(medicationRequest, status, "2023-09-11T10:11:12.000Z")
 
       const statusUpdates = simpleStatusUpdatesPayload()
-      applyStatusUpdates(requestBundle, statusUpdates)
+      applyStatusUpdates(logger, requestBundle, statusUpdates)
 
       // Check that the original extension is still present and unchanged
       expect(medicationRequest.extension![0].extension![0].valueCoding!.code).toEqual(expectedCode)
@@ -229,7 +232,7 @@ describe("Unit tests for statusUpdate", function () {
 
     const responseBundle = JSON.parse(JSON.stringify(requestBundle))
 
-    applyStatusUpdates(requestBundle, statusUpdates)
+    applyStatusUpdates(logger, requestBundle, statusUpdates)
 
     expect(requestBundle).toEqual(responseBundle)
   })
@@ -244,7 +247,7 @@ describe("Unit tests for statusUpdate", function () {
     const medicationRequest = prescription.entry![3].resource as MedicationRequest
     medicationRequest.extension = defaultExtension()
 
-    applyStatusUpdates(requestBundle, statusUpdates)
+    applyStatusUpdates(logger, requestBundle, statusUpdates)
 
     expect(requestBundle).toEqual(expectedResponseBundle)
   })
@@ -260,7 +263,7 @@ describe("Unit tests for statusUpdate", function () {
     statusHistory!.reverse()
 
     const statusUpdates = simpleStatusUpdatesPayload()
-    applyStatusUpdates(requestBundle, statusUpdates)
+    applyStatusUpdates(logger, requestBundle, statusUpdates)
 
     expect(requestBundle).toEqual(simpleResponseBundle())
     expect(medicationRequest.extension[0].extension!.length).toEqual(2)
@@ -334,7 +337,7 @@ describe("Unit tests for statusUpdate", function () {
         addExtensionToMedicationRequest(medicationRequest, pfpStatus, updateTime)
 
         if (npptUpdates) {
-          applyStatusUpdates(requestBundle, npptUpdates)
+          applyStatusUpdates(logger, requestBundle, npptUpdates)
         }
 
         expect(medicationRequest.extension![0].extension![0].valueCoding!.code).toEqual(expectedStatus)
@@ -385,7 +388,7 @@ describe("Unit tests for statusUpdate", function () {
       const prescriptionID = medicationRequest.groupIdentifier!.value!.toUpperCase()
       const statusUpdateRequest = createStatusUpdateRequest([{odsCode: "FLM49", prescriptionID: prescriptionID}])
 
-      applyTemporaryStatusUpdates(requestBundle, statusUpdateRequest)
+      applyTemporaryStatusUpdates(logger, requestBundle, statusUpdateRequest)
       const statusExtension = medicationRequest.extension![0].extension!.filter((e) => e.url === "status")[0]
 
       expect(statusExtension.valueCoding!.code!).toEqual(TEMPORARILY_UNAVAILABLE_STATUS)
@@ -404,7 +407,7 @@ describe("Unit tests for statusUpdate", function () {
         {odsCode: "FLM49", prescriptionID: "NOPE"}
       ])
 
-      applyTemporaryStatusUpdates(requestBundle, statusUpdateRequest)
+      applyTemporaryStatusUpdates(logger, requestBundle, statusUpdateRequest)
       expect(medicationRequest.extension).toBeUndefined()
     })
 
@@ -426,8 +429,8 @@ describe("Unit tests for statusUpdate", function () {
         const prescriptionID = medicationRequests![0].groupIdentifier!.value!.toUpperCase()
         const statusUpdateRequest = createStatusUpdateRequest([{odsCode: "FLM49", prescriptionID: prescriptionID}])
 
-        applyTemporaryStatusUpdates(requestBundle, statusUpdateRequest)
-        const statusExtension = medicationRequest.extension![0].extension!.filter((e) => e.url === "status")[0]!
+        applyTemporaryStatusUpdates(logger, requestBundle, statusUpdateRequest)
+        const statusExtension = medicationRequest.extension![0].extension!.filter((e) => e.url === "status")[0]
 
         expect(statusExtension.valueCoding!.code!).toEqual(shouldUpdate ? TEMPORARILY_UNAVAILABLE_STATUS : status)
       }
@@ -460,7 +463,7 @@ describe("Unit tests for statusUpdate", function () {
       {odsCode: "FEW08", prescriptionID: "16B2E0-A83008-81C13H"}
     ])
 
-    applyTemporaryStatusUpdates(requestBundle, statusUpdateRequest)
+    applyTemporaryStatusUpdates(logger, requestBundle, statusUpdateRequest)
 
     const tempStatusUpdateFilter = (medicationRequest: MedicationRequest) => {
       const outerExtension = medicationRequest.extension?.filter(

packages/getMyPrescriptions/src/fhirUtils.ts

@@ -45,7 +45,7 @@ export function isolatePerformerReference(medicationRequests: Array<MedicationRe
 }
 
 export function isolatePerformerOrganisation(reference: string, prescription: Bundle): Organization {
-  const filter = (entry: Entry) => entry.fullUrl! === reference
+  const filter = (entry: Entry) => (!!entry.fullUrl && entry.fullUrl === reference)
   return filterAndTypeBundleEntries<Organization>(prescription, filter)[0]
 }
 

packages/getMyPrescriptions/src/getMyPrescriptions.ts

@@ -2,14 +2,18 @@ import {APIGatewayProxyResult as LambdaResult} from "aws-lambda"
 import {Logger} from "@aws-lambda-powertools/logger"
 import {injectLambdaContext} from "@aws-lambda-powertools/logger/middleware"
 import {LogLevel} from "@aws-lambda-powertools/logger/types"
+
 import middy from "@middy/core"
 import inputOutputLogger from "@middy/input-output-logger"
 import httpHeaderNormalizer from "@middy/http-header-normalizer"
+
 import errorHandler from "@nhs/fhir-middy-error-handler"
+import type {Bundle} from "fhir/r4"
+
 import {createSpineClient} from "@NHSDigital/eps-spine-client"
-import {extractNHSNumber, NHSNumberValidationError} from "./extractNHSNumber"
+import {SpineClient} from "@NHSDigital/eps-spine-client/lib/spine-client"
+
 import {DistanceSelling, ServicesCache} from "@prescriptionsforpatients/distanceSelling"
-import type {Bundle} from "fhir/r4"
 import {
   INVALID_NHS_NUMBER_RESPONSE,
   SPINE_CERT_NOT_CONFIGURED_RESPONSE,
@@ -18,9 +22,9 @@ import {
   TraceIDs,
   ResponseFunc
 } from "./responses"
+import {extractNHSNumber, NHSNumberValidationError} from "./extractNHSNumber"
 import {deepCopy, hasTimedOut, jobWithTimeout} from "./utils"
 import {buildStatusUpdateData, shouldGetStatusUpdates} from "./statusUpdate"
-import {SpineClient} from "@NHSDigital/eps-spine-client/lib/spine-client"
 import {isolateOperationOutcome} from "./fhirUtils"
 
 const LOG_LEVEL = process.env.LOG_LEVEL as LogLevel
@@ -106,7 +110,7 @@ async function eventHandler(
       logger.error("Operation outcome returned from spine", {operationOutcome})
     })
 
-    const statusUpdateData = includeStatusUpdateData ? buildStatusUpdateData(searchsetBundle) : undefined
+    const statusUpdateData = includeStatusUpdateData ? buildStatusUpdateData(logger, searchsetBundle) : undefined
 
     const distanceSelling = new DistanceSelling(servicesCache, logger)
     const distanceSellingBundle = deepCopy(searchsetBundle)