From 88db95b0ca81b4b36a42d748e06a5540af7bbc04 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 19 Sep 2024 16:15:04 +0200
Subject: [PATCH] OZG-6523 fix revoking of create_attached_item command
---
.../attached_item/VorgangAttachedItemService.java | 2 +-
.../attached_item/VorgangAttachedItemITCase.java | 11 ++++++-----
.../attached_item/VorgangAttachedItemServiceTest.java | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemService.java
index 06aafc833..1b5a7e177 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemService.java
@@ -160,7 +160,7 @@ public class VorgangAttachedItemService {
}
public void revokeCreate(Command command) {
- handleRevoke(command, () -> delete(command.getRelationId(), command.getRelationVersion()));
+ handleRevoke(command, () -> delete(command.getCreatedResource(), command.getRelationVersion() + 1));
}
void delete(String id, long version) {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemITCase.java
index cfaf9ff74..ef465103f 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemITCase.java
@@ -289,7 +289,8 @@ class VorgangAttachedItemITCase {
private Command createRevokeCommand() {
return CommandTestFactory.createBuilder().order(Order.CREATE_ATTACHED_ITEM.name())
.relationId(persistedItem.getId())
- .relationVersion(persistedItem.getVersion())
+ .relationVersion(persistedItem.getVersion() - 1)
+ .createdResource(persistedItem.getId())
.bodyObject(VorgangAttachedItemTestFactory.asMap()).build();
}
}
@@ -298,11 +299,11 @@ class VorgangAttachedItemITCase {
@Nested
class TestRevokeUpdateItem {
- private final Map<String, Object> createItem = Map.<String, Object>of("EntryToRecoverByRevokeKey", "EntryToRecoverByRevokeValue",
+ private final Map<String, Object> createItem = Map.of("EntryToRecoverByRevokeKey", "EntryToRecoverByRevokeValue",
VorgangAttachedItemTestFactory.ITEM_FIELD_NAME, VorgangAttachedItemTestFactory.ITEM_FIELD_STRING_VALUE);
private VorgangAttachedItem persistedItem;
- private final Map<String, Object> updateItem = Map.<String, Object>of(
+ private final Map<String, Object> updateItem = Map.of(
VorgangAttachedItemTestFactory.ITEM_FIELD_NAME, "RevertByRevokeValue",
"NewToRemoveByRevokeKey", "NewToRemoveByRevokeValue");
private Command updatedCommand;
@@ -391,11 +392,11 @@ class VorgangAttachedItemITCase {
@Nested
class TestRevokePatchItem {
- private final Map<String, Object> createItem = Map.<String, Object>of(VorgangAttachedItemTestFactory.ITEM_FIELD_NAME,
+ private final Map<String, Object> createItem = Map.of(VorgangAttachedItemTestFactory.ITEM_FIELD_NAME,
VorgangAttachedItemTestFactory.ITEM_FIELD_STRING_VALUE);
private VorgangAttachedItem persistedItem;
- private final Map<String, Object> patchItem = Map.<String, Object>of(VorgangAttachedItemTestFactory.ITEM_FIELD_NAME, "UpdatedStringValue");
+ private final Map<String, Object> patchItem = Map.of(VorgangAttachedItemTestFactory.ITEM_FIELD_NAME, "UpdatedStringValue");
private Command patchedCommand;
private String vorgangId;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemServiceTest.java
index 932e678e5..1d2933edd 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemServiceTest.java
@@ -361,7 +361,7 @@ class VorgangAttachedItemServiceTest {
@Nested
class TestRevokeCreate {
- private final Command command = CommandTestFactory.create();
+ private final Command command = CommandTestFactory.createBuilder().createdResource(CommandTestFactory.CREATED_RESOURCE).build();
@Test
void shouldCallHandleRevoke() {
@@ -374,7 +374,7 @@ class VorgangAttachedItemServiceTest {
void shouldCallDelete() {
service.revokeCreate(command);
- verify(service).delete(CommandTestFactory.RELATION_ID, CommandTestFactory.RELATION_VERSION);
+ verify(service).delete(CommandTestFactory.CREATED_RESOURCE, CommandTestFactory.RELATION_VERSION + 1);
}
}
--
GitLab