Rename database fields

date to observation_time and end_date to observation_time_end
RADAR-base · Jul 4, 2024 · 8b33418 · 8b33418
1 parent 0ec903b
commit 8b33418
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 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
@@ -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/...ard-backend/src/main/java/org/radarbase/datadashboard/api/domain/ObservationRepository.kt b/...ard-backend/src/main/java/org/radarbase/datadashboard/api/domain/ObservationRepository.kt
@@ -34,7 +34,7 @@ class ObservationRepository(
 
         return transact {
             createQuery(
-                "SELECT o FROM Observation o WHERE o.project = :projectId AND o.subject = :subjectId AND o.topic = :topicId ORDER BY o.date DESC",
+                "SELECT o FROM Observation o WHERE o.project = :projectId AND o.subject = :subjectId AND o.topic = :topicId ORDER BY o.observationTime DESC",
                 Observation::class.java,
             ).apply {
                 setParameter("projectId", projectId)

diff --git a/...shboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/mapper/Extensions.kt b/...shboard-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/...shboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Observation.kt b/...shboard-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"

diff --git a/...backend/src/test/java/org/radarbase/datadashboard/api/resource/ObservationResourceTest.kt b/...backend/src/test/java/org/radarbase/datadashboard/api/resource/ObservationResourceTest.kt
@@ -106,10 +106,10 @@ class ObservationResourceTest : JerseyTest() {
             topic = "topic-1",
             category = "category-1",
             variable = "variable-1",
-            date = ZonedDateTime.now(),
+            observationTime = ZonedDateTime.now(),
+            observationTimeEnd = null,
             valueTextual = "value1",
             valueNumeric = null,
-            endDate = null,
         )
     }
 }
diff --git a/...d-backend/src/test/java/org/radarbase/datadashboard/api/service/ObservationServiceTest.kt b/...d-backend/src/test/java/org/radarbase/datadashboard/api/service/ObservationServiceTest.kt
@@ -78,10 +78,10 @@ class ObservationServiceTest {
             topic = "topic-1",
             category = "category-1",
             variable = "variable-1",
-            date = ZonedDateTime.now(),
+            observationTime = ZonedDateTime.now(),
+            observationTimeEnd = null,
             valueTextual = "value1",
             valueNumeric = null,
-            endDate = null,
         )
     }
 }