Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

RED-7384: fix imported stuff

Browse Source
This commit is contained in:
Kilian Schüttler 2024-04-11 14:08:45 +02:00
parent fa870fa856
commit 07d248c157
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/MigrationMapper.java
View File

@ -1,9 +1,9 @@
package com.iqser.red.service.redaction.v1.server.migration; package com.iqser.red.service.redaction.v1.server.migration;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ChangeType; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ChangeType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange;
@ -70,13 +70,21 @@ public class MigrationMapper {
public static Set<com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine> getMigratedEngines(RedactionLogEntry entry) { public static Set<com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine> getMigratedEngines(RedactionLogEntry entry) {
if (entry.getEngines() == null) { Set<com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine> engines = new HashSet<>();
return Collections.emptySet();
if (entry.isImported()) {
engines.add(com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine.IMPORTED);
} }
return entry.getEngines()
if (entry.getEngines() == null) {
return engines;
}
entry.getEngines()
.stream() .stream()
.map(MigrationMapper::toEntityLogEngine) .map(MigrationMapper::toEntityLogEngine)
.collect(Collectors.toSet()); .forEach(engines::add);
return engines;
} }

4
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/MigrationEntity.java
View File

@ -210,6 +210,10 @@ public final class MigrationEntity {
entityLogEntry.setState(EntryState.IGNORED); entityLogEntry.setState(EntryState.IGNORED);
} }
if (redactionLogEntry.isImported() && redactionLogEntry.getValue() == null) {
entityLogEntry.setValue("Imported Redaction");
}
return entityLogEntry; return entityLogEntry;
} }