From 43044021f23accdaac5663821d659f841a8db8ac Mon Sep 17 00:00:00 2001
From: Jinil Sung <infstar@gmail.com>
Date: Wed, 2 Aug 2023 16:29:56 -0700
Subject: [PATCH] GRAD2-2266: task is completed.

GRAD2-2266: task is completed.
---
 ...uationStudentRecordHistoryTransformer.java |  3 ++
 .../educ/api/gradstudent/util/DateUtils.java  | 43 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/DateUtils.java

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/transformer/GraduationStudentRecordHistoryTransformer.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/transformer/GraduationStudentRecordHistoryTransformer.java
index 1440468a..14dbb1e3 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/transformer/GraduationStudentRecordHistoryTransformer.java
+++ b/api/src/main/java/ca/bc/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
new file mode 100644
index 00000000..7ed4e890
--- /dev/null
+++ 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());
+    }
+
+
+}