Added eligible flags

Author: cditcher

api/src/main/java/ca/bc/gov/educ/api/graduation/model/dto/EdwGraduationSnapshot.java

@@ -35,4 +35,5 @@ public class EdwGraduationSnapshot {
 
     private String schoolOfRecord;
     private UUID schoolOfRecordId;
+    private String eligible;
 }

api/src/main/java/ca/bc/gov/educ/api/graduation/service/EdwSnapshotService.java

@@ -59,7 +59,7 @@ public EdwGraduationSnapshot processSnapshot(EdwGraduationSnapshot snapshotReque
         boolean isGraduated = StringUtils.isNotBlank(graduatedDate);
         if (isGraduated) {
             // retrieve honour_flag, gpa
-            snapshot = populateSnapshot(gradYear, pen, graduatedDate, "Y", snapshotRequest.getHonoursStanding(), snapshotRequest.getGpa(), schoolOfRecord, schoolOfRecordId);
+            snapshot = populateSnapshot(gradYear, pen, graduatedDate, "Y", snapshotRequest.getHonoursStanding(), snapshotRequest.getGpa(), schoolOfRecord, schoolOfRecordId, null);
         } else {
             snapshot = runHypotheticalGradAlgorithm(pen, gradYear, schoolOfRecord, schoolOfRecordId);
         }
@@ -95,11 +95,11 @@ private EdwGraduationSnapshot runHypotheticalGradAlgorithm(String pen, Integer g
             String gpaStr = graduationData.getGradStatus().getGpa();
             BigDecimal gpa = NumberUtils.isCreatable(gpaStr)? new BigDecimal(gpaStr) : null;
             String honoursStanding = graduationData.getGradStatus().getHonoursStanding();
-            snapshot = populateSnapshot(gradYear, pen, null, "Y", honoursStanding, gpa, schoolOfRecord, schoolOfRecordId);
+            snapshot = populateSnapshot(gradYear, pen, null, "N", honoursStanding, gpa, schoolOfRecord, schoolOfRecordId, "Y");
         } else {
             // non-graduated student
             log.debug(" ==> Not Graduated!");
-            snapshot = populateSnapshot(gradYear, pen, null, "N", null, BigDecimal.ZERO, schoolOfRecord, schoolOfRecordId);
+            snapshot = populateSnapshot(gradYear, pen, null, "N", null, BigDecimal.ZERO, schoolOfRecord, schoolOfRecordId, "N");
         }
         return snapshot;
     }
@@ -128,7 +128,7 @@ public GradSearchStudent getStudentByPenFromStudentApi(String pen) {
         return null;
     }
 
-    private EdwGraduationSnapshot populateSnapshot(Integer gradYear, String pen, String graduatedDate, String gradFlag, String honourFlag, BigDecimal gpa, String schoolOfRecord, UUID schoolOfRecordId) {
+    private EdwGraduationSnapshot populateSnapshot(Integer gradYear, String pen, String graduatedDate, String gradFlag, String honourFlag, BigDecimal gpa, String schoolOfRecord, UUID schoolOfRecordId, String eligible) {
         EdwGraduationSnapshot obj = new EdwGraduationSnapshot();
         obj.setGradYear(gradYear);
         obj.setPen(pen);
@@ -138,6 +138,7 @@ private EdwGraduationSnapshot populateSnapshot(Integer gradYear, String pen, Str
         obj.setGraduatedDate(graduatedDate);
         obj.setSchoolOfRecord(schoolOfRecord);
         obj.setSchoolOfRecordId(schoolOfRecordId);
+        obj.setEligible(eligible);
         return obj;
     }
 }

api/src/test/java/ca/bc/gov/educ/api/graduation/service/EdwSnapshotServiceTest.java

@@ -4,7 +4,6 @@
 import ca.bc.gov.educ.api.graduation.util.EducGraduationApiConstants;
 import ca.bc.gov.educ.api.graduation.util.GradValidation;
 import ca.bc.gov.educ.api.graduation.util.JsonTransformer;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,21 +39,9 @@ public class EdwSnapshotServiceTest {
     @MockBean
     GradStatusService gradStatusService;
 
-    @MockBean
-    ReportService reportService;
-
     @MockBean
     RESTService restService;
 
-    @Autowired
-    JsonTransformer jsonTransformer;
-
-    @Autowired
-    GradValidation validation;
-
-    @Autowired
-    private ExceptionMessage exception;
-
     @Autowired
     private EducGraduationApiConstants constants;
 
@@ -71,11 +58,6 @@ public void setUp() {
         openMocks(this);
     }
 
-    @After
-    public void tearDown() {
-
-    }
-
     @Test
     public void testProcessSnapshotForGradStudent() {
         UUID schoolOfRecordId = UUID.randomUUID();
@@ -92,6 +74,7 @@ public void testProcessSnapshotForGradStudent() {
         assertThat(result.getPen()).isEqualTo(snapshotRequest.getPen());
         assertThat(result.getGraduationFlag()).isEqualTo("Y");
         assertThat(result.getSchoolOfRecordId()).isEqualTo(schoolOfRecordId);
+        assertThat(result.getEligible()).isNull();
     }
 
     @Test
@@ -129,6 +112,7 @@ public void testProcessSnapshotForNonGradStudent() {
         assertThat(result.getPen()).isEqualTo(snapshotRequest.getPen());
         assertThat(result.getGraduationFlag()).isEqualTo("N");
         assertThat(result.getSchoolOfRecordId()).isEqualTo(schoolOfRecordId);
+        assertThat(result.getEligible()).isEqualTo("N");
     }
 
     @Test
@@ -170,9 +154,10 @@ public void testProcessSnapshotForHypotheticalGradStudent() {
         var result = edwSnapshotService.processSnapshot(snapshotRequest);
         assertNotNull(result);
         assertThat(result.getPen()).isEqualTo(snapshotRequest.getPen());
-        assertThat(result.getGraduationFlag()).isEqualTo("Y");
+        assertThat(result.getGraduationFlag()).isEqualTo("N");
         assertThat(result.getGpa()).isEqualByComparingTo("3.80");
         assertThat(result.getHonoursStanding()).isEqualTo("Y");
         assertThat(result.getSchoolOfRecordId()).isEqualTo(schoolOfRecordId);
+        assertThat(result.getEligible()).isEqualTo("Y");
     }
 }