diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
index 4f2ebf90155643067693364030eb15698ddd5dad..a1998ebb4ac8c46f2802e360f6ff65e328fdaf9b 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
@@ -38,9 +38,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import com.google.protobuf.ByteString;
+import de.ozgcloud.apilib.file.OzgCloudFile;
import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.nachrichten.common.vorgang.VorgangService;
-import de.ozgcloud.nachrichten.postfach.AttachmentFile;
import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
import io.grpc.stub.StreamObserver;
import lombok.RequiredArgsConstructor;
@@ -56,8 +56,8 @@ class AntragraumGrpcService extends AntragraumServiceGrpc.AntragraumServiceImplB
private final AntragraumService service;
private final AntragraumNachrichtMapper mapper;
private final RueckfrageMapper rueckfrageMapper;
- private final AttachmentFileMapper attachmentFileMapper;
- private final RueckfrageAttachmentFileRequestMapper rueckfrageAttachmentFileRequestMapper;
+ private final AttachmentFileRequestMapper attachmentFileRequestMapper;
+ private final OzgCloudFileMapper ozgCloudFileMapper;
private final VorgangService vorgangService;
@@ -139,13 +139,8 @@ class AntragraumGrpcService extends AntragraumServiceGrpc.AntragraumServiceImplB
}
void getAttachmentFileContent(GrpcGetAttachmentContentRequest request, PipedOutputStream pipedOutputStream) {
- new Thread(() -> service.getAttachmentContent(rueckfrageAttachmentFileRequestMapper.fromGrpc(request), pipedOutputStream)).start();
- }
-
- void sendFileMetadata(AttachmentFile attachmentFile,
- StreamObserver<GrpcGetAttachmentMetadataResponse> responseObserver) {
- responseObserver.onNext(GrpcGetAttachmentMetadataResponse.newBuilder()
- .setFileMetadata(attachmentFileMapper.toMetadata(attachmentFile)).build());
+ new Thread(() -> service.getAttachmentContent(attachmentFileRequestMapper.fromGrpcContentRequest(request), pipedOutputStream))
+ .start();
}
void sendFileContent(InputStream fileContent, StreamObserver<GrpcGetAttachmentContentResponse> responseObserver) {
@@ -178,5 +173,14 @@ class AntragraumGrpcService extends AntragraumServiceGrpc.AntragraumServiceImplB
@Override
public void getAttachmentMetadata(GrpcGetAttachmentMetadataRequest request, StreamObserver<GrpcGetAttachmentMetadataResponse> responseObserver) {
+ var attachment = service.getAttachmentMetadata(attachmentFileRequestMapper.fromGrpcMetadataRequest(request));
+ sendFileMetadata(attachment, responseObserver);
+ }
+
+ void sendFileMetadata(OzgCloudFile attachment, StreamObserver<GrpcGetAttachmentMetadataResponse> responseObserver) {
+ responseObserver.onNext(GrpcGetAttachmentMetadataResponse.newBuilder()
+ .setFileMetadata(ozgCloudFileMapper.toMetadata(attachment)).build());
+
+ responseObserver.onCompleted();
}
}
diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumService.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumService.java
index 4aa7276aaaedc7df2c88b3cdd05c7db1c22c26c3..413a9fd58eca4a467c6fd5f01f198aed233eca92 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumService.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumService.java
@@ -42,6 +42,7 @@ import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.common.datatypes.GenericId;
import de.ozgcloud.apilib.common.errorhandling.NotFoundException;
+import de.ozgcloud.apilib.file.OzgCloudFile;
import de.ozgcloud.apilib.file.OzgCloudFileId;
import de.ozgcloud.apilib.file.OzgCloudFileService;
import de.ozgcloud.nachrichten.NachrichtenManagerConfiguration;
@@ -196,6 +197,11 @@ public class AntragraumService {
ozgCloudFileService.writeFileDataToStream(OzgCloudFileId.from(request.fileId()), pipedOutputStream);
}
+ public OzgCloudFile getAttachmentMetadata(AttachmentFileRequest request) {
+ verifyAccessToFile(request);
+ return ozgCloudFileService.getFile(OzgCloudFileId.from(request.fileId()));
+ }
+
void verifyAccessToFile(AttachmentFileRequest request) {
verifyToken(request.samlToken());
var nachricht = attachedItemService.getPostfachNachricht(request.nachrichtId());
diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/RueckfrageAttachmentFileRequestMapper.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileRequestMapper.java
similarity index 55%
rename from nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/RueckfrageAttachmentFileRequestMapper.java
rename to nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileRequestMapper.java
index 3f0bedb7dabcde94e8d130082a0d80de202e322c..82319b696d3a886631ed7f19e23180a6d97c9217 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/RueckfrageAttachmentFileRequestMapper.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileRequestMapper.java
@@ -5,7 +5,9 @@ import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.ReportingPolicy;
@Mapper(nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, unmappedTargetPolicy = ReportingPolicy.WARN)
-interface RueckfrageAttachmentFileRequestMapper {
+interface AttachmentFileRequestMapper {
- AttachmentFileRequest fromGrpc(GrpcGetAttachmentContentRequest request);
+ AttachmentFileRequest fromGrpcContentRequest(GrpcGetAttachmentContentRequest request);
+
+ AttachmentFileRequest fromGrpcMetadataRequest(GrpcGetAttachmentMetadataRequest request);
}
diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileMapper.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/OzgCloudFileMapper.java
similarity index 79%
rename from nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileMapper.java
rename to nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/OzgCloudFileMapper.java
index 7195b3122090501d4c5a03b251646908b2a04d2a..7c4eaa177488a0b7c24462dc009f195e554b4124 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileMapper.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/OzgCloudFileMapper.java
@@ -5,10 +5,10 @@ import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.ReportingPolicy;
-import de.ozgcloud.nachrichten.postfach.AttachmentFile;
+import de.ozgcloud.apilib.file.OzgCloudFile;
@Mapper(nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, unmappedTargetPolicy = ReportingPolicy.WARN)
-interface AttachmentFileMapper {
+interface OzgCloudFileMapper {
@Mapping(target = "mergeFrom", ignore = true)
@Mapping(target = "clearField", ignore = true)
@@ -18,6 +18,5 @@ interface AttachmentFileMapper {
@Mapping(target = "nameBytes", ignore = true)
@Mapping(target = "unknownFields", ignore = true)
@Mapping(target = "allFields", ignore = true)
- @Mapping(target = "size", ignore = true)
- GrpcFileMetadata toMetadata(AttachmentFile file);
+ GrpcFileMetadata toMetadata(OzgCloudFile file);
}
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java
index d6ea7add22aa4f5cf077400c844a7d74060af7b3..263fde2ebe1687b9b63c0c6fa8fbfff8257415a6 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java
@@ -54,12 +54,13 @@ import org.mockito.Spy;
import com.google.protobuf.ByteString;
+import de.ozgcloud.apilib.file.OzgCloudFile;
+import de.ozgcloud.apilib.file.OzgCloudFileTestFactory;
import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.nachrichten.common.vorgang.GrpcServiceKontoTestFactory;
import de.ozgcloud.nachrichten.common.vorgang.Vorgang;
import de.ozgcloud.nachrichten.common.vorgang.VorgangService;
import de.ozgcloud.nachrichten.common.vorgang.VorgangTestFactory;
-import de.ozgcloud.nachrichten.postfach.AttachmentFile;
import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
import de.ozgcloud.nachrichten.postfach.osi.MessageTestFactory;
@@ -78,11 +79,11 @@ class AntragraumGrpcServiceTest {
@Mock
private RueckfrageMapper rueckfrageMapper;
@Mock
- private AttachmentFileMapper attachmentFileMapper;
- @Mock
- private RueckfrageAttachmentFileRequestMapper rueckfrageAttachmentFileRequestMapper;
+ private AttachmentFileRequestMapper attachmentFileRequestMapper;
@Mock
private VorgangService vorgangService;
+ @Mock
+ private OzgCloudFileMapper ozgCloudFileMapper;
@DisplayName("Find rueckfragen")
@Nested
@@ -616,7 +617,7 @@ class AntragraumGrpcServiceTest {
class TestRunnable {
@BeforeEach
void mock() {
- when(rueckfrageAttachmentFileRequestMapper.fromGrpc(grpcRequest)).thenReturn(request);
+ when(attachmentFileRequestMapper.fromGrpcContentRequest(grpcRequest)).thenReturn(request);
}
@Test
@@ -625,7 +626,7 @@ class AntragraumGrpcServiceTest {
passedRunnable.run();
- verify(rueckfrageAttachmentFileRequestMapper).fromGrpc(grpcRequest);
+ verify(attachmentFileRequestMapper).fromGrpcContentRequest(grpcRequest);
}
@Test
@@ -644,40 +645,6 @@ class AntragraumGrpcServiceTest {
}
}
- @Nested
- class TestSendFileMetadata {
-
- @Mock
- private StreamObserver<GrpcGetAttachmentMetadataResponse> responseObserver;
-
- private AttachmentFile attachmentFile;
-
- private final GrpcFileMetadata metadata = GrpcFileMetadataTestFactory.create();
-
- @BeforeEach
- void mock() {
- when(attachmentFileMapper.toMetadata(attachmentFile)).thenReturn(metadata);
- }
-
- @Test
- void shouldMapMetadata() {
- sendFileMetadata();
-
- verify(attachmentFileMapper).toMetadata(attachmentFile);
- }
-
- @Test
- void shouldSendMetadata() {
- sendFileMetadata();
-
- verify(responseObserver).onNext(argThat((response) -> response.getFileMetadata().equals(metadata)));
- }
-
- private void sendFileMetadata() {
- grpcService.sendFileMetadata(attachmentFile, responseObserver);
- }
- }
-
@Nested
class TestSendFileContent {
@@ -850,4 +817,89 @@ class AntragraumGrpcServiceTest {
}
}
+
+ @Nested
+ class TestGetAttachmentMetadata {
+
+ @Mock
+ private StreamObserver<GrpcGetAttachmentMetadataResponse> responseObserver;
+
+ private final GrpcGetAttachmentMetadataRequest grpcRequest = GrpcGetAttachmentMetadataRequestTestFactory.create();
+ private final AttachmentFileRequest request = AttachmentFileRequestTestFactory.create();
+
+ @BeforeEach
+ void mock() {
+ when(attachmentFileRequestMapper.fromGrpcMetadataRequest(grpcRequest)).thenReturn(request);
+ }
+
+ @Test
+ void shouldMapRequest() {
+ getAttachmentMetadata();
+
+ verify(attachmentFileRequestMapper).fromGrpcMetadataRequest(grpcRequest);
+ }
+
+ @Test
+ void shouldCallServiceToGetMetadata() {
+ getAttachmentMetadata();
+
+ verify(service).getAttachmentMetadata(request);
+ }
+
+ @Test
+ void shouldCallSendFileMetadata() {
+ var attachment = OzgCloudFileTestFactory.create();
+ when(service.getAttachmentMetadata(request)).thenReturn(attachment);
+
+ getAttachmentMetadata();
+
+ verify(grpcService).sendFileMetadata(attachment, responseObserver);
+ }
+
+ private void getAttachmentMetadata() {
+ grpcService.getAttachmentMetadata(grpcRequest, responseObserver);
+ }
+ }
+
+ @Nested
+ class TestSendFileMetadata {
+
+ @Mock
+ private StreamObserver<GrpcGetAttachmentMetadataResponse> responseObserver;
+
+ private final OzgCloudFile attachment = OzgCloudFileTestFactory.create();
+
+ private final GrpcFileMetadata metadata = GrpcFileMetadataTestFactory.create();
+
+ @BeforeEach
+ void mock() {
+ when(ozgCloudFileMapper.toMetadata(attachment)).thenReturn(metadata);
+ }
+
+ @Test
+ void shouldMapMetadata() {
+ sendFileMetadata();
+
+ verify(ozgCloudFileMapper).toMetadata(attachment);
+ }
+
+ @Test
+ void shouldSendMetadata() {
+ sendFileMetadata();
+
+ verify(responseObserver).onNext(argThat((response) -> response.getFileMetadata().equals(metadata)));
+ }
+
+ @Test
+ void shouldCallOnCompleted() {
+ sendFileMetadata();
+
+ verify(responseObserver).onCompleted();
+ }
+
+ private void sendFileMetadata() {
+ grpcService.sendFileMetadata(attachment, responseObserver);
+ }
+ }
+
}
\ No newline at end of file
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumServiceTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumServiceTest.java
index e0575c49f466d1771c828b5cfb9c416af21f6c1f..ee39e3d9bb535ed19e8bf64e9874cae271c40dfd 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumServiceTest.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumServiceTest.java
@@ -23,8 +23,10 @@ import org.mockito.Spy;
import org.opensaml.saml.saml2.core.Response;
import de.ozgcloud.apilib.common.errorhandling.NotFoundException;
+import de.ozgcloud.apilib.file.OzgCloudFile;
import de.ozgcloud.apilib.file.OzgCloudFileId;
import de.ozgcloud.apilib.file.OzgCloudFileService;
+import de.ozgcloud.apilib.file.OzgCloudFileTestFactory;
import de.ozgcloud.nachrichten.NachrichtenManagerProperties;
import de.ozgcloud.nachrichten.common.vorgang.GrpcPostfachAddressTestFactory;
import de.ozgcloud.nachrichten.common.vorgang.GrpcServiceKontoTestFactory;
@@ -643,6 +645,45 @@ class AntragraumServiceTest {
}
}
+ @Nested
+ class TestGetAttachmentMetadata {
+
+ private final AttachmentFileRequest request = AttachmentFileRequestTestFactory.create();
+
+ @BeforeEach
+ void mock() {
+ doNothing().when(service).verifyAccessToFile(request);
+ }
+
+ @Test
+ void shouldCallVerifyAccessToFile() {
+ getAttachmentMetadata();
+
+ verify(service).verifyAccessToFile(request);
+ }
+
+ @Test
+ void shouldCallOzgCloudFileServiceToGetFile() {
+ getAttachmentMetadata();
+
+ verify(ozgCloudFileService).getFile(OzgCloudFileId.from(AttachmentFileRequestTestFactory.FILE_ID));
+ }
+
+ @Test
+ void shouldReturnOzgCloudFile() {
+ var ozgCloudFile = OzgCloudFileTestFactory.create();
+ when(ozgCloudFileService.getFile(OzgCloudFileId.from(AttachmentFileRequestTestFactory.FILE_ID))).thenReturn(ozgCloudFile);
+
+ var result = getAttachmentMetadata();
+
+ assertThat(result).isEqualTo(ozgCloudFile);
+ }
+
+ private OzgCloudFile getAttachmentMetadata() {
+ return service.getAttachmentMetadata(request);
+ }
+ }
+
@Nested
class TestVerifyAccessToFile {
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileRequestMapperTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileRequestMapperTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2b39fbd9cb77cc27bd5d5ce632a4c41ecf7b452a
--- /dev/null
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileRequestMapperTest.java
@@ -0,0 +1,34 @@
+package de.ozgcloud.nachrichten.antragraum;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mapstruct.factory.Mappers;
+
+class AttachmentFileRequestMapperTest {
+
+ private final AttachmentFileRequestMapper mapper = Mappers.getMapper(AttachmentFileRequestMapper.class);
+
+ @Nested
+ class TestFromGrpcContentRequest {
+
+ @Test
+ void shouldMapToRueckfrageAttachmentFileRequest() {
+ var request = mapper.fromGrpcContentRequest(GrpcGetAttachmentContentRequestTestFactory.create());
+
+ assertThat(request).isEqualTo(AttachmentFileRequestTestFactory.create());
+ }
+ }
+
+ @Nested
+ class TestFromGrpcMetadataRequest {
+
+ @Test
+ void shouldMapToRueckfrageAttachmentFileRequest() {
+ var request = mapper.fromGrpcMetadataRequest(GrpcGetAttachmentMetadataRequestTestFactory.create());
+
+ assertThat(request).isEqualTo(AttachmentFileRequestTestFactory.create());
+ }
+ }
+}
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileRequestTestFactory.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileRequestTestFactory.java
index 52afb9d5b5175fc4b165441a831425b55274a68a..bf4269aabf848a1c42fd0d35401126fd380f1671 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileRequestTestFactory.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AttachmentFileRequestTestFactory.java
@@ -1,10 +1,16 @@
package de.ozgcloud.nachrichten.antragraum;
+import java.util.UUID;
+
+import com.thedeanda.lorem.LoremIpsum;
+
+import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
+
public class AttachmentFileRequestTestFactory {
- public static final String NACHRICHT_ID = GrpcGetAttachmentContentRequestTestFactory.NACHRICHT_ID;
- public static final String FILE_ID = GrpcGetAttachmentContentRequestTestFactory.FILE_ID;
- public static final String TOKEN = GrpcGetAttachmentContentRequestTestFactory.TOKEN;
+ public static final String TOKEN = LoremIpsum.getInstance().getWords(1);
+ public static final String FILE_ID = UUID.randomUUID().toString();
+ public static final String NACHRICHT_ID = PostfachNachrichtTestFactory.ID;
public static AttachmentFileRequest create() {
return new AttachmentFileRequest(TOKEN, NACHRICHT_ID, FILE_ID);
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcFileMetadataTestFactory.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcFileMetadataTestFactory.java
index 1115f0df5776d7b95629eaae03603cb9dec3de32..41b231bf773e24e74b3e2800a4c39eaaa2c66c67 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcFileMetadataTestFactory.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcFileMetadataTestFactory.java
@@ -1,14 +1,13 @@
package de.ozgcloud.nachrichten.antragraum;
-import com.thedeanda.lorem.LoremIpsum;
-
+import de.ozgcloud.apilib.file.OzgCloudFileTestFactory;
import de.ozgcloud.nachrichten.antragraum.GrpcFileMetadata.Builder;
public class GrpcFileMetadataTestFactory {
- public static final long SIZE = 1000;
- public static final String NAME = LoremIpsum.getInstance().getName();
- public static final String CONTENT_TYPE = LoremIpsum.getInstance().getWords(1);
+ public static final long SIZE = OzgCloudFileTestFactory.SIZE;
+ public static final String NAME = OzgCloudFileTestFactory.NAME;
+ public static final String CONTENT_TYPE = OzgCloudFileTestFactory.CONTENT_TYPE;
public static GrpcFileMetadata create() {
return createBuilder().build();
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcGetAttachmentContentRequestTestFactory.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcGetAttachmentContentRequestTestFactory.java
index a3dc528e0970802b9c400235aa624d32392c132d..51ac2d5f80248b21f2158161070aa9822fdf6f1b 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcGetAttachmentContentRequestTestFactory.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcGetAttachmentContentRequestTestFactory.java
@@ -1,16 +1,10 @@
package de.ozgcloud.nachrichten.antragraum;
-import java.util.UUID;
-
-import com.thedeanda.lorem.LoremIpsum;
-
-import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
-
public class GrpcGetAttachmentContentRequestTestFactory {
- public static final String TOKEN = LoremIpsum.getInstance().getWords(1);
- public static final String FILE_ID = UUID.randomUUID().toString();
- public static final String NACHRICHT_ID = PostfachNachrichtTestFactory.ID;
+ public static final String TOKEN = AttachmentFileRequestTestFactory.TOKEN;
+ public static final String FILE_ID = AttachmentFileRequestTestFactory.FILE_ID;
+ public static final String NACHRICHT_ID = AttachmentFileRequestTestFactory.NACHRICHT_ID;
public static GrpcGetAttachmentContentRequest create() {
return createBuilder().build();
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcGetAttachmentMetadataRequestTestFactory.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcGetAttachmentMetadataRequestTestFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..bbd7acd1af4a4c27cf6cfb9c6698c2760241ab27
--- /dev/null
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcGetAttachmentMetadataRequestTestFactory.java
@@ -0,0 +1,19 @@
+package de.ozgcloud.nachrichten.antragraum;
+
+public class GrpcGetAttachmentMetadataRequestTestFactory {
+
+ public static final String TOKEN = AttachmentFileRequestTestFactory.TOKEN;
+ public static final String FILE_ID = AttachmentFileRequestTestFactory.FILE_ID;
+ public static final String NACHRICHT_ID = AttachmentFileRequestTestFactory.NACHRICHT_ID;
+
+ public static GrpcGetAttachmentMetadataRequest create() {
+ return createBuilder().build();
+ }
+
+ public static GrpcGetAttachmentMetadataRequest.Builder createBuilder() {
+ return GrpcGetAttachmentMetadataRequest.newBuilder()
+ .setSamlToken(TOKEN)
+ .setNachrichtId(NACHRICHT_ID)
+ .setFileId(FILE_ID);
+ }
+}
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/OzgCloudFileMapperTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/OzgCloudFileMapperTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..cd64a2b0fa4ecd0817594a179598d6d2a4805b07
--- /dev/null
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/OzgCloudFileMapperTest.java
@@ -0,0 +1,25 @@
+package de.ozgcloud.nachrichten.antragraum;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mapstruct.factory.Mappers;
+
+import de.ozgcloud.apilib.file.OzgCloudFileTestFactory;
+
+class OzgCloudFileMapperTest {
+
+ private final OzgCloudFileMapper mapper = Mappers.getMapper(OzgCloudFileMapper.class);
+
+ @Nested
+ class TestToMetadata {
+
+ @Test
+ void shouldMapToMetadata() {
+ var metadata = mapper.toMetadata(OzgCloudFileTestFactory.create());
+
+ assertThat(metadata).isEqualTo(GrpcFileMetadataTestFactory.create());
+ }
+ }
+}
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/RueckfrageAttachmentFileRequestMapperTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/RueckfrageAttachmentFileRequestMapperTest.java
deleted file mode 100644
index 4df7907fa9b8d6807423e2b3210c1e2f90f9d940..0000000000000000000000000000000000000000
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/RueckfrageAttachmentFileRequestMapperTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package de.ozgcloud.nachrichten.antragraum;
-
-import static org.assertj.core.api.Assertions.*;
-
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.mapstruct.factory.Mappers;
-
-class RueckfrageAttachmentFileRequestMapperTest {
-
- private final RueckfrageAttachmentFileRequestMapper mapper = Mappers.getMapper(RueckfrageAttachmentFileRequestMapper.class);
-
- @Nested
- class TestFromGrpc {
-
- @Test
- void shouldMapToRueckfrageAttachmentFileRequest() {
- var request = mapper.fromGrpc(GrpcGetAttachmentContentRequestTestFactory.create());
-
- assertThat(request).isEqualTo(AttachmentFileRequestTestFactory.create());
- }
- }
-}