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 ffecd52..2d7732b 100644 --- a/src/main/java/fr/la_banquise/backend/rest/InstanceEndpoints.java +++ b/src/main/java/fr/la_banquise/backend/rest/InstanceEndpoints.java @@ -105,10 +105,11 @@ public class InstanceEndpoints { @GET @RolesAllowed("ROOT") - @Path("/{id}/container-admin-lookup") + @Path("/{id}/container-admin") public Response getStatusContainer(@PathParam("id") Long jiId, - @QueryParam("userId") Long userId) { - return Response.ok(jiService.getStatusContainer(jiId, userId)).build(); + @QueryParam("instId") Long instId) { + // TODO : add securtiy if needed ? + return Response.ok(jiService.getStatusContainerInst(jiId, instId)).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 56d763e..38a0f9b 100644 --- a/src/main/java/fr/la_banquise/backend/services/JiService.java +++ b/src/main/java/fr/la_banquise/backend/services/JiService.java @@ -47,8 +47,12 @@ 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; } + public Long getJiSiteId(Long id) { + return jiRepository.findById(id).site.id; + } + public List getAllInstancesJi(Long jiId) { + return jiRepository.findById(jiId).instances; + } /////////////////////////////////////////////////////////////////////////// @@ -127,7 +131,19 @@ public class JiService { return "Not created"; return retour; } - + public String getStatusContainerInst(Long jiId, Long instId) { + Ji ji = jiRepository.findById(jiId); + Instance instance = instanceService.getInstance(instId); + String retour = ""; + if (instance.containerId.equals("Not created")) + return "Not created"; + retour = instanceService.getStatusContainer(instance.id) + .toString() + .replaceAll(".*status=([^,]+).*", "$1"); + if (retour == "") + return "Not created"; + return retour; + } public String getStatusContainers(Long jiId) { Ji ji = jiRepository.findById(jiId); String retour = ""; @@ -164,7 +180,7 @@ public class JiService { /////////////////////////////////////////////////////////////////////////// /// Last but not least, be able do delete every container and instance - + @Transactional public void deleteContainer(Long instanceId) { instanceService.deleteContainer(instanceId); diff --git a/src/main/webui b/src/main/webui index a24db1f..014a476 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit a24db1f53f2ebf96aa3ca679a3e2364feabb3527 +Subproject commit 014a476177062cbf8582033e84714b3adce2d517