Skip to content
Snippets Groups Projects
Commit 39eb9171 authored by Felix Reichenbach's avatar Felix Reichenbach
Browse files

OZG-7038 remove CommandOrder enum

parent 53a9f3d2
No related branches found
No related tags found
1 merge request!3Ozg 7038 evaluation dms quittung
package de.ozgcloud.archive.common.command;
public enum CommandOrder {
ARCHIVE_VORGANG
}
......@@ -48,8 +48,8 @@ public class CommandService {
@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_COMMAND_SERVICE_NAME) // NOSONAR
private final OzgCloudCommandService ozgCloudCommandService;
public Stream<ArchiveManagerCommand> findPending(String vorgangId, CommandOrder order) {
return remoteService.findCommands(vorgangId, Optional.of(CommandStatus.PENDING.name()), Optional.of(order.name()));
public Stream<ArchiveManagerCommand> findPending(String vorgangId, String order) {
return remoteService.findCommands(vorgangId, Optional.of(CommandStatus.PENDING.name()), Optional.of(order));
}
public Stream<ArchiveManagerCommand> findFinishedCommands(@NonNull String vorgangId) {
......
......@@ -7,7 +7,6 @@ import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import de.ozgcloud.archive.common.command.ArchiveManagerCommand;
import de.ozgcloud.archive.common.command.CommandOrder;
import de.ozgcloud.archive.common.command.CommandService;
import de.ozgcloud.archive.common.xta.XtaFileHelper;
import de.ozgcloud.archive.common.xta.XtaFileParser;
......@@ -27,6 +26,8 @@ import lombok.extern.log4j.Log4j2;
@Service
class QuittungService {
static final String ARCHIVE_VORGANG_ORDER = "ARCHIVE_VORGANG";
private final XtaService xtaService;
private final XtaFileHelper xtaFileHelper;
private final XtaFileParser xtaFileParser;
......@@ -61,7 +62,7 @@ class QuittungService {
}
private List<ArchiveManagerCommand> findPendingArchiveVorgangCommands(String vorgangId) {
return commandService.findPending(vorgangId, CommandOrder.ARCHIVE_VORGANG).toList();
return commandService.findPending(vorgangId, ARCHIVE_VORGANG_ORDER).toList();
}
void evaluateAbgabe(XtaAbgabeAdapter abgabeHandler, List<ArchiveManagerCommand> pendingCommands) {
......
......@@ -74,12 +74,14 @@ class CommandServiceTest {
@Nested
class TestFindPending {
private final String order = LoremIpsum.getInstance().getWords(1);
@Test
void shouldCallRemoteService() {
service.findPending(VorgangWithEingangTestFactory.ID, CommandOrder.ARCHIVE_VORGANG);
service.findPending(VorgangWithEingangTestFactory.ID, order);
verify(remoteService).findCommands(VorgangWithEingangTestFactory.ID, Optional.of(CommandStatus.PENDING.name()),
Optional.of(CommandOrder.ARCHIVE_VORGANG.name()));
Optional.of(order));
}
@Test
......@@ -87,7 +89,7 @@ class CommandServiceTest {
var command = ArchiveManagerCommand.builder().build();
when(remoteService.findCommands(any(), any(), any())).thenReturn(Stream.of(command));
var commands = service.findPending(VorgangWithEingangTestFactory.ID, CommandOrder.ARCHIVE_VORGANG).toList();
var commands = service.findPending(VorgangWithEingangTestFactory.ID, order).toList();
assertThat(commands).containsExactly(command);
}
......
......@@ -38,7 +38,7 @@ public class CommandTestFactory {
public static final String VORGANG_ID = UUID.randomUUID().toString();;
public static final String CREATED_BY_NAME = UserProfileTestFactory.FULLNAME;
public static final String ORDER = CommandOrder.ARCHIVE_VORGANG.name();
public static final String ORDER = LoremIpsum.getInstance().getWords(1);
public static final CommandStatus STATUS = CommandStatus.FINISHED;
public static final String BODY_FIELD_NAME = LoremIpsum.getInstance().getWords(1);
......
......@@ -22,7 +22,6 @@ import org.mockito.Spy;
import org.springframework.context.ApplicationEventPublisher;
import de.ozgcloud.archive.common.command.ArchiveManagerCommand;
import de.ozgcloud.archive.common.command.CommandOrder;
import de.ozgcloud.archive.common.command.CommandService;
import de.ozgcloud.archive.common.command.CommandTestFactory;
import de.ozgcloud.archive.common.xta.AbgabeImportBestaetigen0402TestFactory;
......@@ -188,7 +187,7 @@ class QuittungServiceTest {
void shouldCallCommandService() {
handleImportConfirmation();
verify(commandService).findPending(VorgangWithEingangTestFactory.ID, CommandOrder.ARCHIVE_VORGANG);
verify(commandService).findPending(VorgangWithEingangTestFactory.ID, QuittungService.ARCHIVE_VORGANG_ORDER);
}
@DisplayName("on existing pending commands")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment