Merge pull request #5 from DiSSCo/bug-fix/include-delete-check

Add delete check in query
DiSSCo · Sep 19, 2022 · d0f6f10 · d0f6f10
2 parents 86beeca + cebf775
commit d0f6f10
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/eu/dissco/annotationprocessingservice/repository/AnnotationRepository.java b/src/main/java/eu/dissco/annotationprocessingservice/repository/AnnotationRepository.java
@@ -23,13 +23,15 @@ public class AnnotationRepository {
   private final ObjectMapper mapper;
   private final DSLContext context;
 
-  public Optional<AnnotationRecord> getAnnotation(JsonNode targetId, JsonNode generator, String motivation) {
+  public Optional<AnnotationRecord> getAnnotation(JsonNode targetId, JsonNode generator,
+      String motivation) {
     var query = context.select(NEW_ANNOTATION.asterisk())
         .distinctOn(NEW_ANNOTATION.ID)
         .from(NEW_ANNOTATION)
         .where(NEW_ANNOTATION.TARGET_ID.eq(targetId.get("id").asText()))
         .and(NEW_ANNOTATION.GENERATOR_ID.eq(generator.get("id").asText()))
-        .and(NEW_ANNOTATION.MOTIVATION.eq(motivation));
+        .and(NEW_ANNOTATION.MOTIVATION.eq(motivation))
+        .and(NEW_ANNOTATION.DELETED.isNull());
     if (targetId.get("fieldSet") != null) {
       query.and(NEW_ANNOTATION.TARGET_FIELD.eq(targetId.get("fieldSet").asText()));
     }