From 147857b9f98b7fd4beb8472656eb2489958311e8 Mon Sep 17 00:00:00 2001
From: Pim van Nierop <pim@thehyve.nl>
Date: Mon, 17 Jun 2024 13:31:03 +0200
Subject: [PATCH] Rename database fields

date to observation_time and end_date to observation_time_end
---
 .../datadashboard/api/api/ObservationDto.kt      |  2 +-
 .../api/domain/mapper/Extensions.kt              |  6 +++---
 .../api/domain/model/Observation.kt              | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/ObservationDto.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/ObservationDto.kt
index a461531..a6ce7c3 100644
--- a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/ObservationDto.kt
+++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/ObservationDto.kt
@@ -37,7 +37,7 @@ data class ObservationDto(
     val category: String?,
 
     /** Date or date-time of the observation. */
-    val date: String?,
+    val observation_time: String?,
 
     /**
      * For how long the observation was valid. Null if there is no duration, or if the observation
diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/mapper/Extensions.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/mapper/Extensions.kt
index c6b46d8..a32d7f9 100644
--- a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/mapper/Extensions.kt
+++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/mapper/Extensions.kt
@@ -28,9 +28,9 @@ fun Observation.toDto(): ObservationDto = ObservationDto(
     source = source,
     topic = topic,
     category = category,
-    date = date.toString(),
-    period = if (endDate != null) {
-        Duration.between(date, endDate).toString()
+    observation_time = observationTime.toString(),
+    period = if (observationTimeEnd != null) {
+        Duration.between(observationTime, observationTimeEnd).toString()
     } else {
         null
     },
diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Observation.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Observation.kt
index c642f31..f118448 100644
--- a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Observation.kt
+++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Observation.kt
@@ -39,7 +39,7 @@ data class Observation(
     @Id
     val source: String,
 
-    @Column(nullable = false)
+    @Column(nullable = false, name = "topic_name")
     @Id
     val topic: String,
 
@@ -49,12 +49,12 @@ data class Observation(
     @Id
     val variable: String,
 
-    @Column(nullable = false)
+    @Column(nullable = false, name = "observation_time")
     @Id
-    val date: ZonedDateTime,
+    val observationTime: ZonedDateTime,
 
-    @Column(name = "end_date")
-    val endDate: ZonedDateTime?,
+    @Column(name = "observation_time_end")
+    val observationTimeEnd: ZonedDateTime?,
 
     @Column(name = "value_textual")
     val valueTextual: String?,
@@ -72,11 +72,11 @@ data class Observation(
             topic == other.topic &&
             category == other.category &&
             variable == other.variable &&
-            date == other.date &&
-            endDate == other.endDate
+            observationTime == other.observationTime &&
+            observationTimeEnd == other.observationTimeEnd
     }
 
-    override fun hashCode(): Int = Objects.hash(subject, variable, date)
+    override fun hashCode(): Int = Objects.hash(subject, variable, observationTime)
 
     companion object {
         internal fun String?.toPrintString() = if (this != null) "'$this'" else "null"