Merge remote-tracking branch 'origin/main' into design-tweaks-header-…

…n-errors

dev_tool/package.json

@@ -20,9 +20,9 @@
         ]
     },
     "dependencies": {
-        "@aws-sdk/client-cloudfront": "^3.485.0",
-        "@aws-sdk/client-ec2": "^3.485.0",
-        "@aws-sdk/client-secrets-manager": "^3.485.0",
+        "@aws-sdk/client-cloudfront": "^3.529.1",
+        "@aws-sdk/client-ec2": "^3.529.1",
+        "@aws-sdk/client-secrets-manager": "^3.529.1",
         "node-ssh": "^13.1.0",
         "yargs": "^17.2.1"
     },

package.json

@@ -77,7 +77,7 @@
     "devDependencies": {
         "@bahmutov/cypress-esbuild-preprocessor": "^2.2.0",
         "@cypress-audit/pa11y": "^1.3.0",
-        "chromedriver": "^121.0.0",
+        "chromedriver": "^122.0.4",
         "cypress": "^12.16.0",
         "cypress-pipe": "^2.0.0",
         "danger": "^11.2.6",

scripts/package.json

@@ -18,9 +18,9 @@
         ]
     },
     "dependencies": {
-        "@aws-sdk/client-cloudformation": "^3.485.0",
-        "@aws-sdk/client-cognito-identity-provider": "^3.485.0",
-        "@aws-sdk/client-s3": "^3.485.0",
+        "@aws-sdk/client-cloudformation": "^3.529.1",
+        "@aws-sdk/client-cognito-identity-provider": "^3.529.1",
+        "@aws-sdk/client-s3": "^3.529.1",
         "octokit": "^3.1.2"
     },
     "devDependencies": {

services/app-api/package.json

@@ -27,15 +27,15 @@
     },
     "dependencies": {
         "@apollo/gateway": "^2.2.2",
-        "@aws-sdk/client-amplify": "^3.485.0",
-        "@aws-sdk/client-cognito-identity-provider": "^3.485.0",
-        "@aws-sdk/client-lambda": "^3.485.0",
-        "@aws-sdk/client-rds": "^3.485.0",
-        "@aws-sdk/client-s3": "^3.485.0",
-        "@aws-sdk/client-secrets-manager": "^3.485.0",
-        "@aws-sdk/client-ses": "^3.485.0",
-        "@aws-sdk/client-ssm": "^3.485.0",
-        "@aws-sdk/lib-storage": "^3.485.0",
+        "@aws-sdk/client-amplify": "^3.529.1",
+        "@aws-sdk/client-cognito-identity-provider": "^3.529.1",
+        "@aws-sdk/client-lambda": "^3.529.1",
+        "@aws-sdk/client-rds": "^3.529.1",
+        "@aws-sdk/client-s3": "^3.529.1",
+        "@aws-sdk/client-secrets-manager": "^3.529.1",
+        "@aws-sdk/client-ses": "^3.529.1",
+        "@aws-sdk/client-ssm": "^3.529.1",
+        "@aws-sdk/lib-storage": "^3.529.1",
         "@launchdarkly/node-server-sdk": "8.1.1",
         "@opentelemetry/exporter-trace-otlp-http": "^0.45.1",
         "apollo-server-core": "^3.11.1",

services/app-api/src/domain-models/contractAndRates/contractTypes.ts

@@ -2,18 +2,22 @@ import { z } from 'zod'
 import { contractRevisionWithRatesSchema } from './revisionTypes'
 import { statusSchema } from './statusType'
 import { pruneDuplicateEmails } from '../../emailer/formatters'
+import { rateSchema } from './rateTypes'
 
 // Contract represents the contract specific information in a submission package
 // All that data is contained in revisions, each revision represents the data in a single submission
 // submissions are kept intact here across time
 const contractSchema = z.object({
     id: z.string().uuid(),
+    createdAt: z.date(),
+    updatedAt: z.date(),
     status: statusSchema,
     stateCode: z.string(),
     mccrsID: z.string().optional(),
     stateNumber: z.number().min(1),
-    // If this contract is in a DRAFT or UNLOCKED status, there will be a draftRevision
+    // If this contract is in a DRAFT or UNLOCKED status, there will be a draftRevision and draftRates
     draftRevision: contractRevisionWithRatesSchema.optional(),
+    draftRates: z.array(rateSchema).optional(),
     // All revisions are submitted and in reverse chronological order
     revisions: z.array(contractRevisionWithRatesSchema),
 })

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

@@ -2,6 +2,7 @@ import type {
     ContractType,
     ContractRevisionWithRatesType,
     ContractRevisionType,
+    RateType,
 } from '../../domain-models/contractAndRates'
 import { contractSchema } from '../../domain-models/contractAndRates'
 import { draftContractRevToDomainModel } from './prismaDraftContractHelpers'
@@ -111,6 +112,7 @@ function contractWithHistoryToDomainModel(
     const contractRevisions = contract.revisions
     let draftRevision: ContractRevisionWithRatesType | Error | undefined =
         undefined
+    let draftRates: RateType[] | Error | undefined = undefined
 
     for (const [contractRevIndex, contractRev] of contractRevisions.entries()) {
         // We set the draft revision aside, all ordered revisions are submitted
@@ -130,6 +132,19 @@ function contractWithHistoryToDomainModel(
                 )
             }
 
+            const draftPrismaRates = contractRev.draftRates
+
+            draftRates = draftPrismaRates.map((r) => {
+                return {
+                    id: r.id,
+                    createdAt: r.createdAt,
+                    updatedAt: r.updatedAt,
+                    status: getContractRateStatus(r.revisions),
+                    stateCode: r.stateCode,
+                    stateNumber: r.stateNumber,
+                    revisions: [],
+                }
+            })
             // skip the rest of the processing
             continue
         }
@@ -261,11 +276,14 @@ function contractWithHistoryToDomainModel(
 
     return {
         id: contract.id,
+        createdAt: contract.createdAt,
+        updatedAt: contract.updatedAt,
         mccrsID: contract.mccrsID || undefined,
         status: getContractRateStatus(contract.revisions),
         stateCode: contract.stateCode,
         stateNumber: contract.stateNumber,
         draftRevision,
+        draftRates,
         revisions: revisions.reverse(),
     }
 }

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

@@ -235,4 +235,5 @@ export {
     parseRateWithHistory,
     rateRevisionToDomainModel,
     rateRevisionsToDomainModels,
+    rateWithHistoryToDomainModel,
 }

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

@@ -14,7 +14,6 @@ import type { ContractRevisionTableWithRates } from './prismaSubmittedContractHe
 const includeDraftRates = {
     revisions: {
         include: includeRateFormData,
-        take: 1,
         orderBy: {
             createdAt: 'desc',
         },