diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/CollaborationModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/CollaborationModelAssembler.java index b85d9d2f8141ed86a177e74acda70821acd6e6c0..f6773286d60724555401f0bd6f0f67dc69591740 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/CollaborationModelAssembler.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/CollaborationModelAssembler.java @@ -42,8 +42,7 @@ class CollaborationModelAssembler implements RepresentationModelAssembler<Collab return CollectionModelBuilder.fromEntities(entityModels) .addLink(selfLink) - .ifMatch(entityModels::isEmpty) - .addLink(() -> buildCreateCollaborationRequestLink(vorgangId)) + .addLink(buildCreateCollaborationRequestLink(vorgangId)) .buildModel(); } diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/CollaborationModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/CollaborationModelAssemblerTest.java index c2e4a7d26085f49987d665331226f0c8a6ad3da6..2af91c24f07289b38a47e216fc75bd7c9b20a899 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/CollaborationModelAssemblerTest.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/CollaborationModelAssemblerTest.java @@ -92,84 +92,51 @@ class CollaborationModelAssemblerTest { @Nested class TestToCollectionModel { - private final Collaboration collaboration = FachstelleCollaborationTestFactory.create(); - - @Nested - class OnNonEmptyCollaborationList { - - @Test - void shouldCallToModel() { - callAssembler(); - - verify(assembler).toModel(collaboration); - } - - @Test - void shouldHaveEntityModel() { - var entityModel = ModelBuilder.fromEntity(collaboration).buildModel(); - doReturn(entityModel).when(assembler).toModel(collaboration); - - var collectionModel = callAssembler(); - assertThat(collectionModel.getContent()).containsExactly(entityModel); - } - - @Test - void shouldHaveSelfLink() { - var collectionModel = callAssembler(); - - assertThat(collectionModel.getLink(IanaLinkRelations.SELF_VALUE)).get().extracting(Link::getHref) - .isEqualTo(CollaborationByVorgangController.PATH + "/" + VorgangHeaderTestFactory.ID + "/collaborations"); - } + private final Collaboration collaboration = FachstelleCollaborationTestFactory.create(); - @Test - void shouldNotHaveCreateCollaborationRequestLink() { - var collectionModel = callAssembler(); + @Mock + private Link createCollaborationRequestLink; - assertThat(collectionModel.getLink(CollaborationModelAssembler.REL_CREATE_COLLABORATION_REQUEST)).isEmpty(); - } - - private CollectionModel<EntityModel<Collaboration>> callAssembler() { - return assembler.toCollectionModel(Stream.of(collaboration), VorgangHeaderTestFactory.ID); - } + @BeforeEach + void mock() { + doReturn(createCollaborationRequestLink).when(assembler).buildCreateCollaborationRequestLink(VorgangHeaderTestFactory.ID); } - @Nested - class OnEmptyCollaborationList { + @Test + void shouldCallToModel() { + callAssembler(); - @Mock - private Link createCollaborationRequestLink; + verify(assembler).toModel(collaboration); + } - @BeforeEach - void mock() { - doReturn(createCollaborationRequestLink).when(assembler).buildCreateCollaborationRequestLink(VorgangHeaderTestFactory.ID); - } + @Test + void shouldHaveEntityModel() { + var entityModel = ModelBuilder.fromEntity(collaboration).buildModel(); + doReturn(entityModel).when(assembler).toModel(collaboration); - @Test - void shouldHaveEmptyContent() { - var collectionModel = callAssembler(); + var collectionModel = callAssembler(); - assertThat(collectionModel.getContent()).isEmpty(); - } + assertThat(collectionModel.getContent()).containsExactly(entityModel); + } - @Test - void shouldHaveSelfLink() { - var collectionModel = callAssembler(); + @Test + void shouldHaveSelfLink() { + var collectionModel = callAssembler(); - assertThat(collectionModel.getLink(IanaLinkRelations.SELF_VALUE)).get().extracting(Link::getHref) - .isEqualTo(CollaborationByVorgangController.PATH + "/" + VorgangHeaderTestFactory.ID + "/collaborations"); - } + assertThat(collectionModel.getLink(IanaLinkRelations.SELF_VALUE)).get().extracting(Link::getHref) + .isEqualTo(CollaborationByVorgangController.PATH + "/" + VorgangHeaderTestFactory.ID + "/collaborations"); + } - @Test - void shouldHaveCreateCollaborationRequestLink() { - var collectionModel = callAssembler(); + @Test + void shouldHaveCreateCollaborationRequestLink() { + var collectionModel = callAssembler(); - assertThat(collectionModel.getLinks()).contains(createCollaborationRequestLink); - } + assertThat(collectionModel.getLinks()).contains(createCollaborationRequestLink); + } - private CollectionModel<EntityModel<Collaboration>> callAssembler() { - return assembler.toCollectionModel(Stream.empty(), VorgangHeaderTestFactory.ID); - } + private CollectionModel<EntityModel<Collaboration>> callAssembler() { + return assembler.toCollectionModel(Stream.of(collaboration), VorgangHeaderTestFactory.ID); } }