Merge pull request #1647 from bcgov/feature/EDX-2679

SCH: Add funding warnings for refugees eligibility V91
bcgov · Jun 20, 2024 · b8696d1 · b8696d1
2 parents 97b28a4 + dca9cc7
commit b8696d1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/backend/src/components/sdc.js b/backend/src/components/sdc.js
@@ -412,7 +412,9 @@ function toTableRow(student) {
 }
 
 function fundingEligibleRefugee(student) {
-  const hasIssue = student?.sdcSchoolCollectionStudentValidationIssues?.some(issue => issue.validationIssueCode === 'REFUGEEINPREVCOL');
+  const hasIssue = student?.sdcSchoolCollectionStudentValidationIssues?.some(issue =>
+    issue.validationIssueCode === 'REFUGEEINPREVCOL' || issue.validationIssueCode === 'REFUGEEISADULT'
+  );
   return hasIssue ? 'No' : 'Yes';
 }
 

diff --git a/backend/src/components/studentFilters.js b/backend/src/components/studentFilters.js
@@ -438,9 +438,35 @@ function createRefugeeFundingFilter(pValue) {
   let refugeeFundingList = [];
 
   if (pValue.toString() === 'true') {
-    refugeeFundingList.push({ key: 'sdcStudentValidationIssueEntities.validationIssueCode', value: 'REFUGEEINPREVCOL', operation: FILTER_OPERATION.NONE_IN, valueType: VALUE_TYPE.STRING, condition: CONDITION.OR });
+    refugeeFundingList.push({
+      key: 'sdcStudentValidationIssueEntities.validationIssueCode',
+      value: 'REFUGEEINPREVCOL',
+      operation: FILTER_OPERATION.NONE_IN,
+      valueType: VALUE_TYPE.STRING,
+      condition: CONDITION.AND
+    });
+    refugeeFundingList.push({
+      key: 'sdcStudentValidationIssueEntities.validationIssueCode',
+      value: 'REFUGEEISADULT',
+      operation: FILTER_OPERATION.NONE_IN,
+      valueType: VALUE_TYPE.STRING,
+      condition: CONDITION.AND
+    });
   } else if (pValue.toString() === 'false') {
-    refugeeFundingList.push({ key: 'sdcStudentValidationIssueEntities.validationIssueCode', value: 'REFUGEEINPREVCOL', operation: FILTER_OPERATION.IN, valueType: VALUE_TYPE.STRING, condition: CONDITION.OR });
+    refugeeFundingList.push({
+      key: 'sdcStudentValidationIssueEntities.validationIssueCode',
+      value: 'REFUGEEINPREVCOL',
+      operation: FILTER_OPERATION.IN,
+      valueType: VALUE_TYPE.STRING,
+      condition: CONDITION.OR
+    });
+    refugeeFundingList.push({
+      key: 'sdcStudentValidationIssueEntities.validationIssueCode',
+      value: 'REFUGEEISADULT',
+      operation: FILTER_OPERATION.IN,
+      valueType: VALUE_TYPE.STRING,
+      condition: CONDITION.OR
+    });
   }
 
   return refugeeFundingList;