From b64d07200f6bbe90b27376c14c7b9f61d09b52ec Mon Sep 17 00:00:00 2001
From: Andie Swift <andie.swift5@gmail.com>
Date: Wed, 22 Jan 2025 16:31:11 -0600
Subject: [PATCH] added back event in produce message

---
 lib/lambda/adminActions/adminSchemas.ts |  3 +--
 lib/lambda/adminActions/submitNOSO.ts   | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/lambda/adminActions/adminSchemas.ts b/lib/lambda/adminActions/adminSchemas.ts
index 8d50cc911..a6c4bb99a 100644
--- a/lib/lambda/adminActions/adminSchemas.ts
+++ b/lib/lambda/adminActions/adminSchemas.ts
@@ -51,8 +51,7 @@ export const transformedUpdateIdSchema = updateIdAdminChangeSchema.transform((da
 
 export const submitNOSOAdminSchema = z
   .object({
-    packageId: z.string(),
-    event: z.literal("NOSO"),
+    id: z.string(),
     adminChangeType: z.literal("NOSO"),
     copyAttachmentsFrom: z.string().optional(),
   })
diff --git a/lib/lambda/adminActions/submitNOSO.ts b/lib/lambda/adminActions/submitNOSO.ts
index 0b901fbfa..7a24c6e02 100644
--- a/lib/lambda/adminActions/submitNOSO.ts
+++ b/lib/lambda/adminActions/submitNOSO.ts
@@ -62,11 +62,11 @@ export const copyAttachments = async (data: any) => {
 };
 
 const sendSubmitMessage = async ({
-  packageId,
+  id,
   currentPackage,
   copyAttachmentsFromId,
 }: {
-  packageId: string;
+  id: string;
   currentPackage: ItemResult;
   copyAttachmentsFromId?: string;
 }) => {
@@ -76,21 +76,22 @@ const sendSubmitMessage = async ({
   }
   await produceMessage(
     topicName,
-    packageId,
+    id,
     JSON.stringify({
       ...currentPackage._source,
       copyAttachmentsFromId: copyAttachmentsFromId,
       origin: "SEATool",
       isAdminChange: true,
       adminChangeType: "NOSO",
-      changeMade: `${packageId} added to OneMAC. Package not originally submitted in OneMAC. At this time, the attachments for this package are unavailable in this system. Contact your CPOC to verify the initial submission documents.`,
+      event: "NOSO",
+      changeMade: `${id} added to OneMAC. Package not originally submitted in OneMAC. At this time, the attachments for this package are unavailable in this system. Contact your CPOC to verify the initial submission documents.`,
       changeReason: `This is a Not Originally Submitted in OneMAC (NOSO) that users need to see in OneMAC.`,
     }),
   );
 
   return response({
     statusCode: 200,
-    body: { message: `${packageId} has been submitted.` },
+    body: { message: `${id} has been submitted.` },
   });
 };
 
@@ -103,22 +104,22 @@ export const handler = async (event: APIGatewayEvent) => {
   }
   try {
     // add a property for new ID
-    const { packageId, action, copyAttachmentsFromId } = submitNOSOAdminSchema.parse(
+    const { id, adminChangeType, copyAttachmentsFromId } = submitNOSOAdminSchema.parse(
       event.body === "string" ? JSON.parse(event.body) : event.body,
     );
-    const currentPackage: ItemResult | undefined = await getPackage(packageId);
+    const currentPackage: ItemResult | undefined = await getPackage(id);
 
     // currentpackage should have been entered in seaTool
     if (!currentPackage || currentPackage.found == false) {
       return response({
         statusCode: 404,
-        body: { message: `Package with id: ${packageId} is not in SEATool` },
+        body: { message: `Package with id: ${id} is not in SEATool` },
       });
     }
 
-    if (action === "NOSO" && currentPackage !== undefined) {
+    if (adminChangeType === "NOSO" && currentPackage !== undefined) {
       // copying over attachments is handled in sinkChangeLog
-      return await sendSubmitMessage({ packageId, currentPackage, copyAttachmentsFromId });
+      return await sendSubmitMessage({ id, currentPackage, copyAttachmentsFromId });
     }
 
     return response({