From 0aa72576ce4bf85b4b4c8344dd268f7342ecb21d Mon Sep 17 00:00:00 2001 From: Arthur Wambst Date: Mon, 20 Oct 2025 16:44:40 +0200 Subject: [PATCH] new endpoint for jis site id --- .../fr/la_banquise/backend/rest/JiEndpoints.java | 14 ++++++++++++++ .../fr/la_banquise/backend/services/JiService.java | 3 +++ src/main/resources/application.properties | 2 +- src/main/webui | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/la_banquise/backend/rest/JiEndpoints.java b/src/main/java/fr/la_banquise/backend/rest/JiEndpoints.java index fb0f748..59b4362 100644 --- a/src/main/java/fr/la_banquise/backend/rest/JiEndpoints.java +++ b/src/main/java/fr/la_banquise/backend/rest/JiEndpoints.java @@ -77,6 +77,20 @@ public class JiEndpoints { .build(); } } + + @GET + @Path("/{ID}/site-id") + @Produces(MediaType.APPLICATION_JSON) + public Response getJiSiteId(@PathParam("ID") Long id) { + try { + Ji ji = jiService.getJi(id); + return Response.ok(ji.site.id).build(); + } catch (Exception e) { + return Response.status(500) + .entity(Map.of("error", e.getMessage())) + .build(); + } + } /////////////////////////////////////////////////////////////////////////// /// Now that the JI is created, we want to add users to it and assign them 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 5cece85..75b236c 100644 --- a/src/main/java/fr/la_banquise/backend/services/JiService.java +++ b/src/main/java/fr/la_banquise/backend/services/JiService.java @@ -30,6 +30,8 @@ public class JiService { Long siteId, Long ownerId) { Site site = siteService.getSite(siteId); User user = userService.getUser(ownerId); + if (site == null || user == null) + throw new Error("no site or user"); Ji ji = new Ji(name, description, List.of(user), date, site); jiRepository.persist(ji); siteService.registerJi(site, ji); @@ -45,6 +47,7 @@ public class JiService { } public Ji getJi(Long id) { return jiRepository.findById(id); } + public Long getJiSiteId(Long id) { return jiRepository.findById(id).site.id; } /////////////////////////////////////////////////////////////////////////// diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 46f7133..f908816 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -37,7 +37,7 @@ quarkus.hibernate-orm.database.generation=drop-and-create quarkus.quinoa.dev-server.port=5173 quarkus.quinoa.enable-spa-routing=true -quarkus.docker.docker-host=unix:///run/user/1001/docker.sock +quarkus.docker.docker-host=unix:///run/user/1000/docker.sock #quarkus.security.auth.enabled-in-dev-mode=false quarkus.hibernate-orm.sql-load-script=import-dev.sql diff --git a/src/main/webui b/src/main/webui index afc23d1..0a7e3fc 160000 --- a/src/main/webui +++ b/src/main/webui @@ -1 +1 @@ -Subproject commit afc23d1208d476279930f4852388d30c39258593 +Subproject commit 0a7e3fcc4479ec189128cb852b69f9b353e8fcd4