From 8f34bebb51fd66e7f09d9160250ccfa368069a79 Mon Sep 17 00:00:00 2001 From: Mike Dial Date: Thu, 22 Aug 2024 15:59:02 -0400 Subject: [PATCH] manual conflict resolutions for prior merge --- lib/libs/email/content/new-submission.ts | 366 +++++++---------------- lib/libs/email/content/respondToRai.ts | 127 +++++++- lib/libs/email/content/tempExtention.ts | 4 +- lib/libs/email/content/withdawPackage.ts | 12 +- 4 files changed, 237 insertions(+), 272 deletions(-) diff --git a/lib/libs/email/content/new-submission.ts b/lib/libs/email/content/new-submission.ts index 2e578837b2..b7c522200b 100644 --- a/lib/libs/email/content/new-submission.ts +++ b/lib/libs/email/content/new-submission.ts @@ -248,282 +248,132 @@ Thank you!`, }; }, }, - [Authority["1915b"]]: { - cms: async (variables: OneMac & CommonVariables) => { - return { - subject: `${variables.authority} ${variables.id} Submitted`, - html: ` -

The OneMAC Submission Portal received a 1915(b) ${ - variables.actionType - } Submission:

- -

-
State or territory: ${variables.territory} -
Name: ${variables.submitterName} -
Email Address: ${variables.submitterEmail} -
${variables.actionType} Number: ${variables.id} -

Waiver Authority: ${variables.authority} -
Proposed Effective Date: ${DateTime.fromMillis( - variables.notificationMetadata?.proposedEffectiveDate!, - ).toFormat("DDDD")} -

- Summary: -
${variables.additionalInformation} -
-
Files: -
${formatAttachments("html", variables.attachments)} -
-

If the contents of this email seem suspicious, do not open them, and instead - forward this email to SPAM@cms.hhs.gov.

-

Thank you!

`, - text: ` - The OneMAC Submission Portal received a 1915(b) ${ - variables.actionType - } submission: - - The submission can be accessed in the OneMAC application, which you - can find at ${variables.applicationEndpointUrl}. - - If you are not already logged in, please click the "Login" link - at the top of the page and log in using your Enterprise User - Administration (EUA) credentials. - - After you have logged in, you will be taken to the OneMAC application. - The submission will be listed on the dashboard page, and you can view its - details by clicking on its ID number. - - - State or territory: ${variables.territory} - Name: ${variables.submitterName} - Email: ${variables.submitterEmail} - ${variables.actionType} Number: ${variables.id} - - Waiver Authority: ${variables.authority} - Proposed Effective Date: ${DateTime.fromMillis( - variables.notificationMetadata?.proposedEffectiveDate!, - ).toFormat("DDDD")} - - Summary: - ${variables.additionalInformation} - - Files: - ${formatAttachments("html", variables.attachments)} - - If the contents of this email seem suspicious, do not open them, and instead - forward this email to SPAM@cms.hhs.gov. - - Thank you!`, - }; - }, - state: async (variables: OneMac & CommonVariables) => { - return { - subject: `Your ${variables.actionType} ${variables.id} has been submitted to CMS`, - html: ` -

This response confirms the submission of your 1915(b) ${ - variables.actionType - } to CMS for review:

-

-
State or territory: ${variables.territory} -
Name: ${variables.submitterName} -
Email Address: ${variables.submitterEmail} -
${variables.actionType} Number: ${variables.id} -
Waiver Authority: ${variables.authority} -
Proposed Effective Date: ${DateTime.fromMillis( - variables.notificationMetadata?.proposedEffectiveDate!, - ).toFormat("DDDD")} -
90th Day Deadline: ${formatNinetyDaysDate( - variables.notificationMetadata?.submissionDate, - )} -

- Summary: -
${variables.additionalInformation} -
-

This response confirms the receipt of your Waiver request or your response - to a Waiver Request for Additional Information (RAI). You can expect a formal - response to your submittal to be issued within 90 days, - before ${formatNinetyDaysDate( - variables.notificationMetadata?.submissionDate, - )}.

-

This mailbox is for the submittal of Section 1915(b) and 1915(c) Waivers, - responses to Requests for Additional Information (RAI) on Waivers, - and extension requests on Waivers only. Any other correspondence will be disregarded

-

If you have questions or did not expect this email, please contact - spa@cms.hhs.gov or your state lead.

-

Thank you!

`, - text: ` - This response confirms the submission of your 1915(b) ${ - variables.actionType - } to CMS for review: - - State or territory: ${variables.territory} - Name: ${variables.submitterName} - Email Address: ${variables.submitterEmail} - ${variables.actionType} Number: ${variables.id} - Waiver Authority: ${variables.authority} - Proposed Effective Date: ${DateTime.fromMillis( - variables.notificationMetadata?.proposedEffectiveDate!, - ).toFormat("DDDD")} - 90th Day Deadline: ${formatNinetyDaysDate( - variables.notificationMetadata?.submissionDate, - )} - - Summary: - ${variables.additionalInformation} - - This response confirms the receipt of your Waiver request or your response - to a Waiver Request for Additional Information (RAI). You can expect a formal - response to your submittal to be issued within 90 days, - before ${formatNinetyDaysDate( - variables.notificationMetadata?.submissionDate, - )}. - - This mailbox is for the submittal of Section 1915(b) and 1915(c) Waivers, - responses to Requests for Additional Information (RAI) on Waivers, - and extension requests on Waivers only. Any other correspondence will be disregarded - - If you have questions or did not expect this email, please contact - spa@cms.hhs.gov or your state lead. - - Thank you!`, - }; - }, - }, + [Authority["1915c"]]: { cms: async (variables: OneMac & CommonVariables) => { return { subject: `1915(c) ${variables.id} Submitted`, html: ` -

The OneMAC Submission Portal received a 1915(c) Appendix K Amendment Submission:

- -

-
State or territory: ${variables.territory} -
Name: ${variables.submitterName} -
Email Address: ${variables.submitterEmail} -
Amendment Title: ${variables.appkTitle} -
Waiver Amendment Number: ${variables.id} -
Waiver Authority: 1915(c) -
Proposed Effective Date: ${formatDate( - variables.notificationMetadata?.proposedEffectiveDate!, - )} -

-Summary: -
${variables.additionalInformation} -
Files: -
${formatAttachments("html", variables.attachments)} -

If the contents of this email seem suspicious, do not open them, and instead -forward this email to SPAM@cms.hhs.gov.

-

Thank you!

`, +

The OneMAC Submission Portal received a 1915(c) Appendix K Amendment Submission:

+ +

+
State or territory: ${variables.territory} +
Name: ${variables.submitterName} +
Email Address: ${variables.submitterEmail} +
Amendment Title: ${variables.appkTitle} +
Waiver Amendment Number: ${variables.id} +
Waiver Authority: 1915(c) +
Proposed Effective Date: ${formatDate( + variables.notificationMetadata?.proposedEffectiveDate!, + )} +

+ Summary: +
${variables.additionalInformation} +
Files: +
${formatAttachments("html", variables.attachments)} +

If the contents of this email seem suspicious, do not open them, and instead + forward this email to SPAM@cms.hhs.gov.

+

Thank you!

`, text: ` -This response confirms the submission of your [insert Waiver Action] to CMS for review: + This response confirms the submission of your [insert Waiver Action] to CMS for review: -State or territory: ${variables.territory} -Name: ${variables.submitterName} -Email Address: ${variables.submitterEmail} -Amendment Title: ${variables.appkTitle} -Waiver Amendment Number: ${variables.id} -Waiver Authority: 1915(c) -Proposed Effective Date: ${formatDate( - variables.notificationMetadata?.proposedEffectiveDate!, - )} + State or territory: ${variables.territory} + Name: ${variables.submitterName} + Email Address: ${variables.submitterEmail} + Amendment Title: ${variables.appkTitle} + Waiver Amendment Number: ${variables.id} + Waiver Authority: 1915(c) + Proposed Effective Date: ${formatDate( + variables.notificationMetadata?.proposedEffectiveDate!, + )} -Summary: -${variables.additionalInformation} + Summary: + ${variables.additionalInformation} -Files: -${formatAttachments("html", variables.attachments)} + Files: + ${formatAttachments("html", variables.attachments)} -If the contents of this email seem suspicious, do not open them, and instead forward this email to SPAM@CMS.HHS.gov + If the contents of this email seem suspicious, do not open them, and instead forward this email to SPAM@CMS.HHS.gov -Thank you! -`, + Thank you! + `, }; }, state: async (variables: OneMac & CommonVariables) => { return { subject: `Your 1915(c) ${variables.id} has been submitted to CMS`, html: ` -

This response confirms the submission of your 1915(c) Waiver to CMS for review:

-

-
State or territory: ${variables.territory} -
Name: ${variables.submitterName} -
Email Address: ${variables.submitterEmail} -
Initial Waiver Number: ${variables.id} -
Waiver Authority: 1915(c) -
Proposed Effective Date: ${formatDate( - variables.notificationMetadata?.proposedEffectiveDate!, - )} -
90th Day Deadline: ${formatNinetyDaysDate( - variables.notificationMetadata?.submissionDate, - )} -

-Summary: -
${variables.additionalInformation} -

-This response confirms the receipt of your Waiver request or your response -to a Waiver Request for Additional Information (RAI). You can expect a formal -response to your submittal to be issued within 90 days, before ${formatNinetyDaysDate( - variables.notificationMetadata?.submissionDate, - )}. -

-

-This mailbox is for the submittal of Section 1915(b) and 1915(c) Waivers, -responses to Requests for Additional Information (RAI) on Waivers, and -extension requests on Waivers only. Any other correspondence will be disregarded. -

-

If you have questions, please contact -spa@cms.hhs.gov or your state lead.

-

Thank you!

`, +

This response confirms the submission of your 1915(c) Waiver to CMS for review:

+

+
State or territory: ${variables.territory} +
Name: ${variables.submitterName} +
Email Address: ${variables.submitterEmail} +
Initial Waiver Number: ${variables.id} +
Waiver Authority: 1915(c) +
Proposed Effective Date: ${formatDate( + variables.notificationMetadata?.proposedEffectiveDate!, + )} +
90th Day Deadline: ${formatNinetyDaysDate( + variables.notificationMetadata?.submissionDate, + )} +

+ Summary: +
${variables.additionalInformation} +

+ This response confirms the receipt of your Waiver request or your response + to a Waiver Request for Additional Information (RAI). You can expect a formal + response to your submittal to be issued within 90 days, before ${formatNinetyDaysDate( + variables.notificationMetadata?.submissionDate, + )}. +

+

+ This mailbox is for the submittal of Section 1915(b) and 1915(c) Waivers, + responses to Requests for Additional Information (RAI) on Waivers, and + extension requests on Waivers only. Any other correspondence will be disregarded. +

+

If you have questions, please contact + spa@cms.hhs.gov or your state lead.

+

Thank you!

`, text: ` -This response confirms the submission of your 1915(c) Waiver to CMS for review: - -State or territory:${variables.territory} -Name: ${variables.submitterName} -Email Address: ${variables.submitterEmail} -Initial Waiver Number: ${variables.id} -Waiver Authority: 1915(c) -Proposed Effective Date: ${formatDate( - variables.notificationMetadata?.proposedEffectiveDate!, - )} -90th Day Deadline: ${formatNinetyDaysDate( - variables.notificationMetadata?.submissionDate, - )} - -Summary: -${variables.additionalInformation} - -This response confirms the receipt of your Waiver request or your response -to a Waiver Request for Additional Information (RAI). You can expect a formal -response to your submittal to be issued within 90 days, before ${formatNinetyDaysDate( - variables.notificationMetadata?.submissionDate, - )}. - -This mailbox is for the submittal of Section 1915(b) and 1915(c) Waivers, -responses to Requests for Additional Information (RAI) on Waivers, and -extension requests on Waivers only. Any other correspondence will be disregarded. - -If you have questions, please contact SPA@cms.hhs.gov or your state lead. - -Thank you!`, + This response confirms the submission of your 1915(c) Waiver to CMS for review: + + State or territory:${variables.territory} + Name: ${variables.submitterName} + Email Address: ${variables.submitterEmail} + Initial Waiver Number: ${variables.id} + Waiver Authority: 1915(c) + Proposed Effective Date: ${formatDate( + variables.notificationMetadata?.proposedEffectiveDate!, + )} + 90th Day Deadline: ${formatNinetyDaysDate( + variables.notificationMetadata?.submissionDate, + )} + + Summary: + ${variables.additionalInformation} + + This response confirms the receipt of your Waiver request or your response + to a Waiver Request for Additional Information (RAI). You can expect a formal + response to your submittal to be issued within 90 days, before ${formatNinetyDaysDate( + variables.notificationMetadata?.submissionDate, + )}. + + This mailbox is for the submittal of Section 1915(b) and 1915(c) Waivers, + responses to Requests for Additional Information (RAI) on Waivers, and + extension requests on Waivers only. Any other correspondence will be disregarded. + + If you have questions, please contact SPA@cms.hhs.gov or your state lead. + + Thank you!`, }; }, }, diff --git a/lib/libs/email/content/respondToRai.ts b/lib/libs/email/content/respondToRai.ts index 45e22e7c54..8f95895d13 100644 --- a/lib/libs/email/content/respondToRai.ts +++ b/lib/libs/email/content/respondToRai.ts @@ -228,7 +228,7 @@ Thank you!`, return { subject: `Waiver RAI Response for ${variables.id} Submitted`, html: ` -

The OneMAC Submission Portal received a 1915(b) Waiver RAI Response Submission:

+

The OneMAC Submission Portal received a ${variables.authority} Waiver RAI Response Submission:

  • The submission can be accessed in the OneMAC application, which you can find at this link.
  • @@ -254,7 +254,7 @@ Summary: forward this email to SPAM@cms.hhs.gov.

    Thank you!

    `, text: ` -The OneMAC Submission Portal received a 1915(b) Waiver RAI Response Submission: +The OneMAC Submission Portal received a ${variables.authority} Waiver RAI Response Submission: - The submission can be accessed in the OneMAC application, which you can find at ${variables.applicationEndpointUrl}. @@ -284,9 +284,9 @@ Thank you!`, }, state: async (variables: RaiResponse & CommonVariables) => { return { - subject: `Your 1915(b) Waiver RAI Response for ${variables.id} has been submitted to CMS`, + subject: `Your ${variables.authority} Waiver RAI Response for ${variables.id} has been submitted to CMS`, html: ` -

    This response confirms the submission of your 1915(b) Waiver RAI Response to CMS for review:

    +

    This response confirms the submission of your ${variables.authority} Waiver RAI Response to CMS for review:


    State or territory: ${variables.territory}
    Name: ${variables.submitterName} @@ -302,7 +302,7 @@ Summary: response to a Waiver Request for Additional Information (RAI). You can expect a formal response to your submittal to be issued within 90 days, before ${formatNinetyDaysDate(variables.responseDate)}.

    -

    This mailbox is for the submittal of Section 1915(b) and 1915(c) Waivers, +

    This mailbox is for the submittal of Section ${variables.authority} and 1915(c) Waivers, responses to Requests for Additional Information (RAI) on Waivers, and extension requests on Waivers only. Any other correspondence will be disregarded.

    @@ -311,7 +311,122 @@ requests on Waivers only. Any other correspondence will be disregarded. or your state lead.

    Thank you!

    `, text: ` -This response confirms the submission of your 1915(b) Waiver RAI Response to CMS for review: +This response confirms the submission of your ${variables.authority} Waiver RAI Response to CMS for review: + +State or territory: ${variables.territory} +Name: ${variables.submitterName} +Email Address: ${variables.submitterEmail} +Initial Waiver Number: ${variables.id} +Waiver Authority: ${variables.authority} +90th Day Deadline: ${formatNinetyDaysDate(variables.responseDate)} + +Summary: +${variables.additionalInformation} + +This response confirms the receipt of your Waiver request or your +response to a Waiver Request for Additional Information (RAI). +You can expect a formal response to your submittal to be issued within 90 days, +before ${formatNinetyDaysDate(variables.responseDate)}. + +This mailbox is for the submittal of Section 1915(b) and 1915(c) Waivers, +responses to Requests for Additional Information (RAI) on Waivers, and extension +requests on Waivers only. Any other correspondence will be disregarded. + +If you have questions, please contact CHIPSPASubmissionMailbox@cms.hhs.gov or your state lead. + +Thank you!`, + }; + }, + }, + [Authority["1915c"]]: { + cms: async (variables: RaiResponse & CommonVariables) => { + return { + subject: `Waiver RAI Response for ${variables.id} Submitted`, + html: ` +

    The OneMAC Submission Portal received a ${variables.authority} Waiver RAI Response Submission:

    +
      +
    • The submission can be accessed in the OneMAC application, which you +can find at this link.
    • +
    • If you are not already logged in, please click the "Login" link +at the top of the page and log in using your Enterprise User +Administration (EUA) credentials.
    • +
    • After you have logged in, you will be taken to the OneMAC application. +The submission will be listed on the dashboard page, and you can view its +details by clicking on its ID number.
    • +
    +

    +
    State or territory: ${variables.territory} +
    Name: ${variables.submitterName} +
    Email Address: ${variables.submitterEmail} +
    Waiver Number: ${variables.id} +

    +Summary: +
    ${variables.additionalInformation} +
    +
    Files: +
    ${formatAttachments("html", variables.attachments)} +

    If the contents of this email seem suspicious, do not open them, and instead +forward this email to SPAM@cms.hhs.gov.

    +

    Thank you!

    `, + text: ` +The OneMAC Submission Portal received a ${variables.authority} Waiver RAI Response Submission: + +- The submission can be accessed in the OneMAC application, which you can + find at ${variables.applicationEndpointUrl}. +- If you are not already logged in, please click the "Login" link at the top + of the page and log in using your Enterprise User Administration (EUA) + credentials. +- After you have logged in, you will be taken to the OneMAC application. + The submission will be listed on the dashboard page, and you can view its + details by clicking on its ID number. + +State or territory: ${variables.territory} +Name: ${variables.submitterName} +Email Address: ${variables.submitterEmail} +Waiver Number: ${variables.id} + +Summary: +${variables.additionalInformation} + +Files: +${formatAttachments("text", variables.attachments)} + +If the contents of this email seem suspicious, do not open them, and instead +forward this email to SPAM@cms.hhs.gov. + +Thank you!`, + }; + }, + state: async (variables: RaiResponse & CommonVariables) => { + return { + subject: `Your ${variables.authority} Waiver RAI Response for ${variables.id} has been submitted to CMS`, + html: ` +

    This response confirms the submission of your ${variables.authority} Waiver RAI Response to CMS for review:

    +

    +
    State or territory: ${variables.territory} +
    Name: ${variables.submitterName} +
    Email Address: ${variables.submitterEmail} +
    Initial Waiver Number: ${variables.id} +
    Waiver Authority: ${variables.authority} +
    90th Day Deadline: ${formatNinetyDaysDate(variables.responseDate)} +

    +Summary: +
    ${variables.additionalInformation} +
    +

    This response confirms the receipt of your Waiver request or your +response to a Waiver Request for Additional Information (RAI). +You can expect a formal response to your submittal to be issued within 90 days, +before ${formatNinetyDaysDate(variables.responseDate)}.

    +

    This mailbox is for the submittal of Section ${variables.authority} and 1915(c) Waivers, +responses to Requests for Additional Information (RAI) on Waivers, and extension +requests on Waivers only. Any other correspondence will be disregarded. +

    +

    If you have questions, please contact +spa@cms.hhs.gov +or your state lead.

    +

    Thank you!

    `, + text: ` +This response confirms the submission of your ${variables.authority} Waiver RAI Response to CMS for review: State or territory: ${variables.territory} Name: ${variables.submitterName} diff --git a/lib/libs/email/content/tempExtention.ts b/lib/libs/email/content/tempExtention.ts index 9e13a94404..ed756137b2 100644 --- a/lib/libs/email/content/tempExtention.ts +++ b/lib/libs/email/content/tempExtention.ts @@ -6,7 +6,7 @@ export const tempExtention = { return { subject: `${variables.authority} Waiver Extension ${variables.id} Submitted`, html: ` -

    The Submission Portal received a ${ +

    The OneMAC Submission Portal received a ${ variables.authority } Waiver Extension Submission:

      @@ -34,7 +34,7 @@ Summary: forward this email to SPAM@cms.hhs.gov.

      Thank you!

      `, text: ` -The Submission Portal received a ${ +The OneMAC Submission Portal received a ${ variables.authority } Waiver Extension Submission: diff --git a/lib/libs/email/content/withdawPackage.ts b/lib/libs/email/content/withdawPackage.ts index 628d905de9..1346671cdb 100644 --- a/lib/libs/email/content/withdawPackage.ts +++ b/lib/libs/email/content/withdawPackage.ts @@ -133,7 +133,7 @@ Summary: forward this email to SPAM@cms.hhs.gov.

      Thank you!

      `, text: ` -he OneMAC Submission Portal received a request to withdraw the package below. +The OneMAC Submission Portal received a request to withdraw the package below. The package will no longer be considered for CMS review: State or territory: ${variables.territory} @@ -151,16 +151,16 @@ Thank you!`, }, state: async (variables: WithdrawPackage & CommonVariables) => { return { - subject: `1915(b) Waiver ${variables.id} Withdrawal Confirmation`, + subject: `${variables.authority} Waiver ${variables.id} Withdrawal Confirmation`, html: ` -

      This email is to confirm 1915(b) Waiver ${variables.id} was withdrawn -by ${variables.submitterName}. The review of 1915(b) Waiver ${variables.id} has concluded.

      +

      This email is to confirm ${variables.authority} Waiver ${variables.id} was withdrawn +by ${variables.submitterName}. The review of ${variables.authority} Waiver ${variables.id} has concluded.

      If you have questions, please contact spa@cms.hhs.gov or your state lead.

      Thank you!

      `, text: ` -This email is to confirm 1915(b) Waiver ${variables.id} was withdrawn by ${variables.submitterName}. -The review of 1915(b) Waiver ${variables.id} has concluded. +This email is to confirm ${variables.authority} Waiver ${variables.id} was withdrawn by ${variables.submitterName}. +The review of ${variables.authority} Waiver ${variables.id} has concluded. If you have questions, please contact spa@cms.hhs.gov or your state lead.