Change handler name and add test for connecting a submitted rate.

Enterprise-CMCS · Sep 12, 2023 · 420afe5 · 420afe5
1 parent 7f6b00b
commit 420afe5
Show file tree

Hide file tree

Showing 10 changed files with 163 additions and 125 deletions.
diff --git a/services/app-api/src/postgres/contractAndRates/findContractWithHistory.test.ts b/services/app-api/src/postgres/contractAndRates/findContractWithHistory.test.ts
@@ -5,7 +5,7 @@ import { submitContract } from './submitContract'
 import { submitRate } from './submitRate'
 import { insertDraftContract } from './insertContract'
 import { unlockContract } from './unlockContract'
-import { updateDraftContract } from './updateDraftContract'
+import { updateDraftContractWithRates } from './updateDraftContractWithRates'
 import { insertDraftRate } from './insertRate'
 import { updateDraftRate } from './updateDraftRate'
 import { unlockRate } from './unlockRate'
@@ -194,7 +194,7 @@ describe('findContract', () => {
             )
         )
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contractA.id,
                 formData: {
                     submissionType: 'CONTRACT_AND_RATES',
@@ -472,7 +472,7 @@ describe('findContract', () => {
         )
         // Remove rate 1 and rate 2 from contract
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contractA.id,
                 formData: {
                     submissionType: 'CONTRACT_AND_RATES',
@@ -605,7 +605,7 @@ describe('findContract', () => {
             await insertDraftContract(client, draftContractData)
         )
         const updatedDraftContractWithRates = must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contractA.id,
                 formData: {
                     submissionType: 'CONTRACT_AND_RATES',

diff --git a/services/app-api/src/postgres/contractAndRates/findRateWithHistory.test.ts b/services/app-api/src/postgres/contractAndRates/findRateWithHistory.test.ts
@@ -4,7 +4,7 @@ import { submitContract } from './submitContract'
 import { submitRate } from './submitRate'
 import { insertDraftContract } from './insertContract'
 import { unlockContract } from './unlockContract'
-import { updateDraftContract } from './updateDraftContract'
+import { updateDraftContractWithRates } from './updateDraftContractWithRates'
 import { insertDraftRate } from './insertRate'
 import { updateDraftRate } from './updateDraftRate'
 import { unlockRate } from './unlockRate'
@@ -62,7 +62,7 @@ describe('findRate', () => {
             })
         )
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contract1.id,
                 formData: { submissionDescription: 'someurle.en' },
                 rateFormDatas: [rateA.draftRevision.formData],
@@ -79,7 +79,7 @@ describe('findRate', () => {
             })
         )
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contract2.id,
                 formData: { submissionDescription: 'twopointo' },
                 rateFormDatas: [rateA.draftRevision.formData],
@@ -96,7 +96,7 @@ describe('findRate', () => {
             })
         )
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contract3.id,
                 formData: { submissionDescription: 'threepointo' },
                 rateFormDatas: [rateA.draftRevision.formData],
@@ -156,7 +156,7 @@ describe('findRate', () => {
             )
         )
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: unlockedContract2.id,
                 formData: {
                     submissionType: 'CONTRACT_AND_RATES',
@@ -200,7 +200,7 @@ describe('findRate', () => {
             )
         ) as DraftContractType
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: unlockedContract1.id,
                 formData: { submissionDescription: 'onepointone' },
                 rateFormDatas: [rateA.draftRevision.formData],
@@ -512,7 +512,7 @@ describe('findRate', () => {
         )
 
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contractA.id,
                 formData: {
                     submissionType: 'CONTRACT_AND_RATES',
@@ -543,7 +543,7 @@ describe('findRate', () => {
             )
         )
         const updatedDraftContractA = must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contractA.id,
                 formData: {
                     submissionType: 'CONTRACT_AND_RATES',
@@ -557,7 +557,7 @@ describe('findRate', () => {
         )
         // Remove rate1 from contract
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: updatedDraftContractA.id,
                 formData: {},
                 rateFormDatas:

diff --git a/services/app-api/src/postgres/contractAndRates/index.ts b/services/app-api/src/postgres/contractAndRates/index.ts
@@ -1,9 +1,9 @@
 export type { InsertContractArgsType } from './insertContract'
-export type { UpdateContractArgsType } from './updateDraftContract'
+export type { UpdateContractArgsType } from './updateDraftContractWithRates'
 export type { ContractOrErrorArrayType } from './findAllContractsWithHistoryByState'
 
 export { insertDraftContract } from './insertContract'
 export { findContractWithHistory } from './findContractWithHistory'
-export { updateDraftContract } from './updateDraftContract'
+export { updateDraftContractWithRates } from './updateDraftContractWithRates'
 export { findAllContractsWithHistoryByState } from './findAllContractsWithHistoryByState'
 export { findAllContractsWithHistoryBySubmitInfo } from './findAllContractsWithHistoryBySubmitInfo'
diff --git a/services/app-api/src/postgres/contractAndRates/unlockContract.test.ts b/services/app-api/src/postgres/contractAndRates/unlockContract.test.ts
@@ -6,7 +6,7 @@ import { unlockContract } from './unlockContract'
 import { insertDraftRate } from './insertRate'
 import { unlockRate } from './unlockRate'
 import { submitRate } from './submitRate'
-import { updateDraftContract } from './updateDraftContract'
+import { updateDraftContractWithRates } from './updateDraftContractWithRates'
 import { updateDraftRate } from './updateDraftRate'
 import { submitContract } from './submitContract'
 import { findContractWithHistory } from './findContractWithHistory'
@@ -59,7 +59,7 @@ describe('unlockContract', () => {
 
         // Connect draft contract to submitted rate
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contract.id,
                 formData: {
                     submissionType: 'CONTRACT_AND_RATES',
@@ -164,7 +164,7 @@ describe('unlockContract', () => {
 
         // Connect draft contract to submitted rate
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contract.id,
                 formData: {
                     submissionType: 'CONTRACT_AND_RATES',
@@ -268,7 +268,7 @@ describe('unlockContract', () => {
 
         // Connect draft contract to draft rate
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contract.id,
                 formData: {
                     submissionType: 'CONTRACT_AND_RATES',
@@ -312,7 +312,7 @@ describe('unlockContract', () => {
             )
         )
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contract.id,
                 formData: {
                     submissionType: 'CONTRACT_AND_RATES',
@@ -378,7 +378,7 @@ describe('unlockContract', () => {
 
         // Connect draft contract to submitted rate
         must(
-            await updateDraftContract(client, {
+            await updateDraftContractWithRates(client, {
                 contractID: contract.id,
                 formData: {
                     submissionType: 'CONTRACT_AND_RATES',