GRAD2-3154 - Adult algorithm +1month rule not fully working as required

Author: kamal-mohammed

.gitignore

@@ -55,4 +55,5 @@ build/
 .vscode/
 
 ### Local dev ###
-**/application-local.yaml
+**/application-local.yaml
+**/generate-local-env.sh

api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/GradAlgorithmGraduationStatus.java

@@ -1,12 +1,17 @@
 package ca.bc.gov.educ.api.ruleengine.dto;
 
+import ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
-import java.sql.Date;
+import java.time.LocalDate;
+import java.util.Date;
 import java.util.UUID;
 
+import static ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants.DEFAULT_DATE_FORMAT;
+
 @Data
 @Component
 public class GradAlgorithmGraduationStatus implements Serializable {
@@ -23,5 +28,10 @@ public class GradAlgorithmGraduationStatus implements Serializable {
     private String studentStatus;
     private UUID studentID;
     private String consumerEducationRequirementMet;
-    private Date adultStartDate;
+    @JsonFormat(pattern=DEFAULT_DATE_FORMAT)
+    private LocalDate adultStartDate;
+
+    public Date getAdultStartDate() {
+        return RuleEngineApiUtils.toDate(adultStartDate);
+    }
 }

api/src/main/java/ca/bc/gov/educ/api/ruleengine/util/RuleEngineApiUtils.java

@@ -14,6 +14,7 @@
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.Period;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -41,6 +42,13 @@ public static Date parseDate(String dateString, String dateFormat) throws ParseE
 
         return date;
     }
+
+    public static Date toDate(LocalDate localDate) {
+        if(localDate == null) return null;
+        return Date.from(localDate.atStartOfDay()
+                .atZone(ZoneId.systemDefault())
+                .toInstant());
+    }
 
     public static Date parsingTraxDate(String sessionDate) {
     	 String actualSessionDate = sessionDate + "/01";