Return ZonedDateTime in JSON

metasfresh/metasfresh#6504
metasfresh · Apr 22, 2020 · cb4e371 · cb4e371
1 parent c90d57b
commit cb4e371
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/de/metas/ui/web/notes/NotesService.java b/src/main/java/de/metas/ui/web/notes/NotesService.java
@@ -30,9 +30,9 @@
 import de.metas.util.GuavaCollectors;
 import de.metas.util.Services;
 import lombok.NonNull;
-import org.adempiere.util.lang.ITableRecordReference;
 import org.adempiere.util.lang.impl.TableRecordReference;
 import org.compiere.model.I_CM_ChatEntry;
+import org.compiere.util.TimeUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -48,11 +48,11 @@ public NotesService(final NotesRepository notesRepository)
 	}
 
 	@NonNull
-	public List<JSONNote> getNotesFor(@NonNull final ITableRecordReference tableRecordReference)
+	public List<JSONNote> getNotesFor(@NonNull final TableRecordReference tableRecordReference)
 	{
 		final IUserDAO userDAO = Services.get(IUserDAO.class);
 
-		final List<I_CM_ChatEntry> chatEntries = notesRepository.retrieveAllNotes(tableRecordReference);
+		final List<I_CM_ChatEntry> chatEntries = notesRepository.retrieveNotes(tableRecordReference, 100);
 
 		return chatEntries.stream()
 				.map(it ->
@@ -61,7 +61,7 @@ public List<JSONNote> getNotesFor(@NonNull final ITableRecordReference tableReco
 
 					return JSONNote.builder()
 							.text(it.getCharacterData())
-							.created(it.getCreated().toString())
+							.created(TimeUtil.asZonedDateTime(it.getCreated()))
 							.createdBy(user.getName())
 							.build();
 				})

diff --git a/src/main/java/de/metas/ui/web/notes/json/JSONNote.java b/src/main/java/de/metas/ui/web/notes/json/JSONNote.java
@@ -29,6 +29,8 @@
 import lombok.NonNull;
 import lombok.Value;
 
+import java.time.ZonedDateTime;
+
 @Builder
 @Value
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
@@ -37,7 +39,7 @@ public class JSONNote
 {
 	@NonNull String createdBy;
 
-	@NonNull String created;
+	@NonNull ZonedDateTime created;
 
 	@NonNull String text;
 

diff --git a/src/test/java/de/metas/ui/web/notes/json/JSONNoteTest.java b/src/test/java/de/metas/ui/web/notes/json/JSONNoteTest.java
@@ -25,6 +25,9 @@
 import de.metas.util.JSONObjectMapper;
 import org.junit.jupiter.api.Test;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 class JSONNoteTest
@@ -37,7 +40,7 @@ void testSerialisationDeserialisation()
 
 		final JSONNote expectedNote = JSONNote.builder()
 				.createdBy("who created this?")
-				.created("time when this was created")
+				.created(ZonedDateTime.of(2020, 4, 22, 11, 11, 11, 0, ZoneId.of("UTC+3")))
 				.text("This is a test note.\nTra la la.")
 				.build();