Enterprise-CMCS · 13bfrancis · Jan 15, 2025 · Dec 12, 2024 · Dec 12, 2024 · Dec 12, 2024
diff --git a/lib/lambda/sinkMainProcessors.test.ts b/lib/lambda/sinkMainProcessors.test.ts
@@ -68,7 +68,7 @@ describe("insertOneMacRecordsFromKafkaIntoMako", () => {
     [
       "app-k",
       appkBase,
-      SEATOOL_STATUS.PENDING,
+      SEATOOL_STATUS.SUBMITTED,
       {
         title: appkBase.title,
         proposedDate: appkBase.proposedEffectiveDate,
@@ -80,7 +80,7 @@ describe("insertOneMacRecordsFromKafkaIntoMako", () => {
     [
       "capitated-initial",
       capitatedInitial,
-      SEATOOL_STATUS.PENDING,
+      SEATOOL_STATUS.SUBMITTED,
       {
         proposedDate: capitatedInitial.proposedEffectiveDate,
         additionalInformation: capitatedInitial.additionalInformation,
@@ -91,7 +91,7 @@ describe("insertOneMacRecordsFromKafkaIntoMako", () => {
     [
       "capitated-amendment",
       capitatedAmendmentBase,
-      SEATOOL_STATUS.PENDING,
+      SEATOOL_STATUS.SUBMITTED,
       {
         proposedDate: capitatedAmendmentBase.proposedEffectiveDate,
         additionalInformation: capitatedAmendmentBase.additionalInformation,
@@ -102,7 +102,7 @@ describe("insertOneMacRecordsFromKafkaIntoMako", () => {
     [
       "capitated-renewal",
       capitatedRenewal,
-      SEATOOL_STATUS.PENDING,
+      SEATOOL_STATUS.SUBMITTED,
       {
         proposedDate: capitatedRenewal.proposedEffectiveDate,
         additionalInformation: capitatedRenewal.additionalInformation,
@@ -113,7 +113,7 @@ describe("insertOneMacRecordsFromKafkaIntoMako", () => {
     [
       "contracting-initial",
       contractingInitial,
-      SEATOOL_STATUS.PENDING,
+      SEATOOL_STATUS.SUBMITTED,
       {
         proposedDate: contractingInitial.proposedEffectiveDate,
         additionalInformation: contractingInitial.additionalInformation,
@@ -124,7 +124,7 @@ describe("insertOneMacRecordsFromKafkaIntoMako", () => {
     [
       "contracting-amendment",
       contractingAmendment,
-      SEATOOL_STATUS.PENDING,
+      SEATOOL_STATUS.SUBMITTED,
       {
         proposedDate: contractingAmendment.proposedEffectiveDate,
         additionalInformation: contractingAmendment.additionalInformation,
@@ -135,7 +135,7 @@ describe("insertOneMacRecordsFromKafkaIntoMako", () => {
     [
       "contracting-renewal",
       contractingRenewal,
-      SEATOOL_STATUS.PENDING,
+      SEATOOL_STATUS.SUBMITTED,
       {
         proposedDate: contractingRenewal.proposedEffectiveDate,
         additionalInformation: contractingRenewal.additionalInformation,
@@ -146,7 +146,7 @@ describe("insertOneMacRecordsFromKafkaIntoMako", () => {
     [
       "new-chip-submission",
       newChipSubmission,
-      SEATOOL_STATUS.PENDING,
+      SEATOOL_STATUS.SUBMITTED,
       {
         proposedDate: newChipSubmission.proposedEffectiveDate,
         additionalInformation: newChipSubmission.additionalInformation,
@@ -157,7 +157,7 @@ describe("insertOneMacRecordsFromKafkaIntoMako", () => {
     [
       "new-medicaid-submission",
       newMedicaidSubmission,
-      SEATOOL_STATUS.PENDING,
+      SEATOOL_STATUS.SUBMITTED,
       {
         proposedDate: newMedicaidSubmission.proposedEffectiveDate,
         additionalInformation: newMedicaidSubmission.additionalInformation,
@@ -226,19 +226,21 @@ describe("insertOneMacRecordsFromKafkaIntoMako", () => {
       {
         raiReceivedDate: ISO_DATETIME,
         raiWithdrawEnabled: false,
-        seatoolStatus: SEATOOL_STATUS.PENDING_RAI,
-        cmsStatus: statusToDisplayToCmsUser[SEATOOL_STATUS.PENDING_RAI],
-        stateStatus: statusToDisplayToStateUser[SEATOOL_STATUS.PENDING_RAI],
+        seatoolStatus: SEATOOL_STATUS.SUBMITTED,
+        cmsStatus: statusToDisplayToCmsUser[SEATOOL_STATUS.SUBMITTED],
+        stateStatus: statusToDisplayToStateUser[SEATOOL_STATUS.SUBMITTED],
+        initialIntakeNeeded: true,
         locked: true,
       },
     ],
     [
       "withdraw-rai",
       withdrawRai,
       {
-        seatoolStatus: SEATOOL_STATUS.PENDING_RAI,
-        cmsStatus: statusToDisplayToCmsUser[SEATOOL_STATUS.PENDING_RAI],
-        stateStatus: statusToDisplayToStateUser[SEATOOL_STATUS.PENDING_RAI],
+        seatoolStatus: SEATOOL_STATUS.RAI_RESPONSE_WITHDRAW_REQUESTED,
+        cmsStatus: statusToDisplayToCmsUser[SEATOOL_STATUS.RAI_RESPONSE_WITHDRAW_REQUESTED],
+        stateStatus: statusToDisplayToStateUser[SEATOOL_STATUS.RAI_RESPONSE_WITHDRAW_REQUESTED],
+        secondClock: false,
         raiWithdrawEnabled: false,
         locked: true,
       },
@@ -254,12 +256,12 @@ describe("insertOneMacRecordsFromKafkaIntoMako", () => {
       "withdraw-package",
       withdrawPackage,
       {
-        seatoolStatus: SEATOOL_STATUS.WITHDRAWN,
-        cmsStatus: statusToDisplayToCmsUser[SEATOOL_STATUS.WITHDRAWN],
-        stateStatus: statusToDisplayToStateUser[SEATOOL_STATUS.WITHDRAWN],
+        seatoolStatus: SEATOOL_STATUS.WITHDRAW_REQUESTED,
+        cmsStatus: statusToDisplayToCmsUser[SEATOOL_STATUS.WITHDRAW_REQUESTED],
+        stateStatus: statusToDisplayToStateUser[SEATOOL_STATUS.WITHDRAW_REQUESTED],
         locked: true,
-        finalDispositionDate: ISO_DATETIME,
-        initialIntakeNeeded: false,
+        secondClock: false,
+        initialIntakeNeeded: true,
         raiWithdrawEnabled: false,
       },
     ],

diff --git a/lib/packages/shared-types/opensearch/main/transforms/app-k.ts b/lib/packages/shared-types/opensearch/main/transforms/app-k.ts
@@ -3,7 +3,7 @@ import { seaToolFriendlyTimestamp } from "../../../../shared-utils/seatool-date-
 
 export const transform = () => {
   return events["app-k"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.PENDING);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.SUBMITTED);
     const timestampDate = new Date(data.timestamp);
     const todayEpoch = seaToolFriendlyTimestamp(timestampDate);
 
@@ -18,7 +18,7 @@ export const transform = () => {
       makoChangedDate: timestampDate.toISOString(),
       origin: "OneMAC",
       raiWithdrawEnabled: false, // Set to false for new submissions
-      seatoolStatus: SEATOOL_STATUS.PENDING,
+      seatoolStatus: SEATOOL_STATUS.SUBMITTED,
       state: data.id?.split("-")?.[0],
       stateStatus,
       statusDate: new Date(todayEpoch).toISOString(),

diff --git a/lib/packages/shared-types/opensearch/main/transforms/capitated-amendment.ts b/lib/packages/shared-types/opensearch/main/transforms/capitated-amendment.ts
@@ -3,7 +3,7 @@ import { seaToolFriendlyTimestamp } from "../../../../shared-utils/seatool-date-
 
 export const transform = () => {
   return events["capitated-amendment"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.PENDING);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.SUBMITTED);
     const timestampDate = new Date(data.timestamp);
     const todayEpoch = seaToolFriendlyTimestamp(timestampDate);
 
@@ -17,7 +17,7 @@ export const transform = () => {
       makoChangedDate: timestampDate.toISOString(),
       origin: "OneMAC",
       raiWithdrawEnabled: false, // Set to false for new submissions
-      seatoolStatus: SEATOOL_STATUS.PENDING,
+      seatoolStatus: SEATOOL_STATUS.SUBMITTED,
       state: data.id?.split("-")?.[0],
       stateStatus,
       statusDate: new Date(todayEpoch).toISOString(),

diff --git a/lib/packages/shared-types/opensearch/main/transforms/capitated-initial.ts b/lib/packages/shared-types/opensearch/main/transforms/capitated-initial.ts
@@ -3,7 +3,7 @@ import { seaToolFriendlyTimestamp } from "../../../../shared-utils/seatool-date-
 
 export const transform = () => {
   return events["capitated-initial"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.PENDING);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.SUBMITTED);
     const timestampDate = new Date(data.timestamp);
     const todayEpoch = seaToolFriendlyTimestamp(timestampDate);
 
@@ -17,7 +17,7 @@ export const transform = () => {
       makoChangedDate: timestampDate.toISOString(),
       origin: "OneMAC",
       raiWithdrawEnabled: false, // Set to false for new submissions
-      seatoolStatus: SEATOOL_STATUS.PENDING,
+      seatoolStatus: SEATOOL_STATUS.SUBMITTED,
       state: data.id?.split("-")?.[0],
       stateStatus,
       statusDate: new Date(todayEpoch).toISOString(),

diff --git a/lib/packages/shared-types/opensearch/main/transforms/capitated-renewal.ts b/lib/packages/shared-types/opensearch/main/transforms/capitated-renewal.ts
@@ -3,7 +3,7 @@ import { seaToolFriendlyTimestamp } from "../../../../shared-utils/seatool-date-
 
 export const transform = () => {
   return events["capitated-renewal"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.PENDING);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.SUBMITTED);
     const timestampDate = new Date(data.timestamp);
     const todayEpoch = seaToolFriendlyTimestamp(timestampDate);
 
@@ -17,7 +17,7 @@ export const transform = () => {
       makoChangedDate: timestampDate.toISOString(),
       origin: "OneMAC",
       raiWithdrawEnabled: false, // Set to false for new submissions
-      seatoolStatus: SEATOOL_STATUS.PENDING,
+      seatoolStatus: SEATOOL_STATUS.SUBMITTED,
       state: data.id?.split("-")?.[0],
       stateStatus,
       statusDate: new Date(todayEpoch).toISOString(),

diff --git a/lib/packages/shared-types/opensearch/main/transforms/contracting-amendment.ts b/lib/packages/shared-types/opensearch/main/transforms/contracting-amendment.ts
@@ -3,7 +3,7 @@ import { seaToolFriendlyTimestamp } from "../../../../shared-utils/seatool-date-
 
 export const transform = () => {
   return events["contracting-amendment"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.PENDING);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.SUBMITTED);
     const timestampDate = new Date(data.timestamp);
     const todayEpoch = seaToolFriendlyTimestamp(timestampDate);
 
@@ -17,7 +17,7 @@ export const transform = () => {
       makoChangedDate: timestampDate.toISOString(),
       origin: "OneMAC",
       raiWithdrawEnabled: false, // Set to false for new submissions
-      seatoolStatus: SEATOOL_STATUS.PENDING,
+      seatoolStatus: SEATOOL_STATUS.SUBMITTED,
       state: data.id?.split("-")?.[0],
       stateStatus,
       statusDate: new Date(todayEpoch).toISOString(),

diff --git a/lib/packages/shared-types/opensearch/main/transforms/contracting-initial.ts b/lib/packages/shared-types/opensearch/main/transforms/contracting-initial.ts
@@ -3,7 +3,7 @@ import { seaToolFriendlyTimestamp } from "../../../../shared-utils/seatool-date-
 
 export const transform = () => {
   return events["contracting-initial"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.PENDING);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.SUBMITTED);
     const timestampDate = new Date(data.timestamp);
     const todayEpoch = seaToolFriendlyTimestamp(timestampDate);
 
@@ -17,7 +17,7 @@ export const transform = () => {
       makoChangedDate: timestampDate.toISOString(),
       origin: "OneMAC",
       raiWithdrawEnabled: false, // Set to false for new submissions
-      seatoolStatus: SEATOOL_STATUS.PENDING,
+      seatoolStatus: SEATOOL_STATUS.SUBMITTED,
       state: data.id?.split("-")?.[0],
       stateStatus,
       statusDate: new Date(todayEpoch).toISOString(),

diff --git a/lib/packages/shared-types/opensearch/main/transforms/contracting-renewal.ts b/lib/packages/shared-types/opensearch/main/transforms/contracting-renewal.ts
@@ -3,7 +3,7 @@ import { seaToolFriendlyTimestamp } from "../../../../shared-utils/seatool-date-
 
 export const transform = () => {
   return events["contracting-renewal"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.PENDING);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.SUBMITTED);
     const timestampDate = new Date(data.timestamp);
     const todayEpoch = seaToolFriendlyTimestamp(timestampDate);
 
@@ -17,7 +17,7 @@ export const transform = () => {
       makoChangedDate: timestampDate?.toISOString(),
       origin: "OneMAC",
       raiWithdrawEnabled: false, // Set to false for new submissions
-      seatoolStatus: SEATOOL_STATUS.PENDING,
+      seatoolStatus: SEATOOL_STATUS.SUBMITTED,
       state: data.id?.split("-")?.[0],
       stateStatus,
       statusDate: new Date(todayEpoch).toISOString(),

diff --git a/lib/packages/shared-types/opensearch/main/transforms/new-chip-submission.ts b/lib/packages/shared-types/opensearch/main/transforms/new-chip-submission.ts
@@ -3,7 +3,7 @@ import { seaToolFriendlyTimestamp } from "../../../../shared-utils/seatool-date-
 
 export const transform = () => {
   return events["new-chip-submission"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.PENDING);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.SUBMITTED);
     const timestampDate = new Date(data.timestamp);
     const todayEpoch = seaToolFriendlyTimestamp(timestampDate);
 
@@ -17,7 +17,7 @@ export const transform = () => {
       makoChangedDate: timestampDate.toISOString(),
       origin: "OneMAC",
       raiWithdrawEnabled: false, // Set to false for new submissions
-      seatoolStatus: SEATOOL_STATUS.PENDING,
+      seatoolStatus: SEATOOL_STATUS.SUBMITTED,
       state: data.id?.split("-")?.[0],
       stateStatus,
       statusDate: new Date(todayEpoch).toISOString(),

diff --git a/lib/packages/shared-types/opensearch/main/transforms/new-medicaid-submission.ts b/lib/packages/shared-types/opensearch/main/transforms/new-medicaid-submission.ts
@@ -3,7 +3,7 @@ import { seaToolFriendlyTimestamp } from "../../../../shared-utils/seatool-date-
 
 export const transform = () => {
   return events["new-medicaid-submission"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.PENDING);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.SUBMITTED);
     const timestampDate = new Date(data.timestamp);
     const todayEpoch = seaToolFriendlyTimestamp(timestampDate);
 
@@ -17,7 +17,7 @@ export const transform = () => {
       makoChangedDate: timestampDate.toISOString(),
       origin: "OneMAC",
       raiWithdrawEnabled: false, // Set to false for new submissions
-      seatoolStatus: SEATOOL_STATUS.PENDING,
+      seatoolStatus: SEATOOL_STATUS.SUBMITTED,
       state: data.id?.split("-")?.[0],
       stateStatus,
       statusDate: new Date(todayEpoch).toISOString(),

diff --git a/lib/packages/shared-types/opensearch/main/transforms/respond-to-rai.ts b/lib/packages/shared-types/opensearch/main/transforms/respond-to-rai.ts
@@ -1,15 +1,16 @@
 import { events, getStatus, SEATOOL_STATUS } from "shared-types";
 export const transform = () => {
   return events["respond-to-rai"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.PENDING_RAI);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.SUBMITTED);
     return {
       id: data.id,
       raiWithdrawEnabled: false,
       makoChangedDate: data.timestamp ? new Date(data.timestamp).toISOString() : null,
       cmsStatus,
       stateStatus,
       raiReceivedDate: data.timestamp ? new Date(data.timestamp).toISOString() : null,
-      seatoolStatus: SEATOOL_STATUS.PENDING_RAI,
+      seatoolStatus: SEATOOL_STATUS.SUBMITTED,
+      initialIntakeNeeded: true,
       locked: true,
     };
   });

diff --git a/lib/packages/shared-types/opensearch/main/transforms/seatool.ts b/lib/packages/shared-types/opensearch/main/transforms/seatool.ts
@@ -8,7 +8,7 @@ import {
   seatoolSchema,
 } from "../../..";
 
-import { Authority, SEATOOL_AUTHORITIES } from "shared-types";
+import { SEATOOL_AUTHORITIES } from "shared-types";
 
 function getLeadAnalyst(eventData: SeaTool) {
   let leadAnalystOfficerId: null | number = null;
@@ -97,7 +97,7 @@ const isInSecondClock = (
   authority: any,
 ) => {
   if (
-    authority != Authority.CHIP_SPA && // if it's not a chip
+    authority !== "CHIP SPA" && // if it's not a chip
     [
       SEATOOL_STATUS.PENDING,
       SEATOOL_STATUS.PENDING_CONCURRENCE,

diff --git a/lib/packages/shared-types/opensearch/main/transforms/withdraw-package.ts b/lib/packages/shared-types/opensearch/main/transforms/withdraw-package.ts
@@ -2,16 +2,16 @@ import { events, getStatus, SEATOOL_STATUS } from "shared-types";
 
 export const transform = () => {
   return events["withdraw-package"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.WITHDRAWN);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.WITHDRAW_REQUESTED);
     return {
       id: data.id,
       raiWithdrawEnabled: false,
       makoChangedDate: data.timestamp ? new Date(data.timestamp).toISOString() : null,
       cmsStatus,
       stateStatus,
-      finalDispositionDate: data.timestamp ? new Date(data.timestamp).toISOString() : null,
-      seatoolStatus: SEATOOL_STATUS.WITHDRAWN,
-      initialIntakeNeeded: false,
+      secondClock: false,
+      seatoolStatus: SEATOOL_STATUS.WITHDRAW_REQUESTED,
+      initialIntakeNeeded: true,
       locked: true,
     };
   });

diff --git a/lib/packages/shared-types/opensearch/main/transforms/withdraw-rai-response.ts b/lib/packages/shared-types/opensearch/main/transforms/withdraw-rai-response.ts
@@ -2,14 +2,15 @@ import { events, getStatus, SEATOOL_STATUS } from "shared-types";
 
 export const transform = () => {
   return events["withdraw-rai"].schema.transform((data) => {
-    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.PENDING_RAI);
+    const { stateStatus, cmsStatus } = getStatus(SEATOOL_STATUS.RAI_RESPONSE_WITHDRAW_REQUESTED);
     return {
       id: data.id,
       raiWithdrawEnabled: false,
       makoChangedDate: data.timestamp ? new Date(data.timestamp).toISOString() : null,
       cmsStatus,
       stateStatus,
-      seatoolStatus: SEATOOL_STATUS.PENDING_RAI,
+      seatoolStatus: SEATOOL_STATUS.RAI_RESPONSE_WITHDRAW_REQUESTED,
+      secondClock: false,
       locked: true,
     };
   });

diff --git a/lib/packages/shared-types/statusHelper.ts b/lib/packages/shared-types/statusHelper.ts
@@ -10,6 +10,9 @@ export const SEATOOL_STATUS = {
   PENDING_APPROVAL: "Pending-Approval",
   UNKNOWN: "Unknown",
   PENDING_OFF_THE_CLOCK: "Pending-Off the Clock",
+  SUBMITTED: "Submitted",
+  RAI_RESPONSE_WITHDRAW_REQUESTED: "Formal RAI Response - Withdrawal Requested",
+  WITHDRAW_REQUESTED: "Withdrawal Requested",
 };
 
 export const statusToDisplayToStateUser = {
@@ -23,6 +26,9 @@ export const statusToDisplayToStateUser = {
   [SEATOOL_STATUS.UNSUBMITTED]: "Unsubmitted",
   [SEATOOL_STATUS.PENDING_APPROVAL]: "Under Review",
   [SEATOOL_STATUS.PENDING_OFF_THE_CLOCK]: "Pending - Off the Clock",
+  [SEATOOL_STATUS.SUBMITTED]: "Submitted",
+  [SEATOOL_STATUS.RAI_RESPONSE_WITHDRAW_REQUESTED]: "Formal RAI Response - Withdrawal Requested",
+  [SEATOOL_STATUS.WITHDRAW_REQUESTED]: "Withdrawal Requested",
 };
 
 export const statusToDisplayToCmsUser = {
@@ -36,6 +42,9 @@ export const statusToDisplayToCmsUser = {
   [SEATOOL_STATUS.UNSUBMITTED]: "Unsubmitted",
   [SEATOOL_STATUS.PENDING_APPROVAL]: "Pending - Approval",
   [SEATOOL_STATUS.PENDING_OFF_THE_CLOCK]: "Pending - Off the Clock",
+  [SEATOOL_STATUS.SUBMITTED]: "Submitted - Intake Needed",
+  [SEATOOL_STATUS.RAI_RESPONSE_WITHDRAW_REQUESTED]: "Formal RAI Response - Withdrawal Requested",
+  [SEATOOL_STATUS.WITHDRAW_REQUESTED]: "Submitted - Intake Needed",
 };
 
 export const finalDispositionStatuses = [