Remove 'id' field from database schema

thehyve · May 14, 2024 · 680a063 · 680a063
1 parent a093e74
commit 680a063
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 11 deletions.
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
@@ -23,7 +23,6 @@ import org.radarbase.datadashboard.api.domain.model.Observation
 import java.time.Duration
 
 fun Observation.toDto(): ObservationDto = ObservationDto(
-    id = id,
     project = project,
     subject = subject,
     source = source,

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
@@ -25,11 +25,6 @@ import java.util.*
 @Entity
 @Table(name = "observation")
 data class Observation(
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(updatable = false, nullable = false)
-    @Id
-    val id: Long,
-
     @Column(nullable = false)
     @Id
     val project: String,

diff --git a/data-dashboard-backend/src/main/resources/db/changelog/changes/20220309-create-database.xml b/data-dashboard-backend/src/main/resources/db/changelog/changes/20220309-create-database.xml
@@ -25,9 +25,6 @@
 
     <changeSet id="Create observation tables" author="pim" context="dev">
         <createTable tableName="observation">
-            <column name="id" type="bigint" autoIncrement="${autoIncrement}">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
             <column name="project" type="varchar(255)">
                 <constraints primaryKey="true" nullable="false"/>
             </column>

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
@@ -100,7 +100,6 @@ class ObservationResourceTest: JerseyTest() {
 
     private fun createObservation(): Observation {
         return Observation(
-            id = observationId,
             project = "project-1",
             subject = subjectId,
             source = "source-1",

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
@@ -73,7 +73,6 @@ class ObservationServiceTest {
 
     private fun createObservation(): Observation {
         return Observation(
-            id = observationId,
             project = "project-1",
             subject = subjectId,
             source = "source-1",