Merge branch 'main' of https://github.com/Enterprise-CMCS/managed-car…

…e-review into mcr-3839-restrict-authorizer-by-ip

services/app-api/src/domain-models/healthPlanPackage.test.ts

@@ -124,7 +124,9 @@ describe('HealthPlanPackage helpers', () => {
                     stateCode: 'FL' as const,
                     revisions: [],
                 },
-                new Error('No revisions on this submission'),
+                new Error(
+                    'No revisions on this submission with contractID: foo'
+                ),
             ],
         ]
 

services/app-api/src/domain-models/healthPlanPackage.ts

@@ -30,7 +30,9 @@ function packageStatus(
         return 'UNLOCKED'
     }
 
-    return new Error('No revisions on this submission')
+    return new Error(
+        `No revisions on this submission with contractID: ${pkg.id}`
+    )
 }
 
 // submissionSubmittedAt returns the INITIAL submission date. Even if the

services/app-api/src/postgres/contractAndRates/findRateWithHistory.test.ts

@@ -9,11 +9,7 @@ import { insertDraftRate } from './insertRate'
 import { updateDraftRate } from './updateDraftRate'
 import { unlockRate } from './unlockRate'
 import { findRateWithHistory } from './findRateWithHistory'
-import {
-    must,
-    createInsertContractData,
-    consoleLogFullData,
-} from '../../testHelpers'
+import { must, createInsertContractData } from '../../testHelpers'
 import { createInsertRateData } from '../../testHelpers/contractAndRates/rateHelpers'
 import { findContractWithHistory } from './findContractWithHistory'
 import type { DraftContractType } from '../../domain-models/contractAndRates/contractTypes'
@@ -819,7 +815,6 @@ describe('findRate', () => {
         )
 
         let submittedRate = must(await findRateWithHistory(client, rateID))
-        consoleLogFullData(submittedRate)
 
         // Expect rate revision 1.0 to have contract revision 1.0
         expect(submittedRate.revisions[0].submitInfo?.updatedReason).toBe(

services/app-api/src/postgres/contractAndRates/prismaDraftRatesHelpers.ts

@@ -8,17 +8,12 @@ import { contractRevisionToDomainModel } from './parseContractWithHistory'
 import {
     convertUpdateInfoToDomainModel,
     includeContractFormData,
-    includeUpdateInfo,
     rateFormDataToDomainModel,
 } from './prismaSharedContractRateHelpers'
 
 const includeDraftContracts = {
     revisions: {
-        include: {
-            ...includeContractFormData,
-            submitInfo: includeUpdateInfo,
-            unlockInfo: includeUpdateInfo,
-        },
+        include: includeContractFormData,
         take: 1,
         orderBy: {
             createdAt: 'desc',

services/app-api/src/postgres/contractAndRates/submitRate.test.ts

@@ -8,6 +8,11 @@ import { insertDraftRate } from './insertRate'
 import { submitContract } from './submitContract'
 import { insertDraftContract } from './insertContract'
 import { updateDraftContractWithRates } from './updateDraftContractWithRates'
+import type { RateFormEditable } from './updateDraftRate'
+import { unlockRate } from './unlockRate'
+import { findContractWithHistory } from './findContractWithHistory'
+import { findStatePrograms } from '../state'
+import { unlockContract } from './unlockContract'
 
 describe('submitRate', () => {
     it('creates a standalone rate submission from a draft', async () => {
@@ -43,6 +48,10 @@ describe('submitRate', () => {
                 rateID: rateA.id,
                 submittedByUserID: stateUser.id,
                 submitReason: 'initial submit',
+                formData: {
+                    ...draftRateData,
+                    rateType: 'AMENDMENT',
+                },
             })
         )
         expect(result.revisions[0].submitInfo?.updatedReason).toBe(
@@ -54,6 +63,7 @@ describe('submitRate', () => {
             expect.objectContaining({
                 formData: expect.objectContaining({
                     rateCertificationName: 'rate-cert-name',
+                    rateType: 'AMENDMENT',
                 }),
             })
         )
@@ -187,6 +197,12 @@ describe('submitRate', () => {
         })
         const rateA = must(await insertDraftRate(client, draftRateData))
 
+        if (!rateA.draftRevision) {
+            throw new Error(
+                'Unexpected error: No draft rate revision found in draft rate'
+            )
+        }
+
         // Attempt to submit a contract related to this draft rate
         const contract1 = must(
             await insertDraftContract(client, {
@@ -201,7 +217,7 @@ describe('submitRate', () => {
             await updateDraftContractWithRates(client, {
                 contractID: contract1.id,
                 formData: { submissionDescription: 'onepoint0' },
-                rateFormDatas: [rateA],
+                rateFormDatas: [rateA.draftRevision?.formData],
             })
         )
 
@@ -214,8 +230,235 @@ describe('submitRate', () => {
         if (!(result instanceof Error)) {
             throw new Error('must be an error')
         }
+
         expect(result.message).toBe(
             'Attempted to submit a contract related to a rate that has not been submitted.'
         )
     })
+    it('submits rate with updates', async () => {
+        const client = await sharedTestPrismaClient()
+
+        const stateUser = must(
+            await client.user.create({
+                data: {
+                    id: uuidv4(),
+                    givenName: 'Aang',
+                    familyName: 'Avatar',
+                    email: 'aang@example.com',
+                    role: 'STATE_USER',
+                    stateCode: 'NM',
+                },
+            })
+        )
+
+        // create a draft rate
+        const draftRateData = createInsertRateData({
+            rateCertificationName: 'first rate ',
+        })
+        const draftRate = must(await insertDraftRate(client, draftRateData))
+
+        if (!draftRate.draftRevision) {
+            throw new Error(
+                'Unexpected error: No draft rate revision in draft rate'
+            )
+        }
+
+        const rateID = draftRate.draftRevision.rate.id
+
+        const statePrograms = must(findStatePrograms(draftRate.stateCode))
+
+        const updateRateData: RateFormEditable = {
+            ...draftRate.draftRevision.formData,
+            rateType: 'NEW',
+            rateID,
+            rateCertificationName: 'testState-123',
+            rateProgramIDs: [statePrograms[0].id],
+            rateCapitationType: 'RATE_CELL',
+            rateDateStart: new Date('2024-01-01'),
+            rateDateEnd: new Date('2025-01-01'),
+            rateDateCertified: new Date('2024-01-01'),
+            amendmentEffectiveDateEnd: new Date('2024-02-01'),
+            amendmentEffectiveDateStart: new Date('2025-02-01'),
+            actuaryCommunicationPreference: 'OACT_TO_ACTUARY',
+            certifyingActuaryContacts: [],
+            addtlActuaryContacts: [],
+            supportingDocuments: [
+                {
+                    name: 'rate supporting doc',
+                    s3URL: 'fakeS3URL',
+                    sha256: '2342fwlkdmwvw',
+                },
+                {
+                    name: 'rate supporting doc 2',
+                    s3URL: 'fakeS3URL',
+                    sha256: '45662342fwlkdmwvw',
+                },
+            ],
+            rateDocuments: [
+                {
+                    name: 'contract doc',
+                    s3URL: 'fakeS3URL',
+                    sha256: '8984234fwlkdmwvw',
+                },
+            ],
+        }
+
+        const submittedRate = must(
+            await submitRate(client, {
+                rateID,
+                submittedByUserID: stateUser.id,
+                submitReason: 'submit and update rate',
+                formData: updateRateData,
+            })
+        )
+
+        expect(submittedRate.revisions[0].formData).toEqual(
+            expect.objectContaining(updateRateData)
+        )
+    })
+    it('submits rate independent of contract status', async () => {
+        const client = await sharedTestPrismaClient()
+
+        const stateUser = must(
+            await client.user.create({
+                data: {
+                    id: uuidv4(),
+                    givenName: 'Aang',
+                    familyName: 'Avatar',
+                    email: 'aang@example.com',
+                    role: 'STATE_USER',
+                    stateCode: 'NM',
+                },
+            })
+        )
+
+        const cmsUser = await client.user.create({
+            data: {
+                id: uuidv4(),
+                givenName: 'Zuko',
+                familyName: 'Hotman',
+                email: 'zuko@example.com',
+                role: 'CMS_USER',
+            },
+        })
+
+        // create a draft contract
+        const draftContract = must(
+            await insertDraftContract(
+                client,
+                createInsertContractData({
+                    submissionDescription: 'first contract',
+                })
+            )
+        )
+
+        const contractID = draftContract.id
+
+        // add new rate to contract
+        const updatedDraftContract = must(
+            await updateDraftContractWithRates(client, {
+                contractID,
+                formData: {},
+                rateFormDatas: [
+                    createInsertRateData({
+                        rateCertificationName: 'rate revision 1.0',
+                        rateType: 'NEW',
+                    }),
+                ],
+            })
+        )
+
+        if (!updatedDraftContract.draftRevision) {
+            throw new Error(
+                'Unexpected error: draft revision not found in draft contract'
+            )
+        }
+
+        const rateID =
+            updatedDraftContract.draftRevision.rateRevisions[0].rate.id
+
+        // submit rate
+        const submittedRate = must(
+            await submitRate(client, {
+                rateID,
+                submittedByUserID: stateUser.id,
+                submitReason: 'submit and update rate',
+                formData: {
+                    rateCertificationName: 'rate revision 1.1',
+                    rateType: 'AMENDMENT',
+                },
+            })
+        )
+
+        // expect submitted rate not to have error.
+        expect(submittedRate).not.toBeInstanceOf(Error)
+
+        const fetchedDraftContract = must(
+            await findContractWithHistory(client, contractID)
+        )
+
+        if (!fetchedDraftContract.draftRevision) {
+            throw new Error(
+                'Unexpected error: draft revision not found in draft contract'
+            )
+        }
+
+        // expect updated and submitted rate revision to be on draft contract revision
+        expect(
+            fetchedDraftContract.draftRevision.rateRevisions[0].formData
+        ).toEqual(
+            expect.objectContaining({
+                rateCertificationName: 'rate revision 1.1',
+                rateType: 'AMENDMENT',
+            })
+        )
+
+        const submittedContract = must(
+            await submitContract(client, {
+                contractID: draftContract.id,
+                submittedByUserID: stateUser.id,
+                submitReason: 'submit first contract',
+            })
+        )
+
+        // expect updated and submitted rate revision to be on submitted contract revision
+        expect(
+            submittedContract.revisions[0].rateRevisions[0].formData
+        ).toEqual(
+            expect.objectContaining({
+                rateCertificationName: 'rate revision 1.1',
+                rateType: 'AMENDMENT',
+            })
+        )
+
+        // Rate should be able to unlock and resubmitted
+        must(
+            await unlockRate(client, {
+                rateID,
+                unlockedByUserID: cmsUser.id,
+                unlockReason: 'some reason',
+            })
+        )
+
+        must(
+            await unlockContract(client, {
+                contractID: draftContract.id,
+                unlockReason: 'dosmsdfs',
+                unlockedByUserID: cmsUser.id,
+            })
+        )
+
+        must(
+            await submitRate(client, {
+                rateID,
+                submittedByUserID: stateUser.id,
+                submitReason: 'submit and update rate',
+                formData: {
+                    rateCertificationName: 'rate revision 1.2',
+                    rateType: 'AMENDMENT',
+                    rateCapitationType: 'RATE_CELL',
+                },
+            })
+        )
+    })
 })