diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandModelAssembler.java b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandModelAssembler.java index 616f9cb7ceb699c15dfec175139ad1f166ff61bf..78924b052287ef5f04858e23461de0c4a1e7c599 100644 --- a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandModelAssembler.java +++ b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandModelAssembler.java @@ -49,11 +49,11 @@ class CommandModelAssembler implements RepresentationModelAssembler<Command, Ent private Link effectedResourceLinkByOrder(Command entity) { switch (entity.getOrder().getType()) { case VORGANG: - return effectedVorgangLink(entity); + return linkTo(methodOn(VorgangController.class).getVorgangWithEingang(entity.getRelationId())).withRel(REL_EFFECTED_RESOURCE); case WIEDERVORLAGE: - return effectedWiedervorlageLink(entity); + return linkTo(methodOn(WiedervorlageController.class).getById(entity.getRelationId())).withRel(REL_EFFECTED_RESOURCE); case KOMMENTAR: - return effectedKommentarLink(entity); + return linkTo(KommentarController.class).slash(entity.getRelationId()).withRel(REL_EFFECTED_RESOURCE); case FORWARDING: return linkTo(methodOn(ForwardingController.class).findByVorgangId(entity.getVorgangId())).withRel(REL_EFFECTED_RESOURCE); default: @@ -61,14 +61,6 @@ class CommandModelAssembler implements RepresentationModelAssembler<Command, Ent } } - private Link effectedVorgangLink(Command entity) { - return linkTo(methodOn(VorgangController.class).getVorgangWithEingang(entity.getRelationId())).withRel(REL_EFFECTED_RESOURCE); - } - - private Link effectedWiedervorlageLink(Command entity) { - return linkTo(methodOn(WiedervorlageController.class).getById(entity.getRelationId())).withRel(REL_EFFECTED_RESOURCE); - } - private EntityModel<Command> addIf(Predicate<Command> condition, EntityModel<Command> model, Link link) { return Optional.ofNullable(model.getContent()).filter(condition).map(command -> model.add(link)).orElse(model); }