From 9b528b8e954ee866576dcb1183fc46046b4b63f8 Mon Sep 17 00:00:00 2001
From: point <maxime.point2@etu.uca.fr>
Date: Thu, 29 Feb 2024 14:53:57 +0100
Subject: [PATCH] correctif de bug

---
 .../ApiREST/WebService/controller/CollectController.java | 9 ++++++---
 .../WebService/service/StubCollectionService.java        | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

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<List<Collect>> getAllCollectionsByName(@PathVariable(value = "name") String name){
+    public @ResponseBody CollectionModel<EntityModel<Collect>> getAllCollectionsByName(@PathVariable(value = "name") String name){
         List<Collect> results = collectionService.getAllCollectionsByName(name);
         if(results.isEmpty()) {
             throw new CollectException("No collections available");
         }
-        return EntityModel.of(results,
+        List<EntityModel<Collect>> 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<Article> getAllArticlesById(Integer id){
-        List<Article> result = new ArrayList<>();
         Collect collect = getCollectionById(id);
-        if (result.addAll(collect.getAllArticles())){
+        List<Article> result = collect.getAllArticles();
+        if(!result.isEmpty()){
             return result;
         }
         return null;