Merge pull request #1116 from Enterprise-CMCS/main

Release to val
Enterprise-CMCS · Feb 4, 2025 · a6c61a7 · a6c61a7
2 parents 16026e2 + 5f60de7
commit a6c61a7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/lib/lambda/sinkChangelog.ts b/lib/lambda/sinkChangelog.ts
@@ -76,7 +76,7 @@ const processAndIndex = async ({
         const result = schema.safeParse(record);
 
         if (result.success) {
-          if (result.data.adminChangeType === "update-id") {
+          if (result.data.adminChangeType === "update-id" && "idToBeUpdated" in result.data) {
             // Push doc with package being soft deleted
             docs.forEach((log) => {
               const recordOffset = log.id.split("-").at(-1);
@@ -97,7 +97,10 @@ const processAndIndex = async ({
                 packageId: result.data.id,
               });
             });
-          } else if (result.data.adminChangeType === "split-spa") {
+          } else if (
+            result.data.adminChangeType === "split-spa" &&
+            "idToBeUpdated" in result.data
+          ) {
             // Push doc with new split package
             docs.push(result.data);
 

diff --git a/lib/lambda/submit/submitSplitSPA.ts b/lib/lambda/submit/submitSplitSPA.ts
@@ -11,7 +11,7 @@ import { z } from "zod";
 EXAMPLE EVENT JSON:
 {
   "body": {
-    "packageId": "MD-25-9999",
+    "packageId": "MD-25-9999"
   }
 }
 */
@@ -26,6 +26,8 @@ const sendSubmitSplitSPAMessage = async (currentPackage: ItemResult) => {
     throw new Error("Error getting next Split SPA Id");
   }
 
+  const currentTime = Date.now();
+
   // ID and changeMade are excluded; the rest of the object has to be spread into the new package
   const {
     id: _id,
@@ -41,8 +43,9 @@ const sendSubmitSplitSPAMessage = async (currentPackage: ItemResult) => {
       id: newId,
       idToBeUpdated: currentPackage._id,
       ...remainingFields,
-      makoChangedDate: Date.now(),
-      changedDate: Date.now(),
+      makoChangedDate: currentTime,
+      changedDate: currentTime,
+      timestamp: currentTime,
       origin: "OneMAC",
       changeMade: "OneMAC Admin has added a package to OneMAC.",
       changeReason: "Per request from CMS, this package was added to OneMAC.",

diff --git a/lib/lambda/update/adminChangeSchemas.ts b/lib/lambda/update/adminChangeSchemas.ts
@@ -49,8 +49,6 @@ export const transformUpdateValuesSchema = (offset: number) =>
     timestamp: Date.now(),
   }));
 
-const currentTime = Date.now();
-
 export const transformedUpdateIdSchema = updateIdAdminChangeSchema.transform((data) => ({
   ...data,
   event: "update-id",
@@ -64,9 +62,6 @@ export const transformedSplitSPASchema = splitSPAAdminChangeSchema.transform((da
   event: "split-spa",
   packageId: data.id,
   id: `${data.id}`,
-  timestamp: currentTime,
-  makoChangedDate: currentTime,
-  changedDate: currentTime,
 }));
 
 export const submitNOSOAdminSchema = z.object({

diff --git a/react-app/src/features/package/admin-changes/index.tsx b/react-app/src/features/package/admin-changes/index.tsx
@@ -76,7 +76,7 @@ export const AdminChange: FC<opensearch.changelog.Document> = (props) => {
         <p className="flex flex-row gap-2 text-gray-600">
           <strong>{label as string}</strong>
           {" - "}
-          {format(new UTCDate(props.timestamp), "eee, MMM d, yyyy hh:mm:ss a")}
+          {format(new UTCDate(props.timestamp).getTime(), "eee, MMM d, yyyy hh:mm:ss a")}
         </p>
       </AccordionTrigger>
       <AccordionContent className="p-4">

diff --git a/react-app/vitest.setup.ts b/react-app/vitest.setup.ts
@@ -53,7 +53,7 @@ vi.spyOn(Auth, "userAttributes").mockImplementation(mockUserAttributes);
 vi.spyOn(Auth, "signOut").mockImplementation(async () => {
   setMockUsername(null);
 });
-
+process.env.TZ = "UTC";
 // Add this to remove all the expected errors in console when running unit tests.
 beforeAll(() => {
   setDefaultStateSubmitter();

diff --git a/vitest.config.ts b/vitest.config.ts
@@ -5,6 +5,7 @@ export default defineConfig({
   test: {
     globals: true,
     environmentMatchGlobs: [["**/*.test.ts", "**/*.test.tsx"]],
+    testTimeout: 10000,
     coverage: {
       provider: "istanbul",
       reportsDirectory: join(__dirname, "coverage"),