From 39eb9171fa7795834d4da5c977652cf134f8d82a Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Thu, 2 Jan 2025 17:12:34 +0100
Subject: [PATCH] OZG-7038 remove CommandOrder enum
---
.../de/ozgcloud/archive/common/command/CommandOrder.java | 5 -----
.../ozgcloud/archive/common/command/CommandService.java | 4 ++--
.../de/ozgcloud/archive/quittung/QuittungService.java | 5 +++--
.../archive/common/command/CommandServiceTest.java | 8 +++++---
.../archive/common/command/CommandTestFactory.java | 4 ++--
.../de/ozgcloud/archive/quittung/QuittungServiceTest.java | 3 +--
6 files changed, 13 insertions(+), 16 deletions(-)
delete mode 100644 archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandOrder.java
diff --git a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandOrder.java b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandOrder.java
deleted file mode 100644
index bdc34f2..0000000
--- a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandOrder.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.ozgcloud.archive.common.command;
-
-public enum CommandOrder {
- ARCHIVE_VORGANG
-}
diff --git a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandService.java b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandService.java
index 6660bfc..2d6c437 100644
--- a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandService.java
+++ b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandService.java
@@ -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) {
diff --git a/archive-manager-server/src/main/java/de/ozgcloud/archive/quittung/QuittungService.java b/archive-manager-server/src/main/java/de/ozgcloud/archive/quittung/QuittungService.java
index 08df946..5e1c9fc 100644
--- a/archive-manager-server/src/main/java/de/ozgcloud/archive/quittung/QuittungService.java
+++ b/archive-manager-server/src/main/java/de/ozgcloud/archive/quittung/QuittungService.java
@@ -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) {
diff --git a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandServiceTest.java b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandServiceTest.java
index 363bbe3..3baace3 100644
--- a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandServiceTest.java
+++ b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandServiceTest.java
@@ -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);
}
diff --git a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java
index fa8fb39..c877368 100644
--- a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java
+++ b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java
@@ -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);
@@ -67,7 +67,7 @@ public class CommandTestFactory {
.vorgangId(VORGANG_ID)
.relationId(RELATION_ID)
// TODO Warum fehlt die?
-// .relationVersion(RELATION_VERSION)
+ // .relationVersion(RELATION_VERSION)
.order(ORDER)
.status(STATUS)
.createdAt(CREATED_AT)
diff --git a/archive-manager-server/src/test/java/de/ozgcloud/archive/quittung/QuittungServiceTest.java b/archive-manager-server/src/test/java/de/ozgcloud/archive/quittung/QuittungServiceTest.java
index dc5082c..0ca69e5 100644
--- a/archive-manager-server/src/test/java/de/ozgcloud/archive/quittung/QuittungServiceTest.java
+++ b/archive-manager-server/src/test/java/de/ozgcloud/archive/quittung/QuittungServiceTest.java
@@ -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")
--
GitLab