Tbolt/3355 budget and ffp validation (#4224)

Enterprise-CMCS · Sep 2, 2022 · cf3acf8 · cf3acf8
1 parent fb20bcf
commit cf3acf8
Show file tree

Hide file tree

Showing 14 changed files with 1,259 additions and 2,425 deletions.
diff --git a/common/schemas/apdOverview.js b/common/schemas/apdOverview.js
@@ -1,6 +1,8 @@
 import Joi from 'joi';
 
 const apdOverviewSchema = Joi.object({
+  // Funding sources is not a user input but we use this as a dependency for
+  // conditionally validating the narratives below
   fundingSources: Joi.array().items(Joi.string()).required(),
   programOverview: Joi.string().messages({
     'string.empty': 'Provide a brief introduction to the state program.'

diff --git a/common/schemas/costAllocateFFP.js b/common/schemas/costAllocateFFP.js
@@ -0,0 +1,35 @@
+const Joi = require('joi');
+
+const costAllocateFFPSchema = Joi.object({
+  costAllocation: Joi.object().pattern(
+    /\d{4}/,
+    Joi.object({
+      ffp: Joi.object({
+        federal: Joi.number().required(),
+        state: Joi.alternatives()
+          .conditional('federal', {
+            switch: [
+              {
+                is: 90,
+                then: Joi.number().valid(10)
+              },
+              {
+                is: 75,
+                then: Joi.number().valid(25)
+              },
+              {
+                is: 50,
+                then: Joi.number().valid(50)
+              }
+            ]
+          })
+          .messages({
+            'alternatives.any': 'Select a federal-state split.'
+          })
+      }),
+      other: Joi.any()
+    })
+  )
+});
+
+export default costAllocateFFPSchema;
diff --git a/common/schemas/costAllocateFFPQuarterly.js b/common/schemas/costAllocateFFPQuarterly.js
@@ -0,0 +1,69 @@
+const Joi = require('joi');
+
+const costAllocateFFPQuarterlySchema = Joi.object({
+  formData: Joi.object({
+    1: Joi.object({
+      combined: Joi.any(),
+      contractors: Joi.object({
+        dollars: Joi.number(),
+        percent: Joi.number()
+      }),
+      inHouse: Joi.object({
+        dollars: Joi.number(),
+        percent: Joi.number()
+      })
+    }),
+    2: Joi.object({
+      combined: Joi.any(),
+      contractors: Joi.object({
+        dollars: Joi.number(),
+        percent: Joi.number()
+      }),
+      inHouse: Joi.object({
+        dollars: Joi.number(),
+        percent: Joi.number()
+      })
+    }),
+    3: Joi.object({
+      combined: Joi.any(),
+      contractors: Joi.object({
+        dollars: Joi.number(),
+        percent: Joi.number()
+      }),
+      inHouse: Joi.object({
+        dollars: Joi.number(),
+        percent: Joi.number()
+      })
+    }),
+    4: Joi.object({
+      combined: Joi.any(),
+      contractors: Joi.object({
+        dollars: Joi.number(),
+        percent: Joi.number()
+      }),
+      inHouse: Joi.object({
+        dollars: Joi.number(),
+        percent: Joi.number()
+      })
+    }),
+    subtotal: Joi.object({
+      combined: Joi.any(),
+      contractors: Joi.object({
+        dollars: Joi.any(),
+        percent: Joi.number().precision(3).valid(1).messages({
+          'any.only':
+            'Private Contractor Costs quarterly percentages must total 100%'
+        })
+      }),
+      inHouse: Joi.object({
+        dollars: Joi.any(),
+        percent: Joi.number().precision(3).valid(1).messages({
+          'any.only':
+            'State Staff and Expenses (In-House Costs) quarterly percentages must total 100%'
+        })
+      })
+    })
+  })
+});
+
+export default costAllocateFFPQuarterlySchema;
diff --git a/e2e/cypress/helpers/apd/activity/check-default-activity.js b/e2e/cypress/helpers/apd/activity/check-default-activity.js
@@ -149,7 +149,7 @@ export const checkDefaultActivity = years => {
 
       // Check Federal State Split Functionality
       defaultData.splits.forEach(split => {
-        cy.get('[class="ds-c-field"]').eq(0).select(split);
+        cy.get('[data-cy="cost-allocation-dropdown"]').eq(0).select(split);
 
         cy.get('[data-cy="FFPFedStateSplitTable"]')
           .eq(0)

diff --git a/e2e/cypress/integration/02-apd/01-apd-basics.cy.js b/e2e/cypress/integration/02-apd/01-apd-basics.cy.js
@@ -853,7 +853,7 @@ describe('APD Basics', { tags: ['@apd', '@default'] }, () => {
             .within(() => {
               budgetPage.checkSplitFunctionality();
 
-              cy.get('[class="ds-c-field"]').select('75-25');
+              cy.get('[data-cy="cost-allocation-dropdown"]').select('75-25');
               cy.waitForSave();
               budgetPage.checkCostSplitTable({
                 federalSharePercentage: 0.75,
@@ -863,7 +863,7 @@ describe('APD Basics', { tags: ['@apd', '@default'] }, () => {
                 totalComputableMedicaidCost: 150000
               });
 
-              cy.get('[class="ds-c-field"]').select('50-50');
+              cy.get('[data-cy="cost-allocation-dropdown"]').select('50-50');
               cy.waitForSave();
               budgetPage.checkCostSplitTable({
                 federalSharePercentage: 0.5,
@@ -873,7 +873,7 @@ describe('APD Basics', { tags: ['@apd', '@default'] }, () => {
                 totalComputableMedicaidCost: 150000
               });
 
-              cy.get('[class="ds-c-field"]').select('90-10');
+              cy.get('[data-cy="cost-allocation-dropdown"]').select('90-10');
               cy.waitForSave();
               budgetPage.checkCostSplitTable({
                 federalSharePercentage: 0.9,

diff --git a/e2e/cypress/page-objects/budget-page.js b/e2e/cypress/page-objects/budget-page.js
@@ -43,14 +43,26 @@ class BudgetPage {
   };
 
   checkSplitFunctionality = () => {
-    cy.get('[class="ds-c-field"]').parent().click();
+    cy.get('[data-cy="cost-allocation-dropdown"]').parent().click();
+    cy.contains('Select an option').should('exist');
+
     cy.contains('90-10').should('exist');
     cy.contains('75-25').should('exist');
     cy.contains('50-50').should('exist');
 
-    cy.get('[class="ds-c-field"]')
+    cy.get('[data-cy="cost-allocation-dropdown"]')
       .find(':selected')
       .should('have.value', '0-100');
+
+    cy.get('[data-cy="cost-allocation-dropdown"]').blur();
+
+    cy.get('[data-cy="cost-allocation-dropdown"]').next();
+    cy.contains('Select a federal-state split.').should('exist');
+
+    cy.get('[data-cy="cost-allocation-dropdown"]').select('90-10');
+    cy.get('[data-cy="cost-allocation-dropdown"]').blur();
+
+    cy.contains('Select a federal-state split.').should('not.exist');
   };
 
   checkCostSplitTable = ({

diff --git a/web/src/pages/apd/activities/contractor-costs/ContractorResource/ContractorResourceForm.js b/web/src/pages/apd/activities/contractor-costs/ContractorResource/ContractorResourceForm.js
@@ -42,6 +42,7 @@ const ContractorResourceForm = forwardRef(
       hourly,
       years
     } = JSON.parse(JSON.stringify({ ...item }));
+
     const {
       control,
       formState: { errors, isValid },
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ const ContractorResourceForm = forwardRef( @@
           hourly,
           years
         } = JSON.parse(JSON.stringify({ ...item }));
         const {
           control,
           formState: { errors, isValid },
@@ Expand Down @@