banquise/intra-back
13
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

small adaptations for frontend

Browse Source
This commit is contained in:
Arthur Wambst 2025-10-17 00:46:11 +02:00
parent 5309300f66
commit 1bdc206c3c
No known key found for this signature in database
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/fr/la_banquise/backend/rest/JiEndpoints.java
View File

@ -45,8 +45,8 @@ public class JiEndpoints {
@QueryParam("respo") String respo, @QueryParam("respo") String respo,
@QueryParam("site_id") Long siteId) { @QueryParam("site_id") Long siteId) {
try { try {
Ji jsp = jiService.createJi(name, date, respo, siteId); Long id = jiService.createJi(name, date, respo, siteId).id;
return Response.ok(Map.of("created", jsp)).build(); return Response.ok(Map.of("id", id)).build();
} catch (Exception e) { } catch (Exception e) {
return Response.status(500) return Response.status(500)
.entity(Map.of("error", e.getMessage())) .entity(Map.of("error", e.getMessage()))
@ -55,12 +55,12 @@ public class JiEndpoints {
} }
@GET @GET
@Path("/getbyname") @Path("/{ID}")
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
public Response getJiByName(@QueryParam("name") String name) { public Response getJi(@PathParam("ID") Long id) {
try { try {
Ji ji = jiService.getJiByName(name); Ji ji = jiService.getJi(id);
return Response.ok(ji.toString()).build(); return Response.ok(ji).build();
} catch (Exception e) { } catch (Exception e) {
return Response.status(500) return Response.status(500)
.entity(Map.of("error", e.getMessage())) .entity(Map.of("error", e.getMessage()))
@ -78,9 +78,9 @@ public class JiEndpoints {
"Internal server error, usually site not found") "Internal server error, usually site not found")
}) })
public Response public Response
deleteJiByName(@QueryParam("name") String name) { deleteJi(@QueryParam("id") Long id) {
try { try {
jiService.deleteJi(name); jiService.deleteJi(id);
return Response.ok().build(); return Response.ok().build();
} catch (Exception e) { } catch (Exception e) {
return Response.status(500) return Response.status(500)

6
src/main/java/fr/la_banquise/backend/rest/SiteEndpoints.java
View File

@ -61,8 +61,8 @@ public class SiteEndpoints {
createSite(@QueryParam("name") String name, @QueryParam("desc") String desc, createSite(@QueryParam("name") String name, @QueryParam("desc") String desc,
@QueryParam("address") String address) { @QueryParam("address") String address) {
try { try {
String jsp = siteService.createSite(name, desc, address).toString(); Long id = siteService.createSite(name, desc, address).id;
return Response.ok(Map.of("created", jsp)).build(); return Response.ok(Map.of("id", id)).build();
} catch (Exception e) { } catch (Exception e) {
return Response.status(500) return Response.status(500)
.entity(Map.of("error", e.getMessage())) .entity(Map.of("error", e.getMessage()))
@ -86,7 +86,7 @@ public class SiteEndpoints {
getSite(@PathParam("ID") Long id) { getSite(@PathParam("ID") Long id) {
try { try {
Site site = siteService.getSite(id); Site site = siteService.getSite(id);
return Response.ok(site.toString()).build(); return Response.ok(site).build();
} catch (Exception e) { } catch (Exception e) {
return Response.status(500) return Response.status(500)
.entity(Map.of("error", e.getMessage())) .entity(Map.of("error", e.getMessage()))

10
src/main/java/fr/la_banquise/backend/rest/request/SiteRequest.java Normal file
View File

@ -0,0 +1,10 @@
package fr.la_banquise.backend.rest.request;
/**
* SiteRequest
*/
public class SiteRequest {
public String name;
public String description;
public String address;
}

14
src/main/java/fr/la_banquise/backend/services/JiService.java
View File

@ -40,26 +40,16 @@ public class JiService {
return user.jiRespo; return user.jiRespo;
} }
public Ji getJiByName(String name) {
return jiRepository.find("name", name).firstResult();
}
public Ji getJiById(Long id) { return jiRepository.findById(id); } public Ji getJi(Long id) { return jiRepository.findById(id); }
@Transactional @Transactional
public void deleteJi(Long id) { public void deleteJi(Long id) {
Ji ji = getJiById(id); Ji ji = getJi(id);
siteService.removeJi(ji.site, ji); siteService.removeJi(ji.site, ji);
jiRepository.deleteById(id); jiRepository.deleteById(id);
} }
@Transactional
public void deleteJi(String name) {
Ji ji = getJiByName(name);
siteService.removeJi(ji.site, ji);
jiRepository.delete(ji);
}
@Transactional @Transactional
public Instance createInstance(Long jiId, Long userId) { public Instance createInstance(Long jiId, Long userId) {
Ji ji = jiRepository.findById(jiId); Ji ji = jiRepository.findById(jiId);

2
src/main/webui

@ -1 +1 @@
Subproject commit 31ffd227c70fe3b3c6fc7022633c515b5b2bc20f Subproject commit 8c04856614474d177ec8fc5140ed0e780ceb6530