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

Merge branch 'RED-9832-bp' into 'release/2.465.x'

Browse Source 
RED-9832 - FalsePositives and FalseRecommendations not imported

See merge request redactmanager/persistence-service!659
This commit is contained in:
Corina Olariu 2024-08-09 13:59:23 +02:00
commit a99223dfd7
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/DossierTemplateImportService.java
View File

@ -247,6 +247,7 @@ public class DossierTemplateImportService {
if (StringUtils.isEmpty(dossierTemplateMeta.getName())) {
throw new ConflictException("DossierTemplate name must be set");
}
dossierTemplateMeta.setId("");
this.validateDossierTemplateName(dossierTemplateMeta);
DossierTemplateEntity dossierTemplateEntity = new DossierTemplateEntity();

4
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/zipreaders/EntityTypeArchiveReader.java
View File

@ -44,10 +44,10 @@ public class EntityTypeArchiveReader {
entityTypeImportModel.getEntries().put(zipEntryData.getParentFolder(), entries);
} else if (zipEntryData.entry().getName().contains(ExportFilename.FALSE_POSITIVES.getFilename())) {
List<String> falsePositives = this.readEntries(zipEntryData.data());
entityTypeImportModel.getFalseRecommendations().put(zipEntryData.getParentFolder(), falsePositives);
entityTypeImportModel.getFalsePositives().put(zipEntryData.getParentFolder(), falsePositives);
} else if (zipEntryData.entry().getName().contains(ExportFilename.FALSE_RECOMMENDATION.getFilename())) {
List<String> falseRecommendations = this.readEntries(zipEntryData.data());
entityTypeImportModel.getDeletedFalseRecommendations().put(zipEntryData.getParentFolder(), falseRecommendations);
entityTypeImportModel.getFalseRecommendations().put(zipEntryData.getParentFolder(), falseRecommendations);
} else if (zipEntryData.entry().getName().contains(ExportFilename.DELETED_ENTRIES.getFilename())) {
List<String> entries = this.readEntries(zipEntryData.data());
entityTypeImportModel.getDeletedEntries().put(zipEntryData.getParentFolder(), entries);

14
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java
View File

@ -109,6 +109,20 @@ public class DossierTemplateImportTest extends AbstractPersistenceServerServiceT
testDossierTemplateImport(archive);
}
@SneakyThrows
@Test
public void testDossierTemplateImportWithTheSameName() {
TenantContext.setTenantId("redaction");
var archive = loadFileFromClasspath("EFSA_sanitisation_GFL_v1.zip");
var dt1 = testDossierTemplateImport(archive);
assertThat(dt1.getName()).isEqualTo("EFSA sanitisation GFL v1");
var dt2 = testDossierTemplateImport(archive);
assertThat(dt2.getName()).isEqualTo("Copy of EFSA sanitisation GFL v1");
}
@SneakyThrows
private byte[] loadFileFromClasspath(String filename) {