Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev -> Val #1905

Merged
merged 3 commits into from
Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .env_example

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ The following are prerequisites for local development.
1. [Create an SSH Key and link it to your Github account](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)
1. Clone this repository locally
```bash
git clone git@github.com:CMSgov/cms-mdct-qmr.git
git clone git@github.com:Enterprise-CMCS/macpro-mdct-qmr.git
```
1. Install [Node](https://nodejs.org/en/download/)
1. Install [Node Version Manager (NVM)](https://github.com/nvm-sh/nvm#installing-and-updating)
Expand Down Expand Up @@ -849,7 +849,7 @@ Please [join the cms-mdct-qmr slack channel](https://join.slack.com/t/macproquic

# Quickstart

This application was forked from the [Quickstart Repository](https://github.com/cmsgov/macpro-quickstart-serverless) and efforts are made to feedback any applicable changes to that repository from this one and vice versa.
This application was forked from the [Quickstart Repository](https://github.com/Enterprise-CMCS/macpro-quickstart-serverless) and efforts are made to feedback any applicable changes to that repository from this one and vice versa.

# License

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
"serverless-idempotency-helper": "./plugins/serverless-idempotency-helper",
"serverless-offline": "^12.0.4",
"serverless-offline-ssm": "^6.2.0",
"serverless-online": "CMSgov/serverless-online",
"serverless-online": "Enterprise-CMCS/macpro-serverless-online",
"serverless-plugin-scripts": "^1.0.2",
"serverless-plugin-warmup": "^8.2.1",
"serverless-s3-bucket-helper": "CMSgov/serverless-s3-bucket-helper#0.1.0",
"serverless-s3-bucket-helper": "Enterprise-CMCS/serverless-s3-bucket-helper#0.1.0",
"serverless-stack-termination-protection": "^1.0.4",
"typescript": "^4.0.5",
"yargs": "^16.1.1"
Expand Down
2 changes: 1 addition & 1 deletion services/app-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"serverless-api-client-certificate": "^1.0.2",
"serverless-associate-waf": "^1.2.1",
"serverless-plugin-typescript": "^2.1.4",
"serverless-s3-bucket-helper": "CMSgov/serverless-s3-bucket-helper#0.1.1",
"serverless-s3-bucket-helper": "Enterprise-CMCS/serverless-s3-bucket-helper#0.1.1",
"ts-jest": "^27.1.3",
"ts-node": "^10.7.0",
"typescript": "^4.6.4"
Expand Down
4 changes: 2 additions & 2 deletions services/app-api/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4952,9 +4952,9 @@ serverless-plugin-typescript@^2.1.4:
globby "^10.0.2"
lodash "^4.17.21"

serverless-s3-bucket-helper@CMSgov/serverless-s3-bucket-helper#0.1.1:
serverless-s3-bucket-helper@Enterprise-CMCS/serverless-s3-bucket-helper#0.1.1:
version "1.0.0"
resolved "https://codeload.github.com/CMSgov/serverless-s3-bucket-helper/tar.gz/f0f6d6a1ffe54e292f0afc93777764bce16a4037"
resolved "https://codeload.github.com/Enterprise-CMCS/serverless-s3-bucket-helper/tar.gz/f0f6d6a1ffe54e292f0afc93777764bce16a4037"

serverless@^3.12.0:
version "3.28.0"
Expand Down
2 changes: 1 addition & 1 deletion services/database/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"devDependencies": {
"dynamodb-localhost": "https://github.com/99x/dynamodb-localhost#db30898f8c40932c7177be7b2f1a81360d12876d",
"serverless-dynamodb-local": "0.2.40",
"serverless-s3-bucket-helper": "CMSgov/serverless-s3-bucket-helper#0.1.1"
"serverless-s3-bucket-helper": "Enterprise-CMCS/serverless-s3-bucket-helper#0.1.1"
},
"overrides": {
"serverless-dynamodb-local": {
Expand Down
4 changes: 2 additions & 2 deletions services/database/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -641,9 +641,9 @@ serverless-dynamodb-local@0.2.40:
dynamodb-localhost "0.0.9"
lodash "^4.17.0"

serverless-s3-bucket-helper@CMSgov/serverless-s3-bucket-helper#0.1.1:
serverless-s3-bucket-helper@Enterprise-CMCS/serverless-s3-bucket-helper#0.1.1:
version "1.0.0"
resolved "https://codeload.github.com/CMSgov/serverless-s3-bucket-helper/tar.gz/f0f6d6a1ffe54e292f0afc93777764bce16a4037"
resolved "https://codeload.github.com/Enterprise-CMCS/serverless-s3-bucket-helper/tar.gz/f0f6d6a1ffe54e292f0afc93777764bce16a4037"

string-width@^4.1.0, string-width@^4.2.0:
version "4.2.3"
Expand Down
2 changes: 1 addition & 1 deletion services/stream-functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"version": "1.0.0",
"dependencies": {},
"devDependencies": {
"serverless-s3-bucket-helper": "CMSgov/serverless-s3-bucket-helper#0.1.1"
"serverless-s3-bucket-helper": "Enterprise-CMCS/serverless-s3-bucket-helper#0.1.1"
}
}
4 changes: 2 additions & 2 deletions services/stream-functions/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# yarn lockfile v1


serverless-s3-bucket-helper@CMSgov/serverless-s3-bucket-helper#0.1.1:
serverless-s3-bucket-helper@Enterprise-CMCS/serverless-s3-bucket-helper#0.1.1:
version "1.0.0"
resolved "https://codeload.github.com/CMSgov/serverless-s3-bucket-helper/tar.gz/f0f6d6a1ffe54e292f0afc93777764bce16a4037"
resolved "https://codeload.github.com/Enterprise-CMCS/serverless-s3-bucket-helper/tar.gz/f0f6d6a1ffe54e292f0afc93777764bce16a4037"
2 changes: 1 addition & 1 deletion services/ui-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "",
"license": "CC0-1.0",
"devDependencies": {
"serverless-s3-bucket-helper": "CMSgov/serverless-s3-bucket-helper#0.1.1"
"serverless-s3-bucket-helper": "Enterprise-CMCS/serverless-s3-bucket-helper#0.1.1"
},
"dependencies": {
"aws-sdk": "^2.1310.0",
Expand Down
4 changes: 2 additions & 2 deletions services/ui-auth/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ sax@>=0.6.0:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==

serverless-s3-bucket-helper@CMSgov/serverless-s3-bucket-helper#0.1.1:
serverless-s3-bucket-helper@Enterprise-CMCS/serverless-s3-bucket-helper#0.1.1:
version "1.0.0"
resolved "https://codeload.github.com/CMSgov/serverless-s3-bucket-helper/tar.gz/f0f6d6a1ffe54e292f0afc93777764bce16a4037"
resolved "https://codeload.github.com/Enterprise-CMCS/serverless-s3-bucket-helper/tar.gz/f0f6d6a1ffe54e292f0afc93777764bce16a4037"

url@0.10.3:
version "0.10.3"
Expand Down
2 changes: 1 addition & 1 deletion services/ui-src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"postinstall-postinstall": "^2.1.0",
"prettier": "^2.4.1",
"serverless-cloudfront-invalidate": "^1.5.0",
"serverless-s3-bucket-helper": "CMSgov/serverless-s3-bucket-helper#0.1.1",
"serverless-s3-bucket-helper": "Enterprise-CMCS/serverless-s3-bucket-helper#0.1.1",
"serverless-s3-sync": "^1.14.4",
"typescript": "^4.4.4"
},
Expand Down
2 changes: 2 additions & 0 deletions services/ui-src/src/measures/2023/AABAD/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
).not.toHaveBeenCalled();
expect(V.validateBothDatesCompleted).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).not.toHaveBeenCalled();
expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled();
expect(V.validateRateZeroOMS).not.toHaveBeenCalled();
Expand All @@ -191,6 +192,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
expect(V.validateRequiredRadioButtonForCombinedRates).toHaveBeenCalled();
expect(V.validateBothDatesCompleted).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).toHaveBeenCalled();
expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled();
});
Expand Down
1 change: 1 addition & 0 deletions services/ui-src/src/measures/2023/AABAD/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const AABADValidation = (data: FormData) => {
...GV.validateYearFormat(dateRange),
...GV.validateHedisYear(data),
...GV.validateAtLeastOneDataSource(data),
...GV.validateAtLeastOneDataSourceType(data),
...GV.validateAtLeastOneDeviationFieldFilled(
didCalculationsDeviate,
deviationReason
Expand Down
2 changes: 2 additions & 0 deletions services/ui-src/src/measures/2023/AABCH/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
expect(V.validateRateZeroPM).not.toHaveBeenCalled();
expect(V.validateBothDatesCompleted).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).not.toHaveBeenCalled();
expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled();
expect(V.validateRateZeroOMS).not.toHaveBeenCalled();
Expand All @@ -191,6 +192,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
expect(V.validateRateZeroPM).toHaveBeenCalled();
expect(V.validateBothDatesCompleted).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).toHaveBeenCalled();
expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled();
expect(V.validateRateZeroOMS).toHaveBeenCalled();
Expand Down
1 change: 1 addition & 0 deletions services/ui-src/src/measures/2023/AABCH/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const AABCHValidation = (data: FormData) => {

errorArray = [
...GV.validateAtLeastOneDataSource(data),
...GV.validateAtLeastOneDataSourceType(data),
...GV.validateDateRangeRadioButtonCompletion(data),
...GV.validateBothDatesCompleted(dateRange),
...GV.validateYearFormat(dateRange),
Expand Down
2 changes: 2 additions & 0 deletions services/ui-src/src/measures/2023/ADDCH/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
).not.toHaveBeenCalled();
expect(V.validateBothDatesCompleted).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).not.toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatPM).not.toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatOMS).not.toHaveBeenCalled();
Expand All @@ -196,6 +197,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
expect(V.validateRequiredRadioButtonForCombinedRates).toHaveBeenCalled();
expect(V.validateBothDatesCompleted).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatPM).not.toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatOMS).not.toHaveBeenCalled();
Expand Down
1 change: 1 addition & 0 deletions services/ui-src/src/measures/2023/ADDCH/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const ADDCHValidation = (data: FormData) => {
...GV.validateYearFormat(dateRange),
...GV.validateHedisYear(data),
...GV.validateAtLeastOneDataSource(data),
...GV.validateAtLeastOneDataSourceType(data),
...GV.validateAtLeastOneDeviationFieldFilled(
didCalculationsDeviate,
deviationReason
Expand Down
2 changes: 2 additions & 0 deletions services/ui-src/src/measures/2023/AIFHH/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
).not.toHaveBeenCalled();
expect(V.validateBothDatesCompleted).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).not.toHaveBeenCalled();
expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled();
expect(V.validateRateZeroOMS).not.toHaveBeenCalled();
Expand All @@ -191,6 +192,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
expect(V.validateRequiredRadioButtonForCombinedRates).toHaveBeenCalled();
expect(V.validateBothDatesCompleted).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled();
expect(V.ComplexValidateNDRTotals).toHaveBeenCalled();
});

Expand Down
1 change: 1 addition & 0 deletions services/ui-src/src/measures/2023/AIFHH/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ const AIFHHValidation = (data: FormData) => {
errorArray = [
...GV.validateRequiredRadioButtonForCombinedRates(data),
...GV.validateAtLeastOneDataSource(data),
...GV.validateAtLeastOneDataSourceType(data),
...GV.validateDateRangeRadioButtonCompletion(data),
...GV.validateBothDatesCompleted(dateRange),
...GV.validateYearFormat(dateRange),
Expand Down
2 changes: 2 additions & 0 deletions services/ui-src/src/measures/2023/AMBCH/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
).not.toHaveBeenCalled();
expect(V.validateBothDatesCompleted).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).not.toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatPM).not.toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatOMS).not.toHaveBeenCalled();
Expand All @@ -195,6 +196,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
expect(V.validateRequiredRadioButtonForCombinedRates).toHaveBeenCalled();
expect(V.validateBothDatesCompleted).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatPM).not.toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatOMS).toHaveBeenCalled();
Expand Down
1 change: 1 addition & 0 deletions services/ui-src/src/measures/2023/AMBCH/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const AMBCHValidation = (data: FormData) => {
...GV.validateYearFormat(dateRange),
...GV.validateHedisYear(data),
...GV.validateAtLeastOneDataSource(data),
...GV.validateAtLeastOneDataSourceType(data),
...GV.validateAtLeastOneDeviationFieldFilled(
didCalculationsDeviate,
deviationReason
Expand Down
2 changes: 2 additions & 0 deletions services/ui-src/src/measures/2023/AMBHH/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
).not.toHaveBeenCalled();
expect(V.validateBothDatesCompleted).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).not.toHaveBeenCalled();
expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled();
expect(V.validateRateZeroOMS).not.toHaveBeenCalled();
Expand All @@ -194,6 +195,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
expect(V.validateRequiredRadioButtonForCombinedRates).toHaveBeenCalled();
expect(V.validateBothDatesCompleted).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).toHaveBeenCalled();
expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled();
expect(V.validateRateZeroOMS).toHaveBeenCalled();
Expand Down
1 change: 1 addition & 0 deletions services/ui-src/src/measures/2023/AMBHH/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const AMBHHValidation = (data: FormData) => {
errorArray = [
...GV.validateRequiredRadioButtonForCombinedRates(data),
...GV.validateAtLeastOneDataSource(data),
...GV.validateAtLeastOneDataSourceType(data),
...GV.validateDateRangeRadioButtonCompletion(data),
...GV.validateBothDatesCompleted(dateRange),
...GV.validateYearFormat(dateRange),
Expand Down
2 changes: 2 additions & 0 deletions services/ui-src/src/measures/2023/AMMAD/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
expect(V.validateEqualQualifierDenominatorsPM).not.toHaveBeenCalled();
expect(V.validateBothDatesCompleted).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).not.toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatPM).not.toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatOMS).not.toHaveBeenCalled();
Expand All @@ -196,6 +197,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
expect(V.validateRequiredRadioButtonForCombinedRates).toHaveBeenCalled();
expect(V.validateBothDatesCompleted).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatPM).toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatOMS).toHaveBeenCalled();
Expand Down
1 change: 1 addition & 0 deletions services/ui-src/src/measures/2023/AMMAD/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const AMMADValidation = (data: FormData) => {
...GV.validateYearFormat(dateRange),
...GV.validateHedisYear(data),
...GV.validateAtLeastOneDataSource(data),
...GV.validateAtLeastOneDataSourceType(data),
...GV.validateAtLeastOneDeviationFieldFilled(
didCalculationsDeviate,
deviationReason
Expand Down
2 changes: 2 additions & 0 deletions services/ui-src/src/measures/2023/AMRAD/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
).not.toHaveBeenCalled();
expect(V.validateBothDatesCompleted).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).not.toHaveBeenCalled();
expect(V.validateNumeratorLessThanDenominatorOMS).not.toHaveBeenCalled();
expect(V.validateRateZeroOMS).not.toHaveBeenCalled();
Expand All @@ -194,6 +195,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
expect(V.validateRequiredRadioButtonForCombinedRates).toHaveBeenCalled();
expect(V.validateBothDatesCompleted).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).toHaveBeenCalled();
expect(V.validateNumeratorLessThanDenominatorOMS).toHaveBeenCalled();
expect(V.validateRateZeroOMS).toHaveBeenCalled();
Expand Down
1 change: 1 addition & 0 deletions services/ui-src/src/measures/2023/AMRAD/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const AMRADValidation = (data: FormData) => {
...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups),
...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data),
...GV.validateAtLeastOneDataSource(data),
...GV.validateAtLeastOneDataSourceType(data),
...GV.validateNumeratorsLessThanDenominatorsPM(
performanceMeasureArray,
OPM,
Expand Down
2 changes: 2 additions & 0 deletions services/ui-src/src/measures/2023/AMRCH/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
).not.toHaveBeenCalled();
expect(V.validateBothDatesCompleted).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).not.toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).not.toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatPM).not.toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatOMS).not.toHaveBeenCalled();
Expand All @@ -194,6 +195,7 @@ describe(`Test FFY ${year} ${measureAbbr}`, () => {
expect(V.validateRequiredRadioButtonForCombinedRates).toHaveBeenCalled();
expect(V.validateBothDatesCompleted).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSource).toHaveBeenCalled();
expect(V.validateAtLeastOneDataSourceType).toHaveBeenCalled();
expect(V.validateAtLeastOneDeviationFieldFilled).toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatPM).not.toHaveBeenCalled();
expect(V.validateOneCatRateHigherThanOtherCatOMS).not.toHaveBeenCalled();
Expand Down
1 change: 1 addition & 0 deletions services/ui-src/src/measures/2023/AMRCH/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const AMRCHValidation = (data: FormData) => {
...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups),
...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data),
...GV.validateAtLeastOneDataSource(data),
...GV.validateAtLeastOneDataSourceType(data),
...GV.validateNumeratorsLessThanDenominatorsPM(
performanceMeasureArray,
OPM,
Expand Down
Loading
Loading