alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandModelAssembler.java

@@ -34,6 +34,7 @@ import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.LinkRelation;
 import org.springframework.hateoas.server.RepresentationModelAssembler;
+import org.springframework.hateoas.server.mvc.WebMvcLinkBuilder;
 import org.springframework.stereotype.Component;
 
 import de.ozgcloud.alfa.bescheid.BescheidController;
@@ -86,31 +87,19 @@ class CommandModelAssembler implements RepresentationModelAssembler<Command, Ent
 	Link effectedResourceLinkByOrderType(Command entity) {
 		var type = entity.getCommandOrder().getType();
 
-		if (type == CommandOrder.Type.FORWARDING) {
-			return linkTo(methodOn(ForwardingController.class).findByVorgangId(entity.getVorgangId())).withRel(REL_EFFECTED_RESOURCE);
-		}
-		if (type == CommandOrder.Type.KOMMENTAR) {
-			return linkTo(KommentarController.class).slash(entity.getRelationId()).withRel(REL_EFFECTED_RESOURCE);
-		}
-		if (type == CommandOrder.Type.VORGANG) {
-			return linkTo(VorgangController.class).slash(entity.getRelationId()).withRel(REL_EFFECTED_RESOURCE);
-		}
-		if (type == CommandOrder.Type.VORGANG_LIST) {
-			return linkTo(VorgangController.class).withRel(REL_EFFECTED_RESOURCE);
-		}
-		if (type == CommandOrder.Type.WIEDERVORLAGE) {
-			return linkTo(WiedervorlageController.class).slash(entity.getRelationId()).withRel(REL_EFFECTED_RESOURCE);
-		}
-		if (type == CommandOrder.Type.BESCHEID) {
-			return linkTo(methodOn(BescheidController.class).getDraft(entity.getVorgangId())).withRel(REL_EFFECTED_RESOURCE);
-		}
-		if (type == CommandOrder.Type.DOCUMENT) {
-			return linkTo(DocumentController.class).slash(entity.getCreatedResource()).withRel(REL_EFFECTED_RESOURCE);
-		}
-		if (type == CommandOrder.Type.COLLABORATION) {
-			return linkTo(methodOn(CollaborationByVorgangController.class).getAllByVorgangId(entity.getVorgangId())).withRel(REL_EFFECTED_RESOURCE);
-		}
-		throw new IllegalArgumentException("Unknown CommandOrder: " + entity.getOrder());
+		WebMvcLinkBuilder linkBuilder = switch (type) {
+			case FORWARDING -> linkTo(methodOn(ForwardingController.class).findByVorgangId(entity.getVorgangId()));
+			case KOMMENTAR -> linkTo(KommentarController.class).slash(entity.getRelationId());
+			case VORGANG -> linkTo(VorgangController.class).slash(entity.getRelationId());
+			case VORGANG_LIST -> linkTo(VorgangController.class);
+			case WIEDERVORLAGE -> linkTo(WiedervorlageController.class).slash(entity.getRelationId());
+			case BESCHEID -> linkTo(methodOn(BescheidController.class).getDraft(entity.getVorgangId()));
+			case DOCUMENT -> linkTo(DocumentController.class).slash(entity.getCreatedResource());
+			case COLLABORATION -> linkTo(methodOn(CollaborationByVorgangController.class).getAllByVorgangId(entity.getVorgangId()));
+			default -> throw new IllegalArgumentException("Unknown CommandOrder: " + entity.getOrder());
+		};
+
+		return linkBuilder.withRel(REL_EFFECTED_RESOURCE);
 	}
 
 	public CollectionModel<EntityModel<Command>> toCollectionModel(Stream<Command> entities) {

alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandProcessorTest.java

@@ -45,6 +45,16 @@ class CommandProcessorTest {
 				verify(processor).isResponsibleForEffectedResource(CommandOrder.fromOrder(CommandTestFactory.ORDER));
 			}
 
+			@DisplayName("should NOT create link builder for related resource if the responsibility matches")
+			@Test
+			void shouldNOTCallCreateEffectedResourceLinkBuilder() {
+				when(processor.isResponsibleForEffectedResource(any())).thenReturn(false);
+
+				processor.process(model);
+
+				verify(processor, never()).createEffectedResourceLinkBuilder(command);
+			}
+
 			@DisplayName("should create link builder for effected resource if the responsibility matches")
 			@Test
 			void shouldCallCreateEffectedResourceLinkBuilder() {
@@ -107,6 +117,16 @@ class CommandProcessorTest {
 				verify(processor).createRelatedResourceLinkBuilder(command);
 			}
 
+			@DisplayName("should NOT create link builder for related resource if the responsibility matches")
+			@Test
+			void shouldNOTCallCreateRelatedResourceLinkBuilder() {
+				when(processor.isResponsibleForRelatedResource(any())).thenReturn(false);
+
+				processor.process(model);
+
+				verify(processor, never()).createRelatedResourceLinkBuilder(command);
+			}
+
 			@DisplayName("link")
 			@Nested
 			class TestRelatedResourceLink {