Cndit 1243 externalize timezone

data-ingestion-service/src/main/java/gov/cdc/dataingestion/deadletter/repository/model/ElrDeadLetterModel.java

@@ -34,9 +34,7 @@ public class ElrDeadLetterModel {
     @Column(name="message")
     private String message;
 
-    @Basic(optional = false)
-    @Column(name = "created_on",insertable = false, updatable = false)
-    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "created_on")
     private Timestamp createdOn;
 
     @Column(name = "updated_on")

data-ingestion-service/src/main/java/gov/cdc/dataingestion/share/helper/TimeStampHelper.java

@@ -1,24 +1,48 @@
 package gov.cdc.dataingestion.share.helper;
 
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
+@Service
 public class TimeStampHelper {
-    private TimeStampHelper() {
 
+    private static String timeZone;
+
+    private TimeStampHelper() {
     }
+
+    /**
+     * Create timestamp with the given timezone. Default UTC
+     * Timezones: UTC America/New_York America/Chicago America/Denver America/Phoenix America/Los_Angeles
+     * @return Timestamp
+     */
     public static Timestamp getCurrentTimeStamp() {
         // Another Option: Timestamp.from(ZonedDateTime.now().toInstant()) //NOSONAR
         //return Timestamp.from(Instant.now());//old implementation. //NOSONAR
+
+        if (timeZone == null || timeZone.isBlank()) {
+            timeZone="UTC";
+        }
         LocalDateTime ldt = LocalDateTime.now();
         ZonedDateTime zdt = ZonedDateTime.of(ldt, ZoneId.systemDefault());
-        ZonedDateTime gmt = zdt.withZoneSameInstant(ZoneId.of("UTC"));
+        ZonedDateTime gmt = zdt.withZoneSameInstant(ZoneId.of(timeZone));
         return Timestamp.valueOf(gmt.toLocalDateTime());
     }
     public static Instant getInstantNow() {
         return Instant.now();
     }
-}
+    @SuppressWarnings("java:S2696")
+    @Value("${app.timezone}")
+    public void setEnvTimeZone(String envTimeZone){
+        timeZone=envTimeZone;
+    }
+    public String getEnvTimeZone(){
+        return timeZone;
+    }
+}

data-ingestion-service/src/main/resources/application.yaml

@@ -56,6 +56,14 @@ spring:
     show-sql: true
     hibernate:
       ddl-auto: none
+    properties:
+      hibernate:
+        default_schema: dbo
+        format_sql: true
+        jdbc:
+          time_zone: UTC
+        timezone:
+          default_storage: NORMALIZE
   kafka:
     bootstrap-servers: ${BOOTSTRAP_SERVERS}
     group-id: data-ingestion-group
@@ -111,6 +119,14 @@ spring:
     show-sql: true
     hibernate:
       ddl-auto: none
+    properties:
+      hibernate:
+        default_schema: dbo
+        format_sql: true
+        jdbc:
+          time_zone: UTC
+        timezone:
+          default_storage: NORMALIZE
   kafka:
     bootstrap-servers: ${BOOTSTRAP_SERVERS}
     group-id: data-ingestion-group
@@ -155,4 +171,7 @@ sftp:
   enabled: ${DI_SFTP_ENABLED:disabled}
   host: ${DI_SFTP_HOST:dummyhost}
   username: ${DI_SFTP_USER:dummyuser}
-  password: ${DI_SFTP_PWD:dummypwd}
+  password: ${DI_SFTP_PWD:dummypwd}
+
+app:
+  timezone: ${DI_TIMEZONE:UTC}

data-ingestion-service/src/test/java/gov/cdc/dataingestion/share/helper/TimeStampHelperTest.java

@@ -0,0 +1,26 @@
+package gov.cdc.dataingestion.share.helper;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.NullSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+class TimeStampHelperTest {
+
+    @ParameterizedTest
+    @ValueSource(strings = {"UTC", ""})
+    @NullSource
+    void testGetCurrentTimeStampWithEnvTimeZone(String timeStamp) throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+        Constructor<TimeStampHelper> pcc = TimeStampHelper.class.getDeclaredConstructor();
+        pcc.setAccessible(true);
+        TimeStampHelper privateConstructorInstance = pcc.newInstance();
+        privateConstructorInstance.setEnvTimeZone(timeStamp);
+        assertEquals(timeStamp, privateConstructorInstance.getEnvTimeZone());
+        assertNotNull(TimeStampHelper.getCurrentTimeStamp());
+    }
+}