Merge pull request 'OZG-5666-FixAttachmentMapping' (#11) from...

Merge pull request 'OZG-5666-FixAttachmentMapping' (#11) from OZG-5666-FixAttachmentMapping into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/nachrichten-manager/pulls/11


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/postfach/PostfachNachrichtMapper.java

@@ -87,7 +87,7 @@ public abstract class PostfachNachrichtMapper {
 				.setSubject(MapUtils.getString(mailMap, PostfachNachricht.FIELD_SUBJECT))
 				.setMailBody(MapUtils.getString(mailMap, PostfachNachricht.FIELD_MAIL_BODY))
 				.setReplyOption(MapUtils.getString(mailMap, PostfachNachricht.FIELD_REPLY_OPTION))
-				.addAllAttachment((Iterable<String>) mailMap.getOrDefault(PostfachNachricht.FIELD_ATTACHMENTS, Collections.emptyList()));
+				.addAllAttachment(getAttachments(mailMap));
 
 		Optional.ofNullable(getAsMap(mailMap, PostfachNachricht.POSTFACH_ADDRESS_FIELD))
 				.filter(MapUtils::isNotEmpty)
@@ -97,6 +97,15 @@ public abstract class PostfachNachrichtMapper {
 		return postfachMailBuilder.build();
 	}
 
+	private Iterable<String> getAttachments(Map<String, Object> map) {
+		var attachments = map.getOrDefault(PostfachNachricht.FIELD_ATTACHMENTS, Collections.emptyList());
+		if (attachments instanceof String attachment) {
+			return Collections.singletonList(attachment);
+		}
+		return (Iterable<String>) attachments;
+
+	}
+
 	GrpcPostfachAddress buildGrpcPostfachAddress(Map<String, Object> postfachAddressMap) {
 		var postfachAddressBuilder = GrpcPostfachAddress.newBuilder()
 				.setType(MapUtils.getIntValue(postfachAddressMap, PostfachAddress.TYPE_FIELD))

nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachNachrichtMapperTest.java

@@ -29,6 +29,7 @@ import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Map;
+import java.util.UUID;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -115,6 +116,15 @@ class PostfachNachrichtMapperTest {
 				var fieldValue = getAttributeFromGrpcObject(mapped, fieldName);
 				assertThat((String) fieldValue).isEmpty();
 			}
+
+			@Test
+			void shouldProceedWithSingleAttachment() {
+				var postfachNachrichtMap = PostfachNachrichtTestFactory.asMap();
+
+				postfachNachrichtMap.put(PostfachNachricht.FIELD_ATTACHMENTS, UUID.randomUUID().toString());
+
+				assertDoesNotThrow(() -> fromMap(postfachNachrichtMap));
+			}
 		}
 
 		@DisplayName("with missing postfachAddress")