Skip to content

Commit bd16b78

Browse files
chore: add datetime property to event
1 parent 9dd1f4a commit bd16b78

File tree

6 files changed

+32
-9
lines changed

6 files changed

+32
-9
lines changed

src/main/kotlin/entities/events/EmptyEvent.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ package entities.events
1111
/**
1212
* The event sent when the input has not to be propagated to the microservices.
1313
*/
14-
data class EmptyEvent(override val key: String = "EMPTY_EVENT", override val data: Any = "EMPTY_DATA" ) : Event<Any>
14+
data class EmptyEvent(
15+
override val key: String = "EMPTY_EVENT",
16+
override val data: Any = "EMPTY_DATA",
17+
override val dateTime: String = "EMPTY_DATA"
18+
) : Event<Any>

src/main/kotlin/entities/events/Event.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,9 @@ interface Event<out E> {
2222
* The data of the event.
2323
*/
2424
val data: E
25+
26+
/**
27+
* The date and time of the event.
28+
*/
29+
val dateTime: String
2530
}

src/main/kotlin/entities/events/ProcessEvent.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ data class ProcessEvent<E : Any>(
1717

1818
override val data: E,
1919

20+
override val dateTime: String
21+
2022
) : Event<E>

src/main/kotlin/entities/events/RoomEvent.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ data class RoomEvent<E : Any> (
2121

2222
override val data: E,
2323

24+
override val dateTime: String
25+
2426
) : Event<E>

src/main/kotlin/entities/events/TrackingEvent.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@ data class TrackingEvent<E : Any> (
2727

2828
override val data: E,
2929

30+
override val dateTime: String
31+
3032
) : Event<E>

src/main/kotlin/infrastructure/digitaltwins/DTEventParser.kt

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,30 @@ class DTEventParser : EventParser<String> {
6060
when (updateTwinEvent.data.patch[0].path) {
6161
"/temperature" -> RoomEvent(
6262
roomId = updateTwinEvent.id,
63-
data = Temperature(updateTwinEvent.data.patch[0].value as Double)
63+
data = Temperature(updateTwinEvent.data.patch[0].value as Double),
64+
dateTime = updateTwinEvent.eventDateTime
6465
)
6566
"/humidity" -> RoomEvent(
6667
roomId = updateTwinEvent.id,
67-
data = Humidity(updateTwinEvent.data.patch[0].value as Int)
68+
data = Humidity(updateTwinEvent.data.patch[0].value as Int),
69+
dateTime = updateTwinEvent.eventDateTime
6870
)
6971
"/luminosity" -> RoomEvent(
7072
roomId = updateTwinEvent.id,
71-
data = Luminosity(updateTwinEvent.data.patch[0].value as Double)
73+
data = Luminosity(updateTwinEvent.data.patch[0].value as Double),
74+
dateTime = updateTwinEvent.eventDateTime
7275
)
7376
"/presence_inside" -> {
7477
RoomEvent(
7578
roomId = updateTwinEvent.id,
76-
data = Presence(updateTwinEvent.data.patch[0].value as Boolean)
79+
data = Presence(updateTwinEvent.data.patch[0].value as Boolean),
80+
dateTime = updateTwinEvent.eventDateTime
7781
)
7882
}
7983
"/is_on_operating_table" -> {
8084
ProcessEvent(
81-
data = ProcessInfo("Patient on Operating Bed", updateTwinEvent.id)
85+
data = ProcessInfo("Patient on Operating Bed", updateTwinEvent.id),
86+
dateTime = updateTwinEvent.eventDateTime
8287
)
8388
}
8489
else -> EmptyEvent()
@@ -89,10 +94,12 @@ class DTEventParser : EventParser<String> {
8994
"rel_is_inside" -> TrackingEvent(
9095
healthProfessionalId = createdRelationship.data.sourceId,
9196
roomId = createdRelationship.data.targetId,
92-
data = true
97+
data = true,
98+
dateTime = createdRelationship.eventDateTime
9399
)
94100
"rel_use" -> ProcessEvent(
95-
data = MedicalDeviceUsage(createdRelationship.data.targetId, createdRelationship.data.sourceId)
101+
data = MedicalDeviceUsage(createdRelationship.data.targetId, createdRelationship.data.sourceId),
102+
dateTime = createdRelationship.eventDateTime
96103
)
97104
else -> EmptyEvent()
98105
}
@@ -102,7 +109,8 @@ class DTEventParser : EventParser<String> {
102109
"rel_is_inside" -> TrackingEvent(
103110
healthProfessionalId = deletedRelationship.data.sourceId,
104111
roomId = deletedRelationship.data.targetId,
105-
data = false
112+
data = false,
113+
dateTime = deletedRelationship.eventDateTime
106114
)
107115
else -> EmptyEvent()
108116
}

0 commit comments

Comments
 (0)