Timestamp for events is now stored in DB.

Author: Johannes Duesing

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/daos/DatabaseInstanceDAO.scala

@@ -1,6 +1,7 @@
 package de.upb.cs.swt.delphi.instanceregistry.daos
 
 import akka.actor.ActorSystem
+import akka.http.scaladsl.model.DateTime
 import akka.stream.ActorMaterializer
 import de.upb.cs.swt.delphi.instanceregistry.io.swagger.client.model.EventEnums.EventType
 import de.upb.cs.swt.delphi.instanceregistry.{AppLogging, Configuration, Registry}
@@ -252,9 +253,8 @@ class DatabaseInstanceDAO (configuration : Configuration) extends InstanceDAO wi
     if(hasInstance(id) && hasInstanceEvents(id)){
       val eventMapIds = eventMaps.filter(_.instanceId === id).map(_.eventId)
       val resultAll = Await.result(db.run(instanceEvents.filter(_.id in eventMapIds).result), Duration.Inf)
-      val listAll = List() ++ resultAll.map(_.value)
-      val listInstance = listAll.map(c => dataToObjectRegistryEvent(c._2, c._3))
-      Success(listInstance)
+      val listAll = List() ++ resultAll.map(result => dataToObjectRegistryEvent(result._2, result._3, result._4))
+      Success(listAll)
     } else {
       log.warning(s"Cannot get events, id $id not present!")
       Failure(new RuntimeException(s"Cannot get events, id $id not present!"))
@@ -476,8 +476,8 @@ class DatabaseInstanceDAO (configuration : Configuration) extends InstanceDAO wi
     Await.result(db.run(eventMaps.filter(_.instanceId === id).exists.result), Duration.Inf)
   }
 
-  private def dataToObjectRegistryEvent(eventType: String, payload: String): RegistryEvent = {
-    RegistryEvent.apply(getEventTypeFromString(eventType), registryEventPayloadFormat.read(payload.parseJson))
+  private def dataToObjectRegistryEvent(eventType: String, timestamp: DateTime, payload: String): RegistryEvent = {
+    RegistryEvent.apply(getEventTypeFromString(eventType), registryEventPayloadFormat.read(payload.parseJson), timestamp)
   }
 
   private def removeEvents(id: Long): Unit = {

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/daos/Tables.scala

@@ -1,5 +1,9 @@
 package de.upb.cs.swt.delphi.instanceregistry.daos
-import slick.jdbc.H2Profile.api._
+import java.sql.Timestamp
+
+import akka.http.scaladsl.model.DateTime
+import slick.jdbc.MySQLProfile
+import slick.jdbc.MySQLProfile.api._
 import slick.sql.SqlProfile.ColumnOption.NotNull
 
 class Instances(tag: Tag) extends Table[(Long, String, Long, String, String, Option[String], String, String)](tag, "instances") {
@@ -24,12 +28,19 @@ class InstanceMatchingResults(tag: Tag) extends Table[(Long, Long, Boolean)](tag
   def * = (id, instanceId, matchingSuccessful)
 }
 
-class InstanceEvents(tag: Tag) extends Table[(Long, String, String)](tag, "instance_events") {
+class InstanceEvents(tag: Tag) extends Table[(Long, String, DateTime, String)](tag, "instance_events") {
   def id = column[Long]("id", O.PrimaryKey, O.AutoInc) // This is the primary key column
   def eventType = column[String]("eventType", O.Length(100), NotNull)
+  def timestamp = column[DateTime]("timestamp", NotNull)
   def payload = column[String]("payload", O.Length(1000), NotNull)
 
-  def * = (id, eventType, payload)
+  def * = (id, eventType, timestamp, payload)
+
+  implicit def dateTime : MySQLProfile.BaseColumnType[DateTime] =
+    MappedColumnType.base[DateTime, Timestamp](
+      dt => new Timestamp(dt.clicks),
+      ts => DateTime(ts.getTime)
+    )
 }
 
 class EventMaps(tag: Tag) extends Table[(Long, Long, Long)](tag, "event_maps") {