Add LocalDateTime serialization to cache in redis

ris-tlp · Mar 6, 2024 · c0e613e · c0e613e
1 parent b3dd9b8
commit c0e613e
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 13 deletions.
diff --git a/...com/observatory/observationtracker/domain/celestialevent/dto/CreateCelestialEventDto.java b/...com/observatory/observationtracker/domain/celestialevent/dto/CreateCelestialEventDto.java
@@ -1,6 +1,10 @@
 package com.observatory.observationtracker.domain.celestialevent.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 
 import java.time.LocalDateTime;
 
@@ -11,6 +15,8 @@ public class CreateCelestialEventDto {
     private String celestialEventDescription;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime celestialEventDateTime;
 
     public String getCelestialEventName() {

diff --git a/...observatory/observationtracker/domain/celestialevent/dto/GetCelestialEventCommentDto.java b/...observatory/observationtracker/domain/celestialevent/dto/GetCelestialEventCommentDto.java
@@ -7,10 +7,15 @@
 
 public class GetCelestialEventCommentDto {
     private String content;
+
     private String uuid;
+
     private GetUserAccountDto author;
+
     private Timestamp createdTimestamp;
+
     private Timestamp updatedTimestamp;
+
     private List<GetCelestialEventCommentDto> replies;
 
 

diff --git a/...va/com/observatory/observationtracker/domain/celestialevent/dto/GetCelestialEventDto.java b/...va/com/observatory/observationtracker/domain/celestialevent/dto/GetCelestialEventDto.java
@@ -1,6 +1,10 @@
 package com.observatory.observationtracker.domain.celestialevent.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.observatory.observationtracker.domain.celestialevent.models.CelestialEventStatus;
 
 import java.sql.Timestamp;
@@ -15,6 +19,8 @@ public class GetCelestialEventDto extends GetSlimCelestialEventDto{
     private String uuid;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime celestialEventDateTime;
 
     private List<GetCelestialEventCommentDto> comments;

diff --git a/...rvatory/observationtracker/domain/celestialevent/dto/GetSlimCelestialEventCommentDto.java b/...rvatory/observationtracker/domain/celestialevent/dto/GetSlimCelestialEventCommentDto.java
@@ -8,9 +8,13 @@
 // Primarily used to return a reply once created
 public class GetSlimCelestialEventCommentDto {
     private String content;
+
     private GetUserAccountDto author;
+
     private Timestamp createdTimestamp;
+
     private Timestamp updatedTimestamp;
+
     private String uuid;
 
     public String getContent() {

diff --git a/...om/observatory/observationtracker/domain/celestialevent/dto/GetSlimCelestialEventDto.java b/...om/observatory/observationtracker/domain/celestialevent/dto/GetSlimCelestialEventDto.java
@@ -14,27 +14,23 @@
 
 public class GetSlimCelestialEventDto {
     private String uuid;
+
     private String celestialEventName;
+
     private String celestialEventDescription;
+
     private List<GetCelestialEventImageDto> images;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime celestialEventDateTime;
+
     private Timestamp createdTimestamp;
+
     private Timestamp updatedTimestamp;
-    private CelestialEventStatus eventStatus;
 
-//    public GetSlimCelestialEventDto(CelestialEvent event) {
-//        this.uuid = event.getUuid();
-//        this.celestialEventName = event.getCelestialEventName();
-//        this.celestialEventDescription = event.getCelestialEventDescription();
-//        this.celestialEventDateTime = event.getCelestialEventDateTime();
-//        this.createdTimestamp = event.getCreatedTimestamp();
-//        this.updatedTimestamp = event.getUpdatedTimestamp();
-//        this.eventStatus = event.getEventStatus();
-//
-//    }
+    private CelestialEventStatus eventStatus;
 
     public String getUuid() {
         return uuid;

diff --git a/.../java/com/observatory/observationtracker/domain/observation/dto/CreateObservationDto.java b/.../java/com/observatory/observationtracker/domain/observation/dto/CreateObservationDto.java
@@ -1,6 +1,10 @@
 package com.observatory.observationtracker.domain.observation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 
 import java.time.LocalDateTime;
 
@@ -10,6 +14,8 @@ public class CreateObservationDto {
     private String observationDescription;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime observationDateTime;
 
     public String getObservationName() {

diff --git a/...a/com/observatory/observationtracker/domain/observation/dto/GetObservationCommentDto.java b/...a/com/observatory/observationtracker/domain/observation/dto/GetObservationCommentDto.java
@@ -7,10 +7,15 @@
 
 public class GetObservationCommentDto {
     private String content;
+
     private String uuid;
+
     private GetUserAccountDto author;
+
     private Timestamp createdTimestamp;
+
     private Timestamp updatedTimestamp;
+
     private List<GetObservationCommentDto> replies;
 
     public String getContent() {

diff --git a/...java/com/observatory/observationtracker/domain/observation/dto/GetSlimObservationDto.java b/...java/com/observatory/observationtracker/domain/observation/dto/GetSlimObservationDto.java
@@ -1,15 +1,17 @@
 package com.observatory.observationtracker.domain.observation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.observatory.observationtracker.domain.celestialevent.dto.GetSlimCelestialEventDto;
 import com.observatory.observationtracker.domain.useraccount.dto.GetUserAccountDto;
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.util.List;
 
-
-// @TODO: Fix author showing as null
 public class GetSlimObservationDto {
     private String uuid;
 
@@ -20,6 +22,8 @@ public class GetSlimObservationDto {
     private List<GetObservationImageDto> images;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime observationDateTime;
 
     private Timestamp createdTimestamp;