Skip to content
Snippets Groups Projects
Commit 3348345b authored by Lukas Malte Monnerjahn's avatar Lukas Malte Monnerjahn
Browse files

OZG-6340 UUID-Präfix von Dateien in XTA-Eingang entfernen

parent d5cc75b9
No related branches found
No related tags found
No related merge requests found
......@@ -58,7 +58,7 @@ class XtaIncomingFilesMapper {
IncomingFile toIncomingFile(XtaFile messageFile) {
return IncomingFile.builder()
.name(messageFile.name())
.name(removeLeadingUUID(messageFile.name()))
.contentType(messageFile.contentType())
.file(messageFile.file())
.size(messageFile.file().length())
......@@ -78,4 +78,8 @@ class XtaIncomingFilesMapper {
return Stream.of(incomingFile);
}
}
private String removeLeadingUUID(String name) {
return name.replaceAll("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}_", "");
}
}
......@@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import java.util.List;
import java.util.UUID;
import java.util.stream.Stream;
import org.junit.jupiter.api.Nested;
......@@ -57,7 +58,7 @@ class XtaIncomingFilesMapperTest {
var xtaFile = XtaFileTestFactory.create();
var incomingFile = IncomingFileTestFactory.create();
when(mapper.toIncomingFile(xtaFile)).thenReturn(incomingFile);
when(mapper.extractZip(incomingFile)).thenAnswer((x) -> Stream.of(incomingFile));
when(mapper.extractZip(incomingFile)).thenAnswer(x -> Stream.of(incomingFile));
mapper.toIncomingFiles(List.of(xtaFile, xtaFile));
......@@ -89,6 +90,16 @@ class XtaIncomingFilesMapperTest {
assertThat(inFile.getName()).isEqualTo(XtaFileTestFactory.NAME);
}
@Test
void shouldRemoveLeadingUUID() {
String nameWithLeadingUUID = UUID.randomUUID() + "_" + XtaFileTestFactory.NAME;
var xtaFile = XtaFileTestFactory.createBuilder().name(nameWithLeadingUUID).build();
var inFile = mapper.toIncomingFile(xtaFile);
assertThat(inFile.getName()).isEqualTo(XtaFileTestFactory.NAME);
}
@Test
void shouldHaveZipContentType() {
var inFile = mapper.toIncomingFile(XtaFileTestFactory.create());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment