renamed admin function files; fixed test error

lib/lambda/update/adminChangeSchemas.ts → 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(),
+}));

lib/lambda/submit/submitNOSO.ts → 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) {

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) => {

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

lib/libs/api/package/changelog.test.ts → 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 () => {

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";