Skip to content

Commit

Permalink
feat(CB2-14229): snowball sqs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Daniel-Searle
Daniel-Searle committed Oct 22, 2024
1 parent 3220125 commit 12cc5e6
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 19 deletions.
9 changes: 4 additions & 5 deletions src/functions/reportGen.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { LambdaClient } from "@aws-sdk/client-lambda";
import { PutObjectRequest } from "@aws-sdk/client-s3";
import { unmarshall } from "@aws-sdk/util-dynamodb";
import { Callback, Context, DynamoDBBatchItemFailure, DynamoDBBatchResponse, Handler } from "aws-lambda";
import { Callback, Context, Handler, SQSBatchItemFailure, SQSBatchResponse } from "aws-lambda";
import { ERRORS } from "../assets/enum";
import { ActivitiesService } from "../services/ActivitiesService";
import { LambdaService } from "../services/LambdaService";
Expand All @@ -16,12 +15,12 @@ import { ActivitySchema } from "@dvsa/cvs-type-definitions/types/v1/activity";
* @param context - λ Context
* @param callback - callback function
*/
const reportGen: Handler = async (event: any, context?: Context, callback?: Callback): Promise<DynamoDBBatchResponse> => {
const reportGen: Handler = async (event: any, context?: Context, callback?: Callback): Promise<SQSBatchResponse> => {
if (!event || !event.Records || !Array.isArray(event.Records) || !event.Records.length) {
console.error("ERROR: event is not defined.");
throw new Error(ERRORS.EVENT_IS_EMPTY);
}
const batchItemFailures: DynamoDBBatchItemFailure[] = [];
const batchItemFailures: SQSBatchItemFailure[] = [];

const lambdaService = new LambdaService(new LambdaClient({}));
const reportService: ReportGenerationService = new ReportGenerationService(new TestResultsService(lambdaService), new ActivitiesService(lambdaService));
Expand All @@ -45,7 +44,7 @@ const reportGen: Handler = async (event: any, context?: Context, callback?: Call
} catch (error) {
console.error(error);
batchItemFailures.push({
itemIdentifier: record.dynamodb?.SequenceNumber ?? "",
itemIdentifier: record.messageId,
});
}
}
Expand Down
61 changes: 47 additions & 14 deletions tests/unit/reportGenFunction.unitTest.ts
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,48 @@
import { reportGen } from "../../src/functions/reportGen";
import { ReportGenerationService } from "../../src/services/ReportGenerationService";
import { SendATFReport } from "../../src/services/SendATFReport";
import { reportGen } from "../../src/functions/reportGen";
import { ERRORS } from "../../src/assets/enum";

const mockProcessRecord = jest.fn();

jest.mock("../../src/services/ReportGenerationService");
jest.mock("../../src/services/SendATFReport");

const mockPayload = '{"eventID":"f9e63bf29bd6adf174e308201a97259f","eventName":"MODIFY","eventVersion":"1.1","eventSource":"aws:dynamodb","awsRegion":"eu-west-1","dynamodb":{"ApproximateCreationDateTime":1711549645,"Keys":{"id":{"S":"6e4bd304-446e-4678-8289-dasdasjkl"}},"NewImage":{"testerStaffId":{"S":"132"},"testStationPNumber":{"S":"87-1369564"},"testerEmail":{"S":"tester@dvsa.gov.uk1111"},"testStationType":{"S":"gvts"},"testStationEmail":{"S":"teststationname@dvsa.gov.uk"},"startTime":{"S":"2022-01-01T10:00:40.561Z"},"endTime":{"S":"2022-01-01T10:00:40.561Z"},"id":{"S":"6e4bd304-446e-4678-8289-dasdasjkl"},"testStationName":{"S":"Rowe, Wunsch and Wisoky"},"activityType":{"S":"visit"},"activityDay":{"S":"2022-01-01"},"testerName":{"S":"namey mcname"}},"OldImage":{"testerStaffId":{"S":"132"},"testStationPNumber":{"S":"87-1369564"},"testerEmail":{"S":"tester@dvsa.gov.uk1111"},"testStationType":{"S":"gvts"},"testStationEmail":{"S":"teststationname@dvsa.gov.uk"},"startTime":{"S":"2022-01-01T10:00:40.561Z"},"endTime":{"S":"2022-01-01T10:00:40.561Z"},"id":{"S":"6e4bd304-446e-4678-8289-dasdasjkl"},"testStationName":{"S":"Rowe, Wunsch and Wisoky"},"activityType":{"S":"visit"},"activityDay":{"S":"2022-01-01"},"testerName":{"S":"231232132"}},"SequenceNumber":"1234","SizeBytes":704,"StreamViewType":"NEW_AND_OLD_IMAGES"},"eventSourceARN":"arn:aws::eu--1::/cvs---//:32:37.491"}';
const mockSQSPayload = {
messageId: "059f36b4-87a3-44ab-83d2-661975830a7d",
receiptHandle: "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a",
body: JSON.stringify({
dynamodb: {
NewImage: {
testerStaffId: { S: "132" },
testStationPNumber: { S: "87-1369564" },
testerEmail: { S: "tester@dvsa.gov.uk1111" },
testStationType: { S: "gvts" },
testStationEmail: { S: "teststationname@dvsa.gov.uk" },
startTime: { S: "2022-01-01T10:00:40.561Z" },
endTime: { S: "2022-01-01T10:00:40.561Z" },
id: { S: "6e4bd304-446e-4678-8289-dasdasjkl" },
testStationName: { S: "Rowe, Wunsch and Wisoky" },
activityType: { S: "visit" },
activityDay: { S: "2022-01-01" },
testerName: { S: "Jon Mcdonald" }
}
}
}),
attributes: {
ApproximateReceiveCount: "1",
SentTimestamp: "1545082649183",
SenderId: "AIDAIENQZJOLO23YVJ4VO",
ApproximateFirstReceiveTimestamp: "1545082649185"
},
messageAttributes: {},
md5OfBody: "e4e68fb7bd0e697a0ae8f1bb342846b3",
eventSource: "aws:sqs",
eventSourceARN: "arn:aws:sqs:region:123456789012:queue",
awsRegion: "eu-west-1"
};

describe("Retro Gen Function", () => {
describe("Report Generation Lambda Function", () => {
beforeAll(() => jest.setTimeout(60000));
afterAll(() => {
jest.setTimeout(5000);
Expand All @@ -20,32 +52,32 @@ describe("Retro Gen Function", () => {
const ctx = {};

describe("When Receiving an invalid event", () => {
it("should throw an error when it is empty)", async () => {
it("should throw an error when it is empty", async () => {
await expect(reportGen({}, ctx as any, () => {
return;
})).rejects.toThrow(ERRORS.EVENT_IS_EMPTY);
});

it("should throw an error when the event is null)", async () => {
it("should throw an error when the event is null", async () => {
await expect(reportGen(null, ctx as any, () => {
return;
})).rejects.toThrow(ERRORS.EVENT_IS_EMPTY);
});

it("should throw an error when the event has no records", async () => {
await expect(reportGen({something: true}, ctx as any, () => {
await expect(reportGen({ something: true }, ctx as any, () => {
return;
})).rejects.toThrow(ERRORS.EVENT_IS_EMPTY);
});

it("should throw an error when the event records is not array", async () => {
await expect(reportGen({Records: true}, ctx as any, () => {
await expect(reportGen({ Records: true }, ctx as any, () => {
return;
})).rejects.toThrow(ERRORS.EVENT_IS_EMPTY);
});

it("should throw an error when the event records array is empty", async () => {
await expect(reportGen({Records: []}, ctx as any, () => {
await expect(reportGen({ Records: [] }, ctx as any, () => {
return;
})).rejects.toThrow(ERRORS.EVENT_IS_EMPTY);
});
Expand All @@ -56,27 +88,28 @@ describe("Retro Gen Function", () => {
jest.restoreAllMocks();
});

it("Should add to batchItemFailures (generateATFReport fails)", async () => {
it("Should add to batchItemFailures when generateATFReport fails", async () => {
ReportGenerationService.prototype.generateATFReport = jest.fn().mockRejectedValue(new Error("Oh no!"));
mockProcessRecord.mockReturnValueOnce("All good");

const result = await reportGen({Records: [JSON.parse(mockPayload)]}, ctx as any, () => {
const result = await reportGen({ Records: [mockSQSPayload] }, ctx as any, () => {
return;
});

expect(result.batchItemFailures).toHaveLength(1);
expect(result.batchItemFailures[0].itemIdentifier).toBe("1234");
expect(result.batchItemFailures[0].itemIdentifier).toBe(mockSQSPayload.messageId);
});

it("Should add to batchItemFailures (bucket upload fails)", async () => {
it("Should add to batchItemFailures when bucket upload fails", async () => {
ReportGenerationService.prototype.generateATFReport = jest.fn().mockResolvedValue("Looking good");
SendATFReport.prototype.sendATFReport = jest.fn().mockRejectedValue(new Error("Oh dear"));
mockProcessRecord.mockReturnValueOnce("All good");

const result = await reportGen({Records: [JSON.parse(mockPayload)]}, ctx as any, () => {
const result = await reportGen({ Records: [mockSQSPayload] }, ctx as any, () => {
return;
});
expect(result.batchItemFailures).toHaveLength(1);
expect(result.batchItemFailures[0].itemIdentifier).toBe("1234");
expect(result.batchItemFailures[0].itemIdentifier).toBe(mockSQSPayload.messageId);
});
});
});

0 comments on commit 12cc5e6

Please sign in to comment.