MCR-3772 MCR-3771 Edit and submit standalone rate

.gitignore

@@ -13,6 +13,7 @@ tsconfig.tsbuildinfo
 .serverless
 .eslintcache
 /.env
+.nx
 tests_output
 *.log
 coverage/

services/app-api/src/resolvers/rate/submitRate.ts

@@ -90,7 +90,7 @@ export function submitRate(
         const submittedRate = await store.submitRate({
             rateID,
             submittedByUserID: user.id,
-            submitReason,
+            submitReason: submitReason ?? 'Initial submission',
             formData: formData
                 ? {
                       rateType: (formData.rateType ??
@@ -140,7 +140,11 @@ export function submitRate(
                       actuaryCommunicationPreference:
                           formData.actuaryCommunicationPreference ?? undefined,
                       packagesWithSharedRateCerts:
-                          formData.packagesWithSharedRateCerts ?? [],
+                          formData.packagesWithSharedRateCerts.map((pkg) => ({
+                              packageName: pkg.packageName ?? undefined,
+                              packageId: pkg.packageId ?? undefined,
+                              packageStatus: pkg.packageStatus ?? undefined,
+                          })),
                   }
                 : undefined,
         })

services/app-api/src/testHelpers/gqlHelpers.ts

@@ -262,6 +262,7 @@ const createAndUpdateTestHealthPlanPackage = async (
             rateProgramIDs: [ratePrograms.reverse()[0].id],
             actuaryContacts: [
                 {
+                    id: '123-abc',
                     name: 'test name',
                     titleRole: 'test title',
                     email: 'email@example.com',
@@ -275,6 +276,7 @@ const createAndUpdateTestHealthPlanPackage = async (
     ]
     draft.addtlActuaryContacts = [
         {
+            id: '123-addtl-abv',
             name: 'test name',
             titleRole: 'test title',
             email: 'email@example.com',

services/app-graphql/src/mutations/submitRate.graphql

@@ -52,13 +52,15 @@ mutation submitRate($input: SubmitRateInput!) {
                     rateProgramIDs,
                     rateCertificationName,
                     certifyingActuaryContacts {
+                        id
                         name
                         titleRole
                         email
                         actuarialFirm
                         actuarialFirmOther
                     },
                     addtlActuaryContacts {
+                        id
                         name
                         titleRole
                         email

services/app-graphql/src/mutations/unlockRate.graphql

@@ -33,13 +33,15 @@ fragment rateRevisionFragment on RateRevision {
         rateProgramIDs,
         rateCertificationName,
         certifyingActuaryContacts {
+            id
             name
             titleRole
             email
             actuarialFirm
             actuarialFirmOther
         },
         addtlActuaryContacts {
+            id
             name
             titleRole
             email

services/app-graphql/src/queries/fetchRate.graphql

@@ -33,13 +33,15 @@ fragment rateRevisionFragment on RateRevision {
         rateProgramIDs,
         rateCertificationName,
         certifyingActuaryContacts {
+            id
             name
             titleRole
             email
             actuarialFirm
             actuarialFirmOther
         },
         addtlActuaryContacts {
+            id
             name
             titleRole
             email

services/app-graphql/src/schema.graphql

@@ -1013,6 +1013,7 @@ enum ActuarialFirm {
 
 "Contact information for the certifying or additional state actuary"
 type ActuaryContact {
+  id: ID
   name: String
   titleRole: String
   email: String
@@ -1022,6 +1023,7 @@ type ActuaryContact {
 
 "Contact information input for the certifying or additional state actuary"
 input ActuaryContactInput  {
+    id: ID
     name: String
     titleRole: String
     email: String
@@ -1037,13 +1039,13 @@ It's used as a part of RateFormData
 type PackageWithSameRate  {
   packageName: String!
   packageId: String!
-  packageStatus: String
+  packageStatus:  HealthPlanPackageStatus
 }
 
 input PackageWithSameRateInput  {
     packageName: String!
     packageId: String!
-    packageStatus: HealthPlanPackageStatus!
+    packageStatus: HealthPlanPackageStatus
 }
 
 """
@@ -1327,7 +1329,7 @@ input RateFormDataInput {
     An array of additional ActuaryContacts
     Each element includes the the name, title/role and email
     """
-    addtlActuaryContacts: [ActuaryContactInput!]!
+    addtlActuaryContacts: [ActuaryContactInput!]
     """
     Is either OACT_TO_ACTUARY or OACT_TO_STATE
     It specifies whether the state wants CMS to reach out to their actuaries
@@ -1345,8 +1347,8 @@ input RateFormDataInput {
 
 input SubmitRateInput {
     rateID: ID!
-    "User given submission description"
-    submitReason: String!
+    "User given submission description - defaults to Initial submission if left blank"
+    submitReason: String
     "Rate related form data to be updated with submission"
     formData: RateFormDataInput
 }

services/app-proto/src/health_plan_form_data.proto

@@ -70,6 +70,7 @@ message Contact {
   optional string name = 1;
   optional string title_role = 2;
   optional string email = 3;
+  optional string id = 4;
 }
 
 // ContractInfo subtypes

services/app-web/src/common-code/proto/healthPlanFormDataProto/zodSchemas.ts

@@ -96,6 +96,7 @@ const stateContactSchema = z.object({
 })
 
 const actuaryContactSchema = z.object({
+    id: z.string().optional(),
     name: z.string().optional(),
     titleRole: z.string().optional(),
     email: z.string().optional(),

services/app-web/src/formHelpers/formatters.ts

@@ -4,6 +4,7 @@ import {
     ActuaryContact,
 } from '../common-code/healthPlanFormDataType'
 import { FileItemT } from '../components'
+import { GenericDocument, ActuaryContact as  GQLActuaryContact } from '../gen/gqlClient'
 import { S3ClientT } from '../s3'
 import { v4 as uuidv4 } from 'uuid'
 
@@ -21,18 +22,6 @@ const formatForApi = (attribute: string): string | null => {
     return attribute
 }
 
-const formatYesNoForProto = (
-    attribute: string | undefined
-): boolean | undefined => {
-    if (attribute === 'YES') {
-        return true
-    }
-    if (attribute === 'NO') {
-        return false
-    }
-    return undefined
-}
-
 // Convert api data for use in form.  Form fields must be a string.
 // Empty values as an empty string, dates in date picker as YYYY-MM-DD, boolean as "Yes" "No" values
 const formatForForm = (
@@ -49,9 +38,19 @@ const formatForForm = (
     }
 }
 
-const formatActuaryContactsForForm = (actuaryContacts?: ActuaryContact[]) => {
-    return actuaryContacts && actuaryContacts.length > 0
-        ? actuaryContacts
+// This function can be cleaned up when we move off domain types and only use graphql
+const formatActuaryContactsForForm = (actuaryContacts?: ActuaryContact[] | GQLActuaryContact[]) : ActuaryContact[] => {
+    return actuaryContacts &&  actuaryContacts.length > 0
+        ? actuaryContacts.map( (contact) => {
+            const {name, titleRole,email,actuarialFirm, actuarialFirmOther} = contact
+                    return {
+                    name: name ?? '',
+                    titleRole: titleRole ?? '',
+                    email: email ?? '',
+                    actuarialFirmOther: actuarialFirmOther ?? undefined,
+                    actuarialFirm: actuarialFirm ?? undefined,
+                }
+        })
         : [
               {
                   name: '',
@@ -63,16 +62,15 @@ const formatActuaryContactsForForm = (actuaryContacts?: ActuaryContact[]) => {
           ]
 }
 
-const formatFormDateForDomain = (attribute: string): Date | undefined => {
-    if (attribute === '') {
-        return undefined
-    }
-    return dayjs.utc(attribute).toDate()
+
+
+const formatFormDateForGQL = (attribute: string): string | undefined => {
+    return (attribute === '') ? undefined :  attribute
 }
 
-const formatDocumentsForDomain = (
+const formatDocumentsForGQL = (
     fileItems: FileItemT[]
-): SubmissionDocument[] => {
+): GenericDocument[] => {
     return fileItems.reduce((cleanedFileItems, fileItem) => {
         if (fileItem.status === 'UPLOAD_ERROR') {
             console.info(
@@ -102,14 +100,14 @@ const formatDocumentsForDomain = (
             })
         }
         return cleanedFileItems
-    }, [] as SubmissionDocument[])
+    }, [] as GenericDocument[])
 }
 
 const formatDocumentsForForm = ({
     documents,
     getKey,
 }: {
-    documents?: SubmissionDocument[]
+    documents?: SubmissionDocument[] | GenericDocument[]
     getKey: S3ClientT['getKey'] // S3 function to call when formatting to double check we have valid documents, probably the backend should be doing this to reduce client async errors handling with bad data
 }): FileItemT[] => {
     if (!documents) return []
@@ -134,13 +132,72 @@ const formatDocumentsForForm = ({
                 name: doc.name,
                 key: key,
                 s3URL: doc.s3URL,
-                sha256: doc.sha256,
+                sha256: doc.sha256 ?? undefined,
                 status: 'UPLOAD_COMPLETE',
             }
         }) || []
     )
 }
 
+// DEPRECATED
+// Domain helpers are for HPP code. We are migrating off this in favor of directly using GQL utilities
+
+const formatFormDateForDomain = (attribute: string): Date | undefined => {
+    if (attribute === '') {
+        return undefined
+    }
+    return dayjs.utc(attribute).toDate()
+}
+
+
+
+const formatDocumentsForDomain = (
+    fileItems: FileItemT[]
+): SubmissionDocument[] => {
+    return fileItems.reduce((cleanedFileItems, fileItem) => {
+        if (fileItem.status === 'UPLOAD_ERROR') {
+            console.info(
+                'Attempting to save files that failed upload, discarding invalid files'
+            )
+        } else if (fileItem.status === 'SCANNING_ERROR') {
+            console.info(
+                'Attempting to save files that failed scanning, discarding invalid files'
+            )
+        } else if (fileItem.status === 'DUPLICATE_NAME_ERROR') {
+            console.info(
+                'Attempting to save files that are duplicate names, discarding duplicate'
+            )
+        } else if (!fileItem.s3URL) {
+            console.info(
+                'Attempting to save a seemingly valid file item is not yet uploaded to S3, this should not happen on form submit. Discarding file.'
+            )
+        } else if (!fileItem.sha256) {
+            console.info(
+                'Attempting to save a seemingly valid file item does not have a sha256 yet. this should not happen on form submit. Discarding file.'
+            )
+        } else {
+            cleanedFileItems.push({
+                name: fileItem.name,
+                s3URL: fileItem.s3URL,
+                sha256: fileItem.sha256,
+            })
+        }
+        return cleanedFileItems
+    }, [] as SubmissionDocument[])
+}
+
+const formatYesNoForProto = (
+    attribute: string | undefined
+): boolean | undefined => {
+    if (attribute === 'YES') {
+        return true
+    }
+    if (attribute === 'NO') {
+        return false
+    }
+    return undefined
+}
+
 export {
     formatForApi,
     formatForForm,
@@ -150,4 +207,6 @@ export {
     formatDocumentsForDomain,
     formatDocumentsForForm,
     formatActuaryContactsForForm,
+    formatDocumentsForGQL,
+    formatFormDateForGQL
 }

services/app-web/src/pages/App/AppRoutes.tsx

@@ -37,7 +37,7 @@ import {
     UploadQuestions,
 } from '../QuestionResponse'
 import { GraphQLExplorer } from '../GraphQLExplorer/GraphQLExplorer'
-import { RateSummary } from '../SubmissionSummary/RateSummary'
+import { RateSummary } from '../RateSummary'
 import { RateEdit } from '../RateEdit/RateEdit'
 import { APIAccess } from '../APIAccess/APIAccess'
 
@@ -109,16 +109,16 @@ const StateUserRoutes = ({
                     element={<NewStateSubmissionForm />}
                 />
                 {showRatePages && (
-                    <Route
-                        path={RoutesRecord.RATE_EDIT}
-                        element={<RateEdit />}
-                    />
-                )}
-                {showRatePages && (
-                    <Route
-                        path={RoutesRecord.RATES_SUMMARY}
-                        element={<RateSummary />}
-                    />
+                    <>
+                        <Route
+                            path={RoutesRecord.RATES_SUMMARY}
+                            element={<RateSummary />}
+                        />
+                        <Route
+                            path={RoutesRecord.RATE_EDIT}
+                            element={<RateEdit />}
+                        />
+                    </>
                 )}
                 <Route element={<SubmissionSideNav />}>
                     {showQuestionResponse && (

services/app-web/src/pages/RateEdit/RateEdit.test.tsx

@@ -1,4 +1,5 @@
 import { screen, waitFor } from '@testing-library/react'
+
 import { renderWithProviders } from '../../testHelpers'
 import { RateEdit } from './RateEdit'
 import {
@@ -44,7 +45,9 @@ describe('RateEdit', () => {
             })
 
             await waitFor(() => {
-                expect(screen.queryByTestId('rate-edit')).toBeInTheDocument()
+                expect(
+                    screen.queryByTestId('single-rate-edit')
+                ).toBeInTheDocument()
             })
         })
     })