Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-7631: add EntryType IMAGE_HINT #199

Merged
kilian.schuettler1 merged 2 commits from RED-7631 into master 2023-10-26 12:09:26 +02:00
Conversation 9 Commits 2 Files Changed 9 +27 -151
9 changed files with 27 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/EntryType.java
View File

@ -7,5 +7,6 @@ public enum EntryType {
RECOMMENDATION,
FALSE_RECOMMENDATION,
IMAGE,
IMAGE_HINT,
AREA
}

2
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/BaseAnnotation.java
View File

@ -8,8 +8,10 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode

26
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/IdRemoval.java
View File

@ -1,37 +1,19 @@
package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped;
import java.time.OffsetDateTime;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
import lombok.Builder;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class IdRemoval extends BaseAnnotation {
private boolean removeFromDictionary;
private boolean removeFromAllDossiers;
@Builder
public IdRemoval(String annotationId,
String fileId,
String user,
AnnotationStatus status,
OffsetDateTime requestDate,
OffsetDateTime processedDate,
OffsetDateTime softDeletedTime,
boolean removeFromDictionary,
boolean removeFromAllDossiers) {
super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
this.removeFromDictionary = removeFromDictionary;
this.removeFromAllDossiers = removeFromAllDossiers;
}
}

24
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/ManualForceRedaction.java
View File

@ -1,34 +1,18 @@
package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped;
import java.time.OffsetDateTime;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
import lombok.Builder;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class ManualForceRedaction extends BaseAnnotation {
private String legalBasis;
@Builder
public ManualForceRedaction(String annotationId,
String fileId,
String user,
AnnotationStatus status,
OffsetDateTime requestDate,
OffsetDateTime processedDate,
OffsetDateTime softDeletedTime,
String legalBasis) {
super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
this.legalBasis = legalBasis;
}
}

28
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/ManualLegalBasisChange.java
View File

@ -1,16 +1,15 @@
package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped;
import java.time.OffsetDateTime;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
import lombok.Builder;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class ManualLegalBasisChange extends BaseAnnotation {
@ -18,23 +17,4 @@ public class ManualLegalBasisChange extends BaseAnnotation {
private String value;
private String legalBasis;
@Builder
public ManualLegalBasisChange(String annotationId,
String fileId,
String user,
AnnotationStatus status,
OffsetDateTime requestDate,
OffsetDateTime processedDate,
OffsetDateTime softDeletedTime,
String legalBasis,
String section,
String value) {
super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
this.legalBasis = legalBasis;
this.section = section;
this.value = value;
}
}

24
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/ManualRecategorization.java
View File

@ -1,34 +1,18 @@
package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped;
import java.time.OffsetDateTime;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
import lombok.Builder;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class ManualRecategorization extends BaseAnnotation {
private String type;
@Builder
public ManualRecategorization(String annotationId,
String fileId,
String user,
AnnotationStatus status,
OffsetDateTime requestDate,
OffsetDateTime processedDate,
OffsetDateTime softDeletedTime,
String type) {
super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
this.type = type;
}
}

44
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/ManualRedactionEntry.java
View File

@ -1,19 +1,20 @@
package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle;
import lombok.Builder;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class ManualRedactionEntry extends BaseAnnotation {
@ -30,41 +31,4 @@ public class ManualRedactionEntry extends BaseAnnotation {
private String textAfter;
private String sourceId;
@Builder
public ManualRedactionEntry(String annotationId,
String fileId,
String user,
AnnotationStatus status,
OffsetDateTime requestDate,
OffsetDateTime processedDate,
OffsetDateTime softDeletedTime,
String value,
String textBefore,
String textAfter,
boolean rectangle,
boolean addToDictionary,
boolean addToDossierDictionary,
String legalBasis,
String section,
String reason,
String type,
List<Rectangle> positions,
String sourceId) {
super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
this.textBefore = textBefore;
this.textAfter = textAfter;
this.value = value;
this.rectangle = rectangle;
this.addToDictionary = addToDictionary;
this.addToDossierDictionary = addToDossierDictionary;
this.legalBasis = legalBasis;
this.section = section;
this.reason = reason;
this.type = type;
this.positions = positions != null ? positions : new ArrayList<>();
this.sourceId = sourceId;
}
}

28
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/ManualResizeRedaction.java
View File

@ -1,19 +1,20 @@
package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle;
import lombok.Builder;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class ManualResizeRedaction extends BaseAnnotation {
@ -24,25 +25,4 @@ public class ManualResizeRedaction extends BaseAnnotation {
private Boolean updateDictionary;
private boolean addToAllDossiers;
@Builder
public ManualResizeRedaction(String annotationId,
String fileId,
String user,
AnnotationStatus status,
OffsetDateTime requestDate,
OffsetDateTime processedDate,
OffsetDateTime softDeletedTime,
String value,
String textBefore,
String textAfter,
List<Rectangle> positions) {
super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
this.textBefore = textBefore;
this.textAfter = textAfter;
this.value = value;
this.positions = positions != null ? positions : new ArrayList<>();
}
}

1
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/redactionlog/ManualRedactionType.java
View File

@ -1,7 +1,6 @@
package com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog;
@Deprecated(forRemoval = true)
public enum ManualRedactionType {
ADD_LOCALLY,
ADD_TO_DICTIONARY,