diff --git a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/StudentValidationIssueSeverityCode.java b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/StudentValidationIssueSeverityCode.java deleted file mode 100644 index 9e27411..0000000 --- a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/StudentValidationIssueSeverityCode.java +++ /dev/null @@ -1,26 +0,0 @@ -package ca.bc.gov.educ.eas.api.rules; - -import lombok.Getter; - -import java.util.Arrays; -import java.util.Optional; - -public enum StudentValidationIssueSeverityCode { - - ERROR("ERROR","Error"), - WARNING("WARNING","Warning"), - ; - - @Getter - private final String label; - @Getter - private final String code; - StudentValidationIssueSeverityCode(String code, String label) { - this.code = code; - this.label = label; - } - - public static Optional findByValue(String value) { - return Arrays.stream(values()).filter(e -> Arrays.asList(e.code).contains(value)).findFirst(); - } -} diff --git a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/AssessmentValidationBaseRule.java b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/AssessmentValidationBaseRule.java index 37b0db3..8139471 100644 --- a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/AssessmentValidationBaseRule.java +++ b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/AssessmentValidationBaseRule.java @@ -1,7 +1,6 @@ package ca.bc.gov.educ.eas.api.rules.assessment; import ca.bc.gov.educ.eas.api.rules.Rule; -import ca.bc.gov.educ.eas.api.rules.StudentValidationIssueSeverityCode; import ca.bc.gov.educ.eas.api.struct.v1.AssessmentStudentValidationIssue; import ca.bc.gov.educ.eas.api.struct.v1.StudentRuleData; @@ -11,9 +10,8 @@ public interface AssessmentValidationBaseRule extends Rule { - default AssessmentStudentValidationIssue createValidationIssue(StudentValidationIssueSeverityCode severityCode, AssessmentStudentValidationFieldCode fieldCode, AssessmentStudentValidationIssueTypeCode typeCode){ + default AssessmentStudentValidationIssue createValidationIssue(AssessmentStudentValidationFieldCode fieldCode, AssessmentStudentValidationIssueTypeCode typeCode){ AssessmentStudentValidationIssue assessmentStudentValidationIssue = new AssessmentStudentValidationIssue(); - assessmentStudentValidationIssue.setValidationIssueSeverityCode(severityCode.toString()); assessmentStudentValidationIssue.setValidationIssueCode(typeCode.getCode()); assessmentStudentValidationIssue.setValidationIssueFieldCode(fieldCode.getCode()); assessmentStudentValidationIssue.setAssessmentStudentValidationMessage(typeCode.getMessage()); diff --git a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V001StudentPEN.java b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V001StudentPEN.java index ba921e0..3017269 100644 --- a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V001StudentPEN.java +++ b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V001StudentPEN.java @@ -1,6 +1,5 @@ package ca.bc.gov.educ.eas.api.rules.assessment.ruleset; -import ca.bc.gov.educ.eas.api.rules.StudentValidationIssueSeverityCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationFieldCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationIssueTypeCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentValidationBaseRule; @@ -47,7 +46,7 @@ public List executeValidation(StudentRuleData if(studentRuleData.getStudentApiStudent() == null){ log.debug("V001: Student PEN is invalid :: {}", student.getPen()); - errors.add(createValidationIssue(StudentValidationIssueSeverityCode.ERROR, AssessmentStudentValidationFieldCode.PEN, AssessmentStudentValidationIssueTypeCode.PEN_INVALID)); + errors.add(createValidationIssue(AssessmentStudentValidationFieldCode.PEN, AssessmentStudentValidationIssueTypeCode.PEN_INVALID)); } return errors; diff --git a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V002StudentSchool.java b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V002StudentSchool.java index 132d226..791f39d 100644 --- a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V002StudentSchool.java +++ b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V002StudentSchool.java @@ -1,6 +1,5 @@ package ca.bc.gov.educ.eas.api.rules.assessment.ruleset; -import ca.bc.gov.educ.eas.api.rules.StudentValidationIssueSeverityCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationFieldCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationIssueTypeCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentValidationBaseRule; @@ -48,7 +47,7 @@ public List executeValidation(StudentRuleData if(studentRuleData.getSchool() == null || !RuleUtil.isSchoolValid(studentRuleData.getSchool())){ log.debug("V002: School is not valid for student with PEN :: {}", student.getPen()); - errors.add(createValidationIssue(StudentValidationIssueSeverityCode.ERROR, AssessmentStudentValidationFieldCode.SCHOOL, AssessmentStudentValidationIssueTypeCode.SCHOOL_INVALID)); + errors.add(createValidationIssue(AssessmentStudentValidationFieldCode.SCHOOL, AssessmentStudentValidationIssueTypeCode.SCHOOL_INVALID)); } return errors; diff --git a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V304CourseSession.java b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V304CourseSession.java index 3039f1b..ef56820 100644 --- a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V304CourseSession.java +++ b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V304CourseSession.java @@ -2,7 +2,6 @@ import ca.bc.gov.educ.eas.api.constants.v1.AssessmentTypeCodes; import ca.bc.gov.educ.eas.api.constants.v1.CourseStatusCodes; -import ca.bc.gov.educ.eas.api.rules.StudentValidationIssueSeverityCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationFieldCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationIssueTypeCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentValidationBaseRule; @@ -58,7 +57,7 @@ public List executeValidation(StudentRuleData if(student.getCourseStatusCode() != null && student.getCourseStatusCode().equals(CourseStatusCodes.WITHDRAWN.getCode())){ if(assessmentRulesService.studentHasWrittenAssessment(student.getAssessmentStudentID())){ - errors.add(createValidationIssue(StudentValidationIssueSeverityCode.ERROR, AssessmentStudentValidationFieldCode.COURSE_STATUS, AssessmentStudentValidationIssueTypeCode.COURSE_ALREADY_WRITTEN)); + errors.add(createValidationIssue(AssessmentStudentValidationFieldCode.COURSE_STATUS, AssessmentStudentValidationIssueTypeCode.COURSE_ALREADY_WRITTEN)); } } else { List assessmentCodes = NUMERACY_ASSESSMENT_CODES.contains(student.getAssessmentEntity().getAssessmentTypeCode()) ? NUMERACY_ASSESSMENT_CODES : Collections.singletonList(student.getAssessmentEntity().getAssessmentTypeCode()); @@ -69,10 +68,10 @@ public List executeValidation(StudentRuleData if (studentAssessmentDuplicate != null) { log.debug("V304: The assessment session is a duplicate of an existing {} assessment session for student PEN :: {}", student.getAssessmentEntity().getAssessmentTypeCode(), student.getPen()); - errors.add(createValidationIssue(StudentValidationIssueSeverityCode.ERROR, AssessmentStudentValidationFieldCode.COURSE_CODE, AssessmentStudentValidationIssueTypeCode.COURSE_SESSION_DUP)); + errors.add(createValidationIssue(AssessmentStudentValidationFieldCode.COURSE_CODE, AssessmentStudentValidationIssueTypeCode.COURSE_SESSION_DUP)); }else if (studentWritesExceeded) { log.debug("V304: Student has already reached the maximum number of writes for the {} Assessment for student PEN :: {}", student.getAssessmentEntity().getAssessmentTypeCode(), student.getPen()); - errors.add(createValidationIssue(StudentValidationIssueSeverityCode.ERROR, AssessmentStudentValidationFieldCode.COURSE_CODE, AssessmentStudentValidationIssueTypeCode.COURSE_SESSION_EXCEED)); + errors.add(createValidationIssue(AssessmentStudentValidationFieldCode.COURSE_CODE, AssessmentStudentValidationIssueTypeCode.COURSE_SESSION_EXCEED)); } } diff --git a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V317ExamSchool.java b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V317ExamSchool.java index ee7133f..65752c9 100644 --- a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V317ExamSchool.java +++ b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V317ExamSchool.java @@ -1,7 +1,6 @@ package ca.bc.gov.educ.eas.api.rules.assessment.ruleset; import ca.bc.gov.educ.eas.api.rest.RestUtils; -import ca.bc.gov.educ.eas.api.rules.StudentValidationIssueSeverityCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationFieldCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationIssueTypeCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentValidationBaseRule; @@ -59,7 +58,7 @@ public List executeValidation(StudentRuleData if(assessmentCenter.isEmpty() || !RuleUtil.isSchoolValid(assessmentCenter.get())){ log.debug("V317: Invalid assessment centre provided with schoolID :: {}", student.getSchoolID()); - errors.add(createValidationIssue(StudentValidationIssueSeverityCode.ERROR, AssessmentStudentValidationFieldCode.EXAM_SCHOOL, AssessmentStudentValidationIssueTypeCode.EXAM_SCHOOL_INVALID)); + errors.add(createValidationIssue(AssessmentStudentValidationFieldCode.EXAM_SCHOOL, AssessmentStudentValidationIssueTypeCode.EXAM_SCHOOL_INVALID)); } } diff --git a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V319CourseCodeCSF.java b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V319CourseCodeCSF.java index 15d72e2..c473e94 100644 --- a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V319CourseCodeCSF.java +++ b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V319CourseCodeCSF.java @@ -2,7 +2,6 @@ import ca.bc.gov.educ.eas.api.constants.v1.AssessmentTypeCodes; import ca.bc.gov.educ.eas.api.constants.v1.SchoolReportingRequirementCodes; -import ca.bc.gov.educ.eas.api.rules.StudentValidationIssueSeverityCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationFieldCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationIssueTypeCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentValidationBaseRule; @@ -49,7 +48,7 @@ public List executeValidation(StudentRuleData if (studentRuleData.getSchool().getSchoolReportingRequirementCode().equalsIgnoreCase(SchoolReportingRequirementCodes.CSF.getCode()) && student.getAssessmentEntity().getAssessmentTypeCode().equalsIgnoreCase(AssessmentTypeCodes.LTF12.getCode())){ log.debug("V319: Student is in a Francophone school and cannot register for this assessment session for student with PEN :: {}", student.getPen()); - errors.add(createValidationIssue(StudentValidationIssueSeverityCode.ERROR, AssessmentStudentValidationFieldCode.COURSE_CODE, AssessmentStudentValidationIssueTypeCode.COURSE_CODE_CSF)); + errors.add(createValidationIssue(AssessmentStudentValidationFieldCode.COURSE_CODE, AssessmentStudentValidationIssueTypeCode.COURSE_CODE_CSF)); } return errors; diff --git a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V320ValidStudentInDEM.java b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V320ValidStudentInDEM.java index 5fd3070..e51c88a 100644 --- a/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V320ValidStudentInDEM.java +++ b/api/src/main/java/ca/bc/gov/educ/eas/api/rules/assessment/ruleset/V320ValidStudentInDEM.java @@ -1,7 +1,6 @@ package ca.bc.gov.educ.eas.api.rules.assessment.ruleset; import ca.bc.gov.educ.eas.api.model.v1.AssessmentStudentEntity; -import ca.bc.gov.educ.eas.api.rules.StudentValidationIssueSeverityCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationFieldCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationIssueTypeCode; import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentValidationBaseRule; @@ -51,12 +50,12 @@ public List executeValidation(StudentRuleData boolean givenNameMatches = RuleUtil.validateStudentGivenNameMatches(student, studentRuleData.getStudentApiStudent()); if (!surnameMatches) { log.debug("V320: Student's surname does not match Student API record for PEN :: {}", student.getPen()); - errors.add(createValidationIssue(StudentValidationIssueSeverityCode.ERROR, AssessmentStudentValidationFieldCode.SURNAME, AssessmentStudentValidationIssueTypeCode.SURNAME_MISMATCH)); + errors.add(createValidationIssue(AssessmentStudentValidationFieldCode.SURNAME, AssessmentStudentValidationIssueTypeCode.SURNAME_MISMATCH)); } if(!givenNameMatches){ log.debug("V320: Student's given name does not match Student API record for PEN :: {}", student.getPen()); - errors.add(createValidationIssue(StudentValidationIssueSeverityCode.ERROR, AssessmentStudentValidationFieldCode.GIVEN_NAME, AssessmentStudentValidationIssueTypeCode.GIVEN_NAME_MISMATCH)); + errors.add(createValidationIssue(AssessmentStudentValidationFieldCode.GIVEN_NAME, AssessmentStudentValidationIssueTypeCode.GIVEN_NAME_MISMATCH)); } return errors;