diff --git a/src/main/java/fr/la_banquise/backend/rest/InstanceEndpoints.java b/src/main/java/fr/la_banquise/backend/rest/InstanceEndpoints.java index b13700c..3195b4c 100644 --- a/src/main/java/fr/la_banquise/backend/rest/InstanceEndpoints.java +++ b/src/main/java/fr/la_banquise/backend/rest/InstanceEndpoints.java @@ -53,8 +53,7 @@ public class InstanceEndpoints { @RolesAllowed("ROOT") @Path("/{id}/all-instances") public Response getAllInstancesJi(@PathParam("id") Long jiId) { - // TODO : a modif, la c est juste all instances - return Response.ok(instanceService.getAllInstances()).build(); + return Response.ok(jiService.getAllInstancesJi(jiId)).build(); } @GET diff --git a/src/main/java/fr/la_banquise/backend/services/JiService.java b/src/main/java/fr/la_banquise/backend/services/JiService.java index 75b236c..d066efe 100644 --- a/src/main/java/fr/la_banquise/backend/services/JiService.java +++ b/src/main/java/fr/la_banquise/backend/services/JiService.java @@ -48,6 +48,7 @@ public class JiService { public Ji getJi(Long id) { return jiRepository.findById(id); } public Long getJiSiteId(Long id) { return jiRepository.findById(id).site.id; } + public List getAllInstancesJi(Long jiId) { return jiRepository.findById(jiId).instances; } /////////////////////////////////////////////////////////////////////////// diff --git a/src/main/webui b/src/main/webui index 0a7e3fc..ddcb092 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit 0a7e3fcc4479ec189128cb852b69f9b353e8fcd4 +Subproject commit ddcb0920c54cbbc3c896fb735f97a9bc5f7e28f5