From b94adb14f18c63c41744132b815c3bd4dad8b360 Mon Sep 17 00:00:00 2001
From: Tibor Tarnai <tibor.tarnai@sap.com>
Date: Wed, 11 Dec 2019 10:19:33 +0100
Subject: [PATCH 1/2] correct timestamp format

---
 .../src/main/java/com/sap/tamagotchi/model/Device.java   | 4 ++--
 .../main/java/com/sap/tamagotchi/model/DeviceEvent.java  | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Device.java b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Device.java
index 611af3f..ac93b55 100644
--- a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Device.java
+++ b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Device.java
@@ -45,8 +45,8 @@ public class Device {
     }
 
     @JsonProperty("born")
-    public Instant getBorn() {
-        return born;
+    public String getBorn() {
+        return born.toString();
     }
 
     @JsonProperty("healthScore")
diff --git a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/DeviceEvent.java b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/DeviceEvent.java
index 9aede0e..dccd389 100644
--- a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/DeviceEvent.java
+++ b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/DeviceEvent.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.time.Instant;
 
+
 public class DeviceEvent implements IoTMessage {
 
     @JsonProperty("id")
@@ -45,8 +46,8 @@ public class DeviceEvent implements IoTMessage {
     }
 
     @JsonProperty("born")
-    public Instant getBorn() {
-        return born;
+    public String getBorn() {
+        return born.toString();
     }
 
     @JsonProperty("healthScore")
@@ -55,8 +56,8 @@ public class DeviceEvent implements IoTMessage {
     }
 
     @JsonProperty("eventTime")
-    public Instant getEventTime() {
-        return eventTime;
+    public String getEventTime() {
+        return eventTime.toString();
     }
 
     @JsonProperty("isAlive")

From 0467523939609c7f59393ba88a08f641efc4341c Mon Sep 17 00:00:00 2001
From: Tibor Tarnai <tibor.tarnai@sap.com>
Date: Wed, 11 Dec 2019 10:20:27 +0100
Subject: [PATCH 2/2] fix test

---
 .../src/test/java/com/sap/tamagotchi/model/OwnerTest.java       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/tamagotchi-service/src/test/java/com/sap/tamagotchi/model/OwnerTest.java b/src/tamagotchi-service/src/test/java/com/sap/tamagotchi/model/OwnerTest.java
index bbb7bcb..3ee186d 100644
--- a/src/tamagotchi-service/src/test/java/com/sap/tamagotchi/model/OwnerTest.java
+++ b/src/tamagotchi-service/src/test/java/com/sap/tamagotchi/model/OwnerTest.java
@@ -1,7 +1,5 @@
 package com.sap.tamagotchi.model;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class OwnerTest {
 
 }
\ No newline at end of file