update annotation table

src/main/java/eu/dissco/backend/repository/AnnotationRepository.java

@@ -44,16 +44,16 @@ public Optional<Annotation> getActiveAnnotationForUser(String id, String userId)
     return context.select(ANNOTATION.asterisk())
         .from(ANNOTATION)
         .where(ANNOTATION.ID.eq(id))
-        .and(ANNOTATION.CREATOR_ID.eq(userId))
-        .and(ANNOTATION.TOMBSTONED_ON.isNull())
+        .and(ANNOTATION.CREATOR.eq(userId))
+        .and(ANNOTATION.TOMBSTONED.isNull())
         .fetchOptional(this::mapToAnnotation);
   }
 
   public List<Annotation> getForTarget(String id) {
     return context.select(ANNOTATION.DATA)
         .from(ANNOTATION)
         .where(ANNOTATION.TARGET_ID.eq(id))
-        .and(ANNOTATION.TOMBSTONED_ON.isNull())
+        .and(ANNOTATION.TOMBSTONED.isNull())
         .fetch(this::mapToAnnotation);
   }
 

src/test/java/eu/dissco/backend/repository/AnnotationRepositoryIT.java

@@ -123,7 +123,7 @@ void testNullResponse() throws Exception {
         .set(ANNOTATION.MOTIVATION, annotation.getOaMotivation().value())
         .set(ANNOTATION.MJR_JOB_ID, annotation.getOdsJobID())
         .set(ANNOTATION.BATCH_ID, annotation.getOdsBatchID())
-        .set(ANNOTATION.CREATOR_ID, annotation.getDctermsCreator().getId())
+        .set(ANNOTATION.CREATOR, annotation.getDctermsCreator().getId())
         .set(ANNOTATION.CREATED, annotation.getDctermsCreated().toInstant())
         .set(ANNOTATION.MODIFIED, annotation.getDctermsModified().toInstant())
         .set(ANNOTATION.LAST_CHECKED, annotation.getDctermsCreated().toInstant())
@@ -145,7 +145,7 @@ private void postAnnotations(List<Annotation> annotations) throws JsonProcessing
           .set(ANNOTATION.MOTIVATION, annotation.getOaMotivation().value())
           .set(ANNOTATION.MJR_JOB_ID, annotation.getOdsJobID())
           .set(ANNOTATION.BATCH_ID, annotation.getOdsBatchID())
-          .set(ANNOTATION.CREATOR_ID, annotation.getDctermsCreator().getId())
+          .set(ANNOTATION.CREATOR, annotation.getDctermsCreator().getId())
           .set(ANNOTATION.CREATED, annotation.getDctermsCreated().toInstant())
           .set(ANNOTATION.MODIFIED, annotation.getDctermsModified().toInstant())
           .set(ANNOTATION.LAST_CHECKED, annotation.getDctermsCreated().toInstant())
@@ -157,7 +157,7 @@ private void postAnnotations(List<Annotation> annotations) throws JsonProcessing
           .set(ANNOTATION.MOTIVATION, annotation.getOaMotivation().value())
           .set(ANNOTATION.MJR_JOB_ID, annotation.getOdsJobID())
           .set(ANNOTATION.BATCH_ID, annotation.getOdsBatchID())
-          .set(ANNOTATION.CREATOR_ID, annotation.getDctermsCreator().getId())
+          .set(ANNOTATION.CREATOR, annotation.getDctermsCreator().getId())
           .set(ANNOTATION.CREATED, annotation.getDctermsCreated().toInstant())
           .set(ANNOTATION.MODIFIED, annotation.getDctermsModified().toInstant())
           .set(ANNOTATION.LAST_CHECKED, annotation.getDctermsCreated().toInstant())

src/test/resources/db/migration/V1__init_db.sql

@@ -22,11 +22,11 @@ create table annotation
     motivation      text                     not null,
     mjr_job_id      text,
     batch_id        uuid,
-    creator_id      text                     not null,
+    creator      text                     not null,
     created         timestamp with time zone not null,
     modified        timestamp with time zone not null,
     last_checked    timestamp with time zone not null,
-    tombstoned_on   timestamp with time zone,
+    tombstoned   timestamp with time zone,
     target_id       text                     not null,
     data            jsonb
 );