GRAD2-2266: task is completed. (#563)

GRAD2-2266: task is completed.
bcgov · Aug 3, 2023 · 1f1a589 · 1f1a589
1 parent c8ff74b
commit 1f1a589
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/...gov/educ/api/gradstudent/model/transformer/GraduationStudentRecordHistoryTransformer.java b/...gov/educ/api/gradstudent/model/transformer/GraduationStudentRecordHistoryTransformer.java
@@ -2,6 +2,7 @@
 
 import ca.bc.gov.educ.api.gradstudent.model.dto.GraduationStudentRecordHistory;
 import ca.bc.gov.educ.api.gradstudent.model.entity.GraduationStudentRecordHistoryEntity;
+import ca.bc.gov.educ.api.gradstudent.util.DateUtils;
 import ca.bc.gov.educ.api.gradstudent.util.EducGradStudentApiUtils;
 import ca.bc.gov.educ.api.gradstudent.util.GradValidation;
 import org.modelmapper.ModelMapper;
@@ -44,6 +45,8 @@ public List<GraduationStudentRecordHistory> transformToDTO (Iterable<GraduationS
         for (GraduationStudentRecordHistoryEntity graduationStudentRecordHistoryEntity : graduationStudentRecordHistoryEntities) {
             GraduationStudentRecordHistory graduationStudentRecordHistory = modelMapper.map(graduationStudentRecordHistoryEntity, GraduationStudentRecordHistory.class);
         	graduationStudentRecordHistory.setProgramCompletionDate(EducGradStudentApiUtils.formatDate(graduationStudentRecordHistoryEntity.getProgramCompletionDate(), "yyyy/MM"));
+            graduationStudentRecordHistory.setCreateDate(DateUtils.toLocalDateTime(graduationStudentRecordHistoryEntity.getCreateDate()));
+            graduationStudentRecordHistory.setUpdateDate(DateUtils.toLocalDateTime(graduationStudentRecordHistoryEntity.getUpdateDate()));
         	graduationStudentRecordHistoryList.add(graduationStudentRecordHistory);
         }
         return graduationStudentRecordHistoryList;

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/DateUtils.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/DateUtils.java
@@ -0,0 +1,43 @@
+package ca.bc.gov.educ.api.gradstudent.util;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+
+public class DateUtils {
+
+    private DateUtils(){}
+
+    // Date
+    public static LocalDate toLocalDate(Date date) {
+        if(date == null) return null;
+        return date.toInstant()
+                .atZone(ZoneId.systemDefault())
+                .toLocalDate();
+    }
+
+    public static Date toDate(LocalDate localDate) {
+        if(localDate == null) return null;
+        return Date.from(localDate.atStartOfDay()
+                .atZone(ZoneId.systemDefault())
+                .toInstant());
+    }
+
+    // DateTime
+    public static LocalDateTime toLocalDateTime(Date date) {
+        if(date == null) return null;
+        return date.toInstant()
+                .atZone(ZoneId.systemDefault())
+                .toLocalDateTime();
+    }
+
+    public static Date toDate(LocalDateTime localDateTime) {
+        if(localDateTime == null) return null;
+        return Date.from(localDateTime
+                .atZone(ZoneId.systemDefault())
+                .toInstant());
+    }
+
+
+}