refactor to use boolean

bcgov · Dec 16, 2024 · e0a62f5 · e0a62f5
1 parent f50a9f3
commit e0a62f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
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
@@ -8,7 +8,6 @@
 import ca.bc.gov.educ.eas.api.service.v1.AssessmentRulesService;
 import ca.bc.gov.educ.eas.api.struct.v1.AssessmentStudentValidationIssue;
 import ca.bc.gov.educ.eas.api.struct.v1.StudentRuleData;
-import ca.bc.gov.educ.eas.api.model.v1.AssessmentStudentEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
@@ -62,11 +61,11 @@ public List<AssessmentStudentValidationIssue> executeValidation(StudentRuleData
         } else {
             List<String> assessmentCodes = NUMERACY_ASSESSMENT_CODES.contains(student.getAssessmentEntity().getAssessmentTypeCode()) ? NUMERACY_ASSESSMENT_CODES : Collections.singletonList(student.getAssessmentEntity().getAssessmentTypeCode());
 
-            AssessmentStudentEntity studentAssessmentDuplicate = assessmentRulesService.studentAssessmentDuplicate(student.getPen(), student.getAssessmentEntity().getAssessmentID(), student.getAssessmentStudentID());
+            boolean hasStudentAssessmentDuplicate = assessmentRulesService.hasStudentAssessmentDuplicate(student.getPen(), student.getAssessmentEntity().getAssessmentID(), student.getAssessmentStudentID());
 
             boolean studentWritesExceeded = assessmentRulesService.studentAssessmentWritesExceeded(student.getPen(), assessmentCodes);
 
-            if (studentAssessmentDuplicate != null) {
+            if (hasStudentAssessmentDuplicate) {
                 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(AssessmentStudentValidationFieldCode.COURSE_CODE, AssessmentStudentValidationIssueTypeCode.COURSE_SESSION_DUP));
             }else if (studentWritesExceeded) {

diff --git a/api/src/main/java/ca/bc/gov/educ/eas/api/service/v1/AssessmentRulesService.java b/api/src/main/java/ca/bc/gov/educ/eas/api/service/v1/AssessmentRulesService.java
@@ -20,10 +20,10 @@ public class AssessmentRulesService {
 
     private static final int studentAssessmentWriteMax = 3;
 
-    public AssessmentStudentEntity studentAssessmentDuplicate(String studentPEN, UUID assessmentID, UUID assessmentStudentID){
+    public boolean hasStudentAssessmentDuplicate(String studentPEN, UUID assessmentID, UUID assessmentStudentID){
         return assessmentStudentRepository.findByAssessmentEntity_AssessmentIDAndPen(assessmentID, studentPEN)
                 .filter(existing -> assessmentStudentID == null || !existing.getAssessmentStudentID().equals(assessmentStudentID))
-                .orElse(null);
+                .isPresent();
     }
 
     public boolean studentAssessmentWritesExceeded(String pen, List<String> assessmentTypeCodes){