From 419cad2e05bc998a11e6d960c81aa16d448a7789 Mon Sep 17 00:00:00 2001 From: Andie Swift Date: Tue, 21 Jan 2025 12:08:52 -0600 Subject: [PATCH] renamed admin function files; fixed test error --- .../adminSchemas.ts} | 19 +++++++++++++++ .../getPackageType.ts | 0 .../{submit => adminActions}/submitNOSO.ts | 24 ++----------------- .../updatePackage.test.ts | 0 .../{update => adminActions}/updatePackage.ts | 0 lib/lambda/sinkChangelog.ts | 9 +++---- lib/lambda/sinkMainProcessors.ts | 4 ++-- ...og.test.ts => getPackageChangelog.test.ts} | 2 +- .../{changelog.ts => getPackageChangelog.ts} | 0 lib/libs/api/package/index.ts | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) rename lib/lambda/{update/adminChangeSchemas.ts => adminActions/adminSchemas.ts} (70%) rename lib/lambda/{update => adminActions}/getPackageType.ts (100%) rename lib/lambda/{submit => adminActions}/submitNOSO.ts (87%) rename lib/lambda/{update => adminActions}/updatePackage.test.ts (100%) rename lib/lambda/{update => adminActions}/updatePackage.ts (100%) rename lib/libs/api/package/{changelog.test.ts => getPackageChangelog.test.ts} (95%) rename lib/libs/api/package/{changelog.ts => getPackageChangelog.ts} (100%) diff --git a/lib/lambda/update/adminChangeSchemas.ts b/lib/lambda/adminActions/adminSchemas.ts similarity index 70% rename from lib/lambda/update/adminChangeSchemas.ts rename to lib/lambda/adminActions/adminSchemas.ts index 4404d97749..8d50cc9114 100644 --- a/lib/lambda/update/adminChangeSchemas.ts +++ b/lib/lambda/adminActions/adminSchemas.ts @@ -48,3 +48,22 @@ export const transformedUpdateIdSchema = updateIdAdminChangeSchema.transform((da id: `${data.id}`, timestamp: Date.now(), })); + +export const submitNOSOAdminSchema = z + .object({ + packageId: z.string(), + event: z.literal("NOSO"), + adminChangeType: z.literal("NOSO"), + copyAttachmentsFrom: z.string().optional(), + }) + .and(z.record(z.string(), z.any())); + +export const transformSubmitValuesSchema = submitNOSOAdminSchema.transform((data) => ({ + ...data, + adminChangeType: "NOSO", + event: "NOSO", + id: data.packageId, + packageId: data.packageId, + timestamp: Date.now(), + copyAttachmentsFromId: z.string().optional(), +})); diff --git a/lib/lambda/update/getPackageType.ts b/lib/lambda/adminActions/getPackageType.ts similarity index 100% rename from lib/lambda/update/getPackageType.ts rename to lib/lambda/adminActions/getPackageType.ts diff --git a/lib/lambda/submit/submitNOSO.ts b/lib/lambda/adminActions/submitNOSO.ts similarity index 87% rename from lib/lambda/submit/submitNOSO.ts rename to lib/lambda/adminActions/submitNOSO.ts index de5ba7d787..0b901fbfab 100644 --- a/lib/lambda/submit/submitNOSO.ts +++ b/lib/lambda/adminActions/submitNOSO.ts @@ -3,28 +3,8 @@ import { APIGatewayEvent } from "aws-lambda"; import { produceMessage } from "libs/api/kafka"; import { getPackage } from "libs/api/package"; import { getPackageChangelog } from "libs/api/package"; -import { z } from "zod"; import { ItemResult } from "shared-types/opensearch/main"; - -// create admin schemas -export const submitNOSOAdminSchema = z - .object({ - packageId: z.string(), - event: z.literal("NOSO"), - adminChangeType: z.literal("NOSO"), - copyAttachmentsFrom: z.string().optional(), - }) - .and(z.record(z.string(), z.any())); - -export const transformSubmitValuesSchema = submitNOSOAdminSchema.transform((data) => ({ - ...data, - adminChangeType: "NOSO", - event: "NOSO", - id: data.packageId, - packageId: data.packageId, - timestamp: Date.now(), - copyAttachmentsFromId: z.string().optional(), -})); +import { submitNOSOAdminSchema } from "./adminSchemas"; export const copyAttachments = async (data: any) => { //ANDIE: change type not any @@ -126,7 +106,7 @@ export const handler = async (event: APIGatewayEvent) => { const { packageId, action, copyAttachmentsFromId } = submitNOSOAdminSchema.parse( event.body === "string" ? JSON.parse(event.body) : event.body, ); - let currentPackage: ItemResult | undefined = await getPackage(packageId); + const currentPackage: ItemResult | undefined = await getPackage(packageId); // currentpackage should have been entered in seaTool if (!currentPackage || currentPackage.found == false) { diff --git a/lib/lambda/update/updatePackage.test.ts b/lib/lambda/adminActions/updatePackage.test.ts similarity index 100% rename from lib/lambda/update/updatePackage.test.ts rename to lib/lambda/adminActions/updatePackage.test.ts diff --git a/lib/lambda/update/updatePackage.ts b/lib/lambda/adminActions/updatePackage.ts similarity index 100% rename from lib/lambda/update/updatePackage.ts rename to lib/lambda/adminActions/updatePackage.ts diff --git a/lib/lambda/sinkChangelog.ts b/lib/lambda/sinkChangelog.ts index 82ee6d94d8..b09fccb8a6 100644 --- a/lib/lambda/sinkChangelog.ts +++ b/lib/lambda/sinkChangelog.ts @@ -6,10 +6,10 @@ import { transformUpdateValuesSchema, transformDeleteSchema, transformedUpdateIdSchema, -} from "./update/adminChangeSchemas"; -import { transformSubmitValuesSchema } from "./submit/submitNOSO"; -import { getPackageChangelog } from "lib/libs/api/package"; -import { copyAttachments } from "./submit/submitNOSO"; +} from "./adminActions/adminSchemas"; +import { transformSubmitValuesSchema } from "./adminActions/adminSchemas"; +import { copyAttachments } from "./adminActions/submitNOSO"; +import { getPackageChangelog } from "libs/api/package"; // One notable difference between this handler and sinkMain's... // The order in which records are processed for the changelog doesn't matter. @@ -90,6 +90,7 @@ const processAndIndex = async ({ }); }); + //@ts-ignore const packageChangelogs = await getPackageChangelog(result.data.idToBeUpdated); packageChangelogs.hits.hits.forEach((log) => { diff --git a/lib/lambda/sinkMainProcessors.ts b/lib/lambda/sinkMainProcessors.ts index 72ea36f694..3d78efe294 100644 --- a/lib/lambda/sinkMainProcessors.ts +++ b/lib/lambda/sinkMainProcessors.ts @@ -7,8 +7,8 @@ import { deleteAdminChangeSchema, updateValuesAdminChangeSchema, updateIdAdminChangeSchema, -} from "./update/adminChangeSchemas"; -import { submitNOSOAdminSchema } from "./submit/submitNOSO"; +} from "./adminActions/adminSchemas"; +import { submitNOSOAdminSchema } from "./adminActions/submitNOSO"; const removeDoubleQuotesSurroundingString = (str: string) => str.replace(/^"|"$/g, ""); const adminRecordSchema = deleteAdminChangeSchema diff --git a/lib/libs/api/package/changelog.test.ts b/lib/libs/api/package/getPackageChangelog.test.ts similarity index 95% rename from lib/libs/api/package/changelog.test.ts rename to lib/libs/api/package/getPackageChangelog.test.ts index ebe2ded8ee..129f4bc24f 100644 --- a/lib/libs/api/package/changelog.test.ts +++ b/lib/libs/api/package/getPackageChangelog.test.ts @@ -2,7 +2,7 @@ import { TEST_ITEM_ID, WITHDRAWN_CHANGELOG_ITEM_ID } from "mocks"; import items from "mocks/data/items"; import { describe, expect, it } from "vitest"; -import { getPackageChangelog } from "./changelog"; +import { getPackageChangelog } from "./getPackageChangelog"; describe("getPackageChangelog", () => { it("should throw an error if osDomain is not defined", async () => { diff --git a/lib/libs/api/package/changelog.ts b/lib/libs/api/package/getPackageChangelog.ts similarity index 100% rename from lib/libs/api/package/changelog.ts rename to lib/libs/api/package/getPackageChangelog.ts diff --git a/lib/libs/api/package/index.ts b/lib/libs/api/package/index.ts index 1f87ed84e4..f027eb797a 100644 --- a/lib/libs/api/package/index.ts +++ b/lib/libs/api/package/index.ts @@ -1,4 +1,4 @@ -export * from "./changelog"; +export * from "./getPackageChangelog"; export * from "./getPackage"; export * from "./appk"; export * from "./itemExists";