Skip to content
Snippets Groups Projects
Commit 555759a2 authored by Jan Zickermann's avatar Jan Zickermann
Browse files

OZG-5415 xta: Fix number of files

parent c30e5ecd
Branches
Tags
No related merge requests found
...@@ -28,7 +28,5 @@ class EntryDataMapper { ...@@ -28,7 +28,5 @@ class EntryDataMapper {
} catch (IOException e) { } catch (IOException e) {
throw new ReadingRequestException(e); throw new ReadingRequestException(e);
} }
} }
} }
...@@ -11,9 +11,10 @@ import de.ozgcloud.eingang.common.formdata.FormData; ...@@ -11,9 +11,10 @@ import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormHeader; import de.ozgcloud.eingang.common.formdata.FormHeader;
import de.ozgcloud.eingang.common.formdata.IncomingFile; import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.vorgang.VorgangNummerSupplier; import de.ozgcloud.eingang.common.vorgang.VorgangNummerSupplier;
import de.ozgcloud.eingang.semantik.enginebased.FilesMapperHelper;
import de.ozgcloud.eingang.xdomea.XdomeaMessageData; import de.ozgcloud.eingang.xdomea.XdomeaMessageData;
@Mapper @Mapper(imports = FilesMapperHelper.class)
interface XtaMessageMapper { interface XtaMessageMapper {
int VORGANG_NUMMER_SUFFIX_LENGTH = 4; int VORGANG_NUMMER_SUFFIX_LENGTH = 4;
...@@ -22,9 +23,8 @@ interface XtaMessageMapper { ...@@ -22,9 +23,8 @@ interface XtaMessageMapper {
@Mapping(target = "id", ignore = true) @Mapping(target = "id", ignore = true)
@Mapping(target = "zustaendigeStelle", ignore = true) @Mapping(target = "zustaendigeStelle", ignore = true)
@Mapping(target = "header", source = "metaData") @Mapping(target = "header", source = "metaData")
@Mapping(target = "numberOfAttachments", ignore = true) @Mapping(target = "numberOfAttachments", expression = "java(FilesMapperHelper.countAttachedFiles(xdomeaMessageData.attachments()))")
// TODO: Eine Lösung, bei der fromData nicht zweimal gebaut wird wäre gut @Mapping(target = "numberOfRepresentations", dependsOn = "representations", expression = "java(getRepresentations(xdomeaMessageData).size())")
@Mapping(target = "numberOfRepresentations", dependsOn = "representations", expression = "java(formData.build().getRepresentations().size())")
@Mapping(target = "representations", source = "xdomeaMessageData") @Mapping(target = "representations", source = "xdomeaMessageData")
@Mapping(target = "representation", ignore = true) @Mapping(target = "representation", ignore = true)
@Mapping(target = "attachment", ignore = true) @Mapping(target = "attachment", ignore = true)
......
...@@ -46,6 +46,13 @@ class XtaMessageMapperTest { ...@@ -46,6 +46,13 @@ class XtaMessageMapperTest {
assertThat(formData.getRepresentations()).containsExactly(xdomeaMessageData.metadataFile(), xdomeaMessageData.representations().getFirst()); assertThat(formData.getRepresentations()).containsExactly(xdomeaMessageData.metadataFile(), xdomeaMessageData.representations().getFirst());
} }
@Test
void shouldSetNumberOfAttachments() {
var formData = doMapping();
assertThat(formData.getNumberOfAttachments()).isEqualTo(1);
}
@Test @Test
void shouldSetNumberOfRepresentations() { void shouldSetNumberOfRepresentations() {
var formData = doMapping(); var formData = doMapping();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment