diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/controller/CollectController.java b/WebService/src/main/java/SAE/ApiREST/WebService/controller/CollectController.java index 0b09a24..18d41df 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/controller/CollectController.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/controller/CollectController.java @@ -60,15 +60,18 @@ public class CollectController { ).withRel("getAllCollection")); } @GetMapping(value = "/getAllCollectionsByName/{name}", produces = MediaType.APPLICATION_JSON_VALUE) - public @ResponseBody EntityModel> getAllCollectionsByName(@PathVariable(value = "name") String name){ + public @ResponseBody CollectionModel> getAllCollectionsByName(@PathVariable(value = "name") String name){ List results = collectionService.getAllCollectionsByName(name); if(results.isEmpty()) { throw new CollectException("No collections available"); } - return EntityModel.of(results, + List> collectModels = results.stream() + .map(collect -> EntityModel.of(collect, linkTo(methodOn(CollectController.class).getAllCollectionsByName(name)).withSelfRel(), linkTo(methodOn(CollectController.class).getAllCollection() - ).withRel("getAllCollection")); + ).withRel("getAllCollection"))) + .collect(Collectors.toList()); + return CollectionModel.of(collectModels); } // endregion diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java b/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java index c4bc093..36dcdc7 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java @@ -127,9 +127,9 @@ public class StubCollectionService implements ICollectionService { // region Article @Override public List
getAllArticlesById(Integer id){ - List
result = new ArrayList<>(); Collect collect = getCollectionById(id); - if (result.addAll(collect.getAllArticles())){ + List
result = collect.getAllArticles(); + if(!result.isEmpty()){ return result; } return null;