Skip to content
Snippets Groups Projects
Commit 7bab278b authored by OZGCloud's avatar OZGCloud
Browse files

OZG-5654 Antragsraum proto aktualisiert

parent 81b88a92
No related branches found
No related tags found
No related merge requests found
......@@ -61,4 +61,8 @@ message GrpcRueckfrageAnswer {
string rueckfrageId = 1;
string answerText = 2;
repeated string attachmentFileId = 3;
}
message GrpcSendRueckfrageAnswerResponse {
string commandId = 1;
}
\ No newline at end of file
......@@ -36,6 +36,6 @@ service AntragraumService {
rpc FindRueckfragen(GrpcFindRueckfragenRequest) returns (GrpcFindRueckfragenResponse) {
}
rpc SendRueckfrageAnswer(GrpcSendRueckfrageAnswerRequest) returns (de.ozgcloud.vorgang.grpc.command.GrpcCommand) {
rpc SendRueckfrageAnswer(GrpcSendRueckfrageAnswerRequest) returns (GrpcSendRueckfrageAnswerResponse) {
}
}
\ No newline at end of file
/*
* Copyright (c) 2024. Das Land Schleswig-Holstein vertreten durch den
* Ministerpräsidenten des Landes Schleswig-Holstein
* Staatskanzlei
* Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
*
* Copyright (c) 2024.
* Lizenziert unter der EUPL, Version 1.2 oder - sobald
* diese von der Europäischen Kommission genehmigt wurden -
* Folgeversionen der EUPL ("Lizenz");
......@@ -24,13 +20,10 @@
package de.ozgcloud.nachrichten.antragraum;
import org.apache.commons.lang3.NotImplementedException;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
import io.grpc.stub.StreamObserver;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.server.service.GrpcService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@GrpcService
@RequiredArgsConstructor
......@@ -49,12 +42,12 @@ class AntragraumGrpcService extends AntragraumServiceGrpc.AntragraumServiceImplB
}
@Override
public void sendRueckfrageAnswer(GrpcSendRueckfrageAnswerRequest request, StreamObserver<GrpcCommand> streamObserver) {
public void sendRueckfrageAnswer(GrpcSendRueckfrageAnswerRequest request, StreamObserver<GrpcSendRueckfrageAnswerResponse> streamObserver) {
var answer = request.getAnswer();
var commandId = antragraumService.sendRueckfrageAnswer(request.getSamlToken(), answer.getRueckfrageId(), mapper.toPostfachNachricht(answer));
streamObserver.onNext(GrpcCommand.newBuilder().setId(commandId).build());
streamObserver.onNext(GrpcSendRueckfrageAnswerResponse.newBuilder().setCommandId(commandId).build());
streamObserver.onCompleted();
}
}
......@@ -20,12 +20,9 @@
package de.ozgcloud.nachrichten.antragraum;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.util.UUID;
import java.util.stream.Stream;
import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
import io.grpc.stub.StreamObserver;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
......@@ -33,10 +30,11 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
import io.grpc.stub.StreamObserver;
import java.util.UUID;
import java.util.stream.Stream;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
class AntragraumGrpcServiceTest {
@Spy
......@@ -87,7 +85,7 @@ class AntragraumGrpcServiceTest {
@Nested
class TestSendAnswer {
@Mock
private StreamObserver<GrpcCommand> streamObserver;
private StreamObserver<GrpcSendRueckfrageAnswerResponse> streamObserver;
@BeforeEach
void setup() {
......@@ -114,7 +112,7 @@ class AntragraumGrpcServiceTest {
void shouldCallOnNext() {
antragsraumGrpcService.sendRueckfrageAnswer(GrpcSendRueckfrageAnswerRequestTestFactory.create(), streamObserver);
verify(streamObserver).onNext(any(GrpcCommand.class));
verify(streamObserver).onNext(any(GrpcSendRueckfrageAnswerResponse.class));
}
@Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment