moved changelog to redaction service, removed filename from changelog
This commit is contained in:
parent
44ff9cb775
commit
c05fdb4854
@ -0,0 +1,5 @@
|
|||||||
|
package com.iqser.red.service.redaction.v1.model;
|
||||||
|
|
||||||
|
public enum ChangeType {
|
||||||
|
ADDED, REMOVED
|
||||||
|
}
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
package com.iqser.red.service.redaction.v1.model;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class RedactionChangeLog {
|
||||||
|
|
||||||
|
private List<RedactionChangeLogEntry> redactionLogEntry = new ArrayList<>();
|
||||||
|
|
||||||
|
private long dictionaryVersion = -1;
|
||||||
|
private long rulesVersion = -1;
|
||||||
|
|
||||||
|
private String ruleSetId;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,45 @@
|
|||||||
|
package com.iqser.red.service.redaction.v1.model;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class RedactionChangeLogEntry {
|
||||||
|
|
||||||
|
private String id;
|
||||||
|
private String type;
|
||||||
|
private String value;
|
||||||
|
private String reason;
|
||||||
|
private int matchedRule;
|
||||||
|
private String legalBasis;
|
||||||
|
private boolean redacted;
|
||||||
|
private boolean isHint;
|
||||||
|
private boolean isRecommendation;
|
||||||
|
private String section;
|
||||||
|
private float[] color;
|
||||||
|
|
||||||
|
@Builder.Default
|
||||||
|
private List<Rectangle> positions = new ArrayList<>();
|
||||||
|
private int sectionNumber;
|
||||||
|
private boolean manual;
|
||||||
|
private Status status;
|
||||||
|
private ManualRedactionType manualRedactionType;
|
||||||
|
private boolean isDictionaryEntry;
|
||||||
|
|
||||||
|
private String textBefore;
|
||||||
|
private String textAfter;
|
||||||
|
|
||||||
|
@Builder.Default
|
||||||
|
private List<Comment> comments = new ArrayList<>();
|
||||||
|
|
||||||
|
private ChangeType changeType;
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,13 +1,11 @@
|
|||||||
package com.iqser.red.service.redaction.v1.model;
|
package com.iqser.red.service.redaction.v1.model;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
public class RedactionLog {
|
public class RedactionLog {
|
||||||
|
|
||||||
@ -17,7 +15,6 @@ public class RedactionLog {
|
|||||||
private long rulesVersion = -1;
|
private long rulesVersion = -1;
|
||||||
|
|
||||||
private String ruleSetId;
|
private String ruleSetId;
|
||||||
private String filename;
|
|
||||||
|
|
||||||
|
|
||||||
public RedactionLog(List<RedactionLogEntry> redactionLogEntry, long dictionaryVersion, long rulesVersion, String ruleSetId) {
|
public RedactionLog(List<RedactionLogEntry> redactionLogEntry, long dictionaryVersion, long rulesVersion, String ruleSetId) {
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
package com.iqser.red.service.redaction.v1.server.redaction.service;
|
package com.iqser.red.service.redaction.v1.server.redaction.service;
|
||||||
|
|
||||||
import com.iqser.red.service.file.management.v1.api.model.RedactionChangeLog;
|
|
||||||
import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
|
import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
|
||||||
|
import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
|
||||||
import com.iqser.red.service.redaction.v1.model.RedactionLog;
|
import com.iqser.red.service.redaction.v1.model.RedactionLog;
|
||||||
import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
|
import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
package com.iqser.red.service.redaction.v1.server.redaction.service;
|
package com.iqser.red.service.redaction.v1.server.redaction.service;
|
||||||
|
|
||||||
import com.iqser.red.service.file.management.v1.api.model.ChangeType;
|
|
||||||
import com.iqser.red.service.file.management.v1.api.model.FileType;
|
import com.iqser.red.service.file.management.v1.api.model.FileType;
|
||||||
import com.iqser.red.service.file.management.v1.api.model.RedactionChangeLog;
|
import com.iqser.red.service.redaction.v1.model.ChangeType;
|
||||||
import com.iqser.red.service.file.management.v1.api.model.RedactionChangeLogEntry;
|
import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
|
||||||
|
import com.iqser.red.service.redaction.v1.model.RedactionChangeLogEntry;
|
||||||
import com.iqser.red.service.redaction.v1.model.RedactionLog;
|
import com.iqser.red.service.redaction.v1.model.RedactionLog;
|
||||||
import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
|
import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
|
||||||
import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
|
import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
|
||||||
@ -58,7 +58,7 @@ public class RedactionChangeLogService {
|
|||||||
.collect(Collectors.toList()));
|
.collect(Collectors.toList()));
|
||||||
|
|
||||||
return new RedactionChangeLog(changeLogEntries, currentRedactionLog.getDictionaryVersion(), currentRedactionLog.getRulesVersion(), currentRedactionLog
|
return new RedactionChangeLog(changeLogEntries, currentRedactionLog.getDictionaryVersion(), currentRedactionLog.getRulesVersion(), currentRedactionLog
|
||||||
.getRuleSetId(), currentRedactionLog.getFilename());
|
.getRuleSetId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user