fix: fixing data loading due to date type (#1373)

* fix: fixing data loading due to date type * fix: fixing data loading due to date type * fix: fixing data loading due to date type * fix: fixing data loading due to date type
bcgov · Jan 6, 2025 · 9b2415c · 9b2415c
1 parent 59868a2
commit 9b2415c
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 21 deletions.
diff --git a/backend/src/main/java/ca/bc/gov/app/converters/ForestClientObfuscate.java b/backend/src/main/java/ca/bc/gov/app/converters/ForestClientObfuscate.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
 import lombok.SneakyThrows;
@@ -110,7 +111,7 @@ private String obfuscate(String propName, String propType, Object value) {
     }
 
     if ("birthdate".equals(propName)) {
-      return obfuscateBirthdate((LocalDate) value);
+      return obfuscateBirthdate((LocalDateTime) value);
     }
 
     return value.toString();
@@ -122,7 +123,7 @@ private String obfuscate(String propName, String propType, Object value) {
    * @param value The birthdate to obfuscate.
    * @return The obfuscated birthdate as a string.
    */
-  private String obfuscateBirthdate(LocalDate value) {
+  private String obfuscateBirthdate(LocalDateTime value) {
     return String.format("%d-**-**", value.getYear());
   }
 

diff --git a/backend/src/main/java/ca/bc/gov/app/dto/legacy/ForestClientDetailsDto.java b/backend/src/main/java/ca/bc/gov/app/dto/legacy/ForestClientDetailsDto.java
@@ -1,6 +1,6 @@
 package ca.bc.gov.app.dto.legacy;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import lombok.With;
 
@@ -49,10 +49,10 @@ public record ForestClientDetailsDto(
     String clientAcronym,
     String wcbFirmNumber,
     String clientComment,
-    LocalDate clientCommentUpdateDate,
+    LocalDateTime clientCommentUpdateDate,
     String clientCommentUpdateUser,
     String goodStandingInd,
-    LocalDate birthdate,
+    LocalDateTime birthdate,
 
     List<ForestClientLocationDto> addresses,
     List<ForestClientContactDto> contacts,

diff --git a/backend/src/test/java/ca/bc/gov/app/converters/ForestClientObfuscateTest.java b/backend/src/test/java/ca/bc/gov/app/converters/ForestClientObfuscateTest.java
@@ -8,6 +8,8 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -59,7 +61,7 @@ void shouldNotObfuscateForNonViewers() throws Exception {
     String json = mapper.writeValueAsString(getDto());
     assertThat(json)
         .contains("\"clientIdentification\":\"12345678\"")
-        .contains("\"birthdate\":\"1070-12-13\"");
+        .contains("\"birthdate\":\"1070-12-13T00:00\"");
   }
 
   @Test
@@ -68,7 +70,7 @@ void shouldNotObfuscateEvenIfHasViewer() throws Exception {
     String json = mapper.writeValueAsString(getDto());
     assertThat(json)
         .contains("\"clientIdentification\":\"12345678\"")
-        .contains("\"birthdate\":\"1070-12-13\"");
+        .contains("\"birthdate\":\"1070-12-13T00:00\"");
   }
 
   private ForestClientDetailsDto getDto() {
@@ -92,7 +94,7 @@ private ForestClientDetailsDto getDto() {
         null,
         null,
         null,
-        LocalDate.of(1070, 12, 13),
+        LocalDateTime.of(LocalDate.of(1070, 12, 13), LocalTime.MIN),
         List.of(),
         List.of(),
         List.of()

diff --git a/backend/src/test/java/ca/bc/gov/app/service/client/ClientServiceIntegrationTest.java b/backend/src/test/java/ca/bc/gov/app/service/client/ClientServiceIntegrationTest.java
@@ -1,6 +1,7 @@
 package ca.bc.gov.app.service.client;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
 import java.util.List;
 import org.junit.jupiter.api.DisplayName;
@@ -41,6 +42,7 @@ class ClientServiceIntegrationTest extends AbstractTestContainerIntegrationTest
   void testGetClientDetailsWithGoodStandingIndicator() {
     String clientNumber = "123456";
     String corpRegnNmbr = "9607514";
+    LocalDateTime date = LocalDateTime.of(2021, 1, 1, 0, 0, 0);
 
     ForestClientDetailsDto initialDto = new ForestClientDetailsDto(
         clientNumber, 
@@ -59,7 +61,7 @@ void testGetClientDetailsWithGoodStandingIndicator() {
         "MYCO", 
         "678", 
         "Test Client", 
-        LocalDate.now(), 
+        date,
         "Admin", 
         null, 
         null, 
@@ -143,7 +145,7 @@ void testGetClientDetailsWithGoodStandingIndicator() {
         "MYCO", 
         "678", 
         "Test Client", 
-        LocalDate.now(), 
+        date,
         "Admin", 
         "Y", 
         null, 

diff --git a/frontend/src/pages/client-details/SummaryView.vue b/frontend/src/pages/client-details/SummaryView.vue
@@ -35,6 +35,14 @@ const doingBusinessAs = computed(() => {
 const birthdateLabel = computed(() =>
   props.data.birthdate.length > 4 ? "Date of birth" : "Year of birth",
 );
+
+const dateOfBirth = computed(() => {
+
+  if(props.data.birthdate) {
+    return new Date(props.data.birthdate).toISOString().split('T')[0];
+  }
+  return '';
+});
 </script>
 
 <template>
@@ -78,8 +86,8 @@ const birthdateLabel = computed(() =>
     >
       <span class="body-compact-01">{{ props.data.clientIdentification }}</span>
     </read-only-component>
-    <read-only-component :label="birthdateLabel" id="dateOfBirth" v-if="props.data.birthdate">
-      <span class="body-compact-01">{{ props.data.birthdate }}</span>
+    <read-only-component :label="birthdateLabel" id="dateOfBirth" v-if="dateOfBirth">
+      <span class="body-compact-01">{{ dateOfBirth }}</span>
     </read-only-component>
     <read-only-component label="Status" id="status">
       <span class="body-compact-01">

diff --git a/legacy/src/main/java/ca/bc/gov/app/dto/ForestClientDetailsDto.java b/legacy/src/main/java/ca/bc/gov/app/dto/ForestClientDetailsDto.java
@@ -1,6 +1,6 @@
 package ca.bc.gov.app.dto;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import lombok.With;
 
@@ -22,14 +22,14 @@ public record ForestClientDetailsDto(
     String clientAcronym,
     String wcbFirmNumber,
     String clientComment,
-    LocalDate clientCommentUpdateDate,
+    LocalDateTime clientCommentUpdateDate,
     String clientCommentUpdateUser,
     String goodStandingInd,
-    LocalDate birthdate,
-    
+    LocalDateTime birthdate,
+
     List<ForestClientLocationDto> addresses,
     List<ForestClientContactDto> contacts,
     List<ClientDoingBusinessAsDto> doingBusinessAs
-  ) {
-    
-  }
+) {
+
+}
diff --git a/legacy/src/main/java/ca/bc/gov/app/repository/ForestClientRepository.java b/legacy/src/main/java/ca/bc/gov/app/repository/ForestClientRepository.java
@@ -79,8 +79,8 @@ Flux<ForestClientEntity> findClientByIncorporationOrName(
           c.client_acronym,
           c.wcb_firm_number,
           c.client_comment,
-          fca.update_userid as latest_update_userid,
-          fca.update_timestamp as latest_update_timestamp,
+          fca.update_userid as client_comment_update_user,
+          fca.update_timestamp as client_comment_update_date,
           '' as good_standing_ind,
           c.birthdate
       from the.forest_client c