diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/attacheditem/AttachedItemService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/attacheditem/AttachedItemService.java index 4e2867be8883419b25ccbd4a055fd7de97f7eef2..180d95031923d482c4f25f3f42f42ba0620b111d 100644 --- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/attacheditem/AttachedItemService.java +++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/attacheditem/AttachedItemService.java @@ -121,7 +121,7 @@ public class AttachedItemService { String overrideAttachedItem(AttachedItem bescheidItem, Command command) { var attachedItem = buildAttachedItemAsMap(command, buildItemMapWithAllBescheidFields(command)); - var finishedOzgCloudCommand = commandService.createAndWaitUntilDone(buildUpdateAttachedItemCommand(bescheidItem, attachedItem)); + var finishedOzgCloudCommand = commandService.createAndWaitUntilDone(buildPatchAttachedItemCommand(bescheidItem, attachedItem)); return finishedOzgCloudCommand.getCreatedResource(); } @@ -146,7 +146,7 @@ public class AttachedItemService { } private OzgCloudCommand buildUpdateBescheidDraftCommand(Command command, Optional<Document> document, AttachedItem bescheidItem) { - return buildUpdateAttachedItemCommand(bescheidItem, buildAttachedItemAsMap(command, buildBescheidItemAsMap(command, document))); + return buildPatchAttachedItemCommand(bescheidItem, buildAttachedItemAsMap(command, buildBescheidItemAsMap(command, document))); } Map<String, Object> buildBescheidItemAsMap(Command command, Optional<Document> newDocument) { @@ -173,12 +173,12 @@ public class AttachedItemService { return MapUtils.getString(item.getItem(), Bescheid.FIELD_BESCHEID_DOCUMENT); } - OzgCloudCommand buildUpdateAttachedItemCommand(AttachedItem bescheidItem, Map<String, Object> bodyObject) { + OzgCloudCommand buildPatchAttachedItemCommand(AttachedItem bescheidItem, Map<String, Object> bodyObject) { return OzgCloudCommand.builder() .vorgangId(commandMapper.toOzgCloudVorgangId(bescheidItem.getVorgangId())) .relationId(commandMapper.mapRelationId(bescheidItem.getId())) .relationVersion(bescheidItem.getVersion()) - .order(UPDATE_ATTACHED_ITEM_ORDER) + .order(PATCH_ATTACHED_ITEM) .bodyObject(bodyObject) .build(); } diff --git a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/attacheditem/AttachedItemServiceTest.java b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/attacheditem/AttachedItemServiceTest.java index b70261e5222ae98734dfe4960ac3a20f98bb0ff8..726edcf3e90a969633d5f3caf885298c65334776 100644 --- a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/attacheditem/AttachedItemServiceTest.java +++ b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/attacheditem/AttachedItemServiceTest.java @@ -451,12 +451,12 @@ class AttachedItemServiceTest { doUpdateBescheidDraft(); - verify(service).buildUpdateAttachedItemCommand(bescheidItem, expectedBodyObject); + verify(service).buildPatchAttachedItemCommand(bescheidItem, expectedBodyObject); } @Test void shouldCallCommandService() { - doReturn(updateAttachedItemCommand).when(service).buildUpdateAttachedItemCommand(any(), any()); + doReturn(updateAttachedItemCommand).when(service).buildPatchAttachedItemCommand(any(), any()); doUpdateBescheidDraft(); @@ -672,12 +672,12 @@ class AttachedItemServiceTest { service.overrideAttachedItem(bescheidItem, command); - verify(service).buildUpdateAttachedItemCommand(bescheidItem, bodyObject); + verify(service).buildPatchAttachedItemCommand(bescheidItem, bodyObject); } @Test void shouldCallCommandService() { - doReturn(updateItemCommand).when(service).buildUpdateAttachedItemCommand(any(), any()); + doReturn(updateItemCommand).when(service).buildPatchAttachedItemCommand(any(), any()); service.overrideAttachedItem(AttachedItemTestFactory.createBescheid(), command); @@ -853,7 +853,7 @@ class AttachedItemServiceTest { @Test void shouldCallVorgangIdMapper() { - service.buildUpdateAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); + service.buildPatchAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); verify(commandMapper).toOzgCloudVorgangId(CommandTestFactory.VORGANG_ID); } @@ -863,14 +863,14 @@ class AttachedItemServiceTest { var expectedVorgangId = OzgCloudVorgangId.from(CommandTestFactory.VORGANG_ID); when(commandMapper.toOzgCloudVorgangId(any())).thenReturn(expectedVorgangId); - var result = service.buildUpdateAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); + var result = service.buildPatchAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); assertThat(result.getVorgangId()).isEqualTo(expectedVorgangId); } @Test void shouldCallRelationIdMapper() { - service.buildUpdateAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); + service.buildPatchAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); verify(commandMapper).mapRelationId(AttachedItemTestFactory.ID); } @@ -880,30 +880,30 @@ class AttachedItemServiceTest { var expectedId = GenericId.from("relationId"); when(commandMapper.mapRelationId(any())).thenReturn(expectedId); - var result = service.buildUpdateAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); + var result = service.buildPatchAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); assertThat(result.getRelationId()).isEqualTo(expectedId); } @Test void shouldSetRelationVersion() { - var result = service.buildUpdateAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); + var result = service.buildPatchAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); assertThat(result.getRelationVersion()).isEqualTo(AttachedItemTestFactory.VERSION); } @Test void shouldSetOrder() { - var result = service.buildUpdateAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); + var result = service.buildPatchAttachedItemCommand(AttachedItemTestFactory.createBescheid(), Map.of()); - assertThat(result.getOrder()).isEqualTo(AttachedItemService.UPDATE_ATTACHED_ITEM_ORDER); + assertThat(result.getOrder()).isEqualTo(AttachedItemService.PATCH_ATTACHED_ITEM); } @Test void shouldSetBodyObject() { var bodyObject = Map.<String, Object>of("key", "value"); - var result = service.buildUpdateAttachedItemCommand(AttachedItemTestFactory.createBescheid(), bodyObject); + var result = service.buildPatchAttachedItemCommand(AttachedItemTestFactory.createBescheid(), bodyObject); assertThat(result.getBodyObject()).containsAllEntriesOf(bodyObject); } diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml index 8803d73a38204b69940da7542fdf439e99fe2990..032dc88e38e13553f80472ad74acb7eb7da7efff 100644 --- a/vorgang-manager-server/pom.xml +++ b/vorgang-manager-server/pom.xml @@ -53,7 +53,7 @@ <zufi-manager-interface.version>1.0.0-SNAPSHOT</zufi-manager-interface.version> <user-manager-interface.version>2.1.0</user-manager-interface.version> - <bescheid-manager.version>1.13.0</bescheid-manager.version> + <bescheid-manager.version>1.14.0-SNAPSHOT</bescheid-manager.version> <processor-manager.version>0.4.0</processor-manager.version> <nachrichten-manager.version>2.9.0</nachrichten-manager.version> <ozgcloud-starter.version>0.10.0</ozgcloud-starter.version>