fix: Sonar style issues

Author: tstephen-nhs

packages/cdk/resources/Apis.ts

@@ -79,7 +79,7 @@ export class Apis extends Construct {
     })
 
     // POST /notification-delivery-status-callback — Lambda proxy integration
-    const notificationDeliveryStatusCallbackEndpoint = new LambdaEndpoint(this, "NotificationDeliveryStatusCallbackEndpoint", {
+    const notifyCallbackEndpoint = new LambdaEndpoint(this, "NotificationDeliveryStatusCallbackEndpoint", {
       parentResource: rootResource,
       resourceName: "notification-delivery-status-callback",
       method: HttpMethod.POST,
@@ -110,7 +110,7 @@ export class Apis extends Construct {
       format1UpdatePrescriptionStatusEndpoint: format1PsuEndpoint,
       status: statusEndpoint,
       capabilityStatement: capabilityStatementEndpoint,
-      notificationDeliveryStatusCallback: notificationDeliveryStatusCallbackEndpoint,
+      notificationDeliveryStatusCallback: notifyCallbackEndpoint,
     }
 
     // GET /checkprescriptionstatusupdates — conditional Lambda proxy integration

packages/updatePrescriptionStatus/tests/testDatabaseClient.test.ts

@@ -144,7 +144,7 @@ describe("Unit test persistDataItems", () => {
       ApplicationID: "550e8400-e29b-41d4-a716-446655440000",
       ExpiryTime: 10
     }
-    const dataItems = Array(150).fill(dataItem)
+    const dataItems = new Array(150).fill(dataItem)
 
     const loggerSpy = vi.spyOn(logger, "error")
 
@@ -367,7 +367,7 @@ describe("Unit test rollbackDataItems", () => {
     const items = [makeItem(), makeItem({PrescriptionID: "PrescriptionID_2", TaskID: "TaskID_2"})]
 
     // success for each conditioned delete
-    mockSend.mockImplementation(async () => Promise.resolve())
+    mockSend.mockImplementation(async () => {})
 
     const loggerWarn = vi.spyOn(logger, "warn")
     const loggerError = vi.spyOn(logger, "error")
@@ -384,14 +384,14 @@ describe("Unit test rollbackDataItems", () => {
 
     // First delete succeeds, second hits conditional check failure (skip it)
     mockSend
-      .mockImplementationOnce(async () => Promise.resolve())
-      .mockImplementationOnce(async () => Promise.reject(
-        new TransactionCanceledException({
+      .mockImplementationOnce(async () => {})
+      .mockImplementationOnce(async () => {
+        throw new TransactionCanceledException({
           $metadata: {},
           message: "Conditional check failed",
           CancellationReasons: [{Code: "ConditionalCheckFailedException"}]
         })
-      ))
+      })
 
     const loggerWarn = vi.spyOn(logger, "warn")
     const loggerError = vi.spyOn(logger, "error")
@@ -406,7 +406,9 @@ describe("Unit test rollbackDataItems", () => {
   it("returns false when an unexpected error occurs", async () => {
     const items = [makeItem()]
 
-    mockSend.mockImplementationOnce(async () => Promise.reject(new Error("error")))
+    mockSend.mockImplementationOnce(async () => {
+      throw new Error("error")
+    })
 
     const loggerError = vi.spyOn(logger, "error")
 
@@ -420,15 +422,15 @@ describe("Unit test rollbackDataItems", () => {
     const items = [makeItem({TaskID: "A"}), makeItem({TaskID: "B"}), makeItem({TaskID: "C"})]
 
     mockSend
-      .mockImplementationOnce(async () => Promise.resolve()) // A: delete ok
-      .mockImplementationOnce(async () => Promise.reject( // B: condition failure -> skip
-        new TransactionCanceledException({
+      .mockImplementationOnce(async () => {}) // A: delete ok
+      .mockImplementationOnce(async () => { // B: condition failure -> skip
+        throw new TransactionCanceledException({
           $metadata: {},
           message: "Conditional check failed",
           CancellationReasons: [{Code: "ConditionalCheckFailedException"}]
         })
-      ))
-      .mockImplementationOnce(async () => Promise.resolve()) // C: delete ok
+      })
+      .mockImplementationOnce(async () => {}) // C: delete ok
 
     const loggerWarn = vi.spyOn(logger, "warn")
     const loggerError = vi.spyOn(logger, "error")

packages/updatePrescriptionStatus/tests/testHandler.test.ts

@@ -39,12 +39,10 @@ import {QueryCommand, TransactionCanceledException, TransactWriteItemsCommand} f
 
 const {dynamoDBMockSend, mockPushPrescriptionToNotificationSQS, mockGetParametersByName, mockInitiatedSSMProvider} =
   vi.hoisted(() => {
-    const mockGetParametersByName = vi.fn(async () => Promise.resolve(
-      {[process.env.ENABLE_NOTIFICATIONS_PARAM!]: "false"}
-    ))
+    const mockGetParametersByName = vi.fn(async () => ({[process.env.ENABLE_NOTIFICATIONS_PARAM!]: "false"}))
     return {
       dynamoDBMockSend: vi.fn(),
-      mockPushPrescriptionToNotificationSQS: vi.fn().mockImplementation(async () => Promise.resolve()),
+      mockPushPrescriptionToNotificationSQS: vi.fn().mockImplementation(async () => {}),
       mockGetParametersByName,
       mockInitiatedSSMProvider: {getParametersByName: mockGetParametersByName}
     }
@@ -97,12 +95,10 @@ describe("Integration tests for updatePrescriptionStatus handler", () => {
     })
 
     mockPushPrescriptionToNotificationSQS.mockReset()
-    mockPushPrescriptionToNotificationSQS.mockImplementation(async () => Promise.resolve())
+    mockPushPrescriptionToNotificationSQS.mockImplementation(async () => {})
 
     mockGetParametersByName.mockReset()
-    mockGetParametersByName.mockImplementation(async () => Promise.resolve(
-      {[process.env.ENABLE_NOTIFICATIONS_PARAM!]: "false"}
-    ))
+    mockGetParametersByName.mockImplementation(async () => ({[process.env.ENABLE_NOTIFICATIONS_PARAM!]: "false"}))
   })
 
   it("when request doesn't have correct resourceType and type, expect 400 status code and appropriate message", async () => {
@@ -277,7 +273,7 @@ describe("Integration tests for updatePrescriptionStatus handler", () => {
 
   it("when dynamo call fails, expect 500 status code and internal server error message", async () => {
     const event = generateMockEvent(requestDispatched)
-    dynamoDBMockSend.mockRejectedValue(new Error() as never)
+    dynamoDBMockSend.mockRejectedValue(new Error() as never) // NOSONAR
 
     const response: APIGatewayProxyResult = await handler(event, {})
 
@@ -532,7 +528,9 @@ describe("Integration tests for updatePrescriptionStatus handler", () => {
   })
 
   it("When the get parameter call throws an error, the request succeeds and the sqs queue is untouched", async () => {
-    mockGetParametersByName.mockImplementation(async () => Promise.reject(new Error("Failed")))
+    mockGetParametersByName.mockImplementation(async () => {
+      throw new Error("Failed")
+    })
     const {handler: tmpfn} = await import("../src/updatePrescriptionStatus")
 
     const rejected_event: APIGatewayProxyEvent = generateMockEvent(requestDispatched)

packages/updatePrescriptionStatus/tests/utils/testUtils.ts

@@ -77,7 +77,7 @@ export const TASK_VALUES = [
 ]
 
 export function deepCopy(toCopy: object) {
-  return JSON.parse(JSON.stringify(toCopy))
+  return structuredClone(toCopy)
 }
 
 export function validTask(): Task {