small adaptations for frontend
This commit is contained in:
parent
5309300f66
commit
1bdc206c3c
@ -45,8 +45,8 @@ public class JiEndpoints {
|
||||
@QueryParam("respo") String respo,
|
||||
@QueryParam("site_id") Long siteId) {
|
||||
try {
|
||||
Ji jsp = jiService.createJi(name, date, respo, siteId);
|
||||
return Response.ok(Map.of("created", jsp)).build();
|
||||
Long id = jiService.createJi(name, date, respo, siteId).id;
|
||||
return Response.ok(Map.of("id", id)).build();
|
||||
} catch (Exception e) {
|
||||
return Response.status(500)
|
||||
.entity(Map.of("error", e.getMessage()))
|
||||
@ -55,12 +55,12 @@ public class JiEndpoints {
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("/getbyname")
|
||||
@Path("/{ID}")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public Response getJiByName(@QueryParam("name") String name) {
|
||||
public Response getJi(@PathParam("ID") Long id) {
|
||||
try {
|
||||
Ji ji = jiService.getJiByName(name);
|
||||
return Response.ok(ji.toString()).build();
|
||||
Ji ji = jiService.getJi(id);
|
||||
return Response.ok(ji).build();
|
||||
} catch (Exception e) {
|
||||
return Response.status(500)
|
||||
.entity(Map.of("error", e.getMessage()))
|
||||
@ -78,9 +78,9 @@ public class JiEndpoints {
|
||||
"Internal server error, usually site not found")
|
||||
})
|
||||
public Response
|
||||
deleteJiByName(@QueryParam("name") String name) {
|
||||
deleteJi(@QueryParam("id") Long id) {
|
||||
try {
|
||||
jiService.deleteJi(name);
|
||||
jiService.deleteJi(id);
|
||||
return Response.ok().build();
|
||||
} catch (Exception e) {
|
||||
return Response.status(500)
|
||||
|
||||
@ -61,8 +61,8 @@ public class SiteEndpoints {
|
||||
createSite(@QueryParam("name") String name, @QueryParam("desc") String desc,
|
||||
@QueryParam("address") String address) {
|
||||
try {
|
||||
String jsp = siteService.createSite(name, desc, address).toString();
|
||||
return Response.ok(Map.of("created", jsp)).build();
|
||||
Long id = siteService.createSite(name, desc, address).id;
|
||||
return Response.ok(Map.of("id", id)).build();
|
||||
} catch (Exception e) {
|
||||
return Response.status(500)
|
||||
.entity(Map.of("error", e.getMessage()))
|
||||
@ -86,7 +86,7 @@ public class SiteEndpoints {
|
||||
getSite(@PathParam("ID") Long id) {
|
||||
try {
|
||||
Site site = siteService.getSite(id);
|
||||
return Response.ok(site.toString()).build();
|
||||
return Response.ok(site).build();
|
||||
} catch (Exception e) {
|
||||
return Response.status(500)
|
||||
.entity(Map.of("error", e.getMessage()))
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
package fr.la_banquise.backend.rest.request;
|
||||
|
||||
/**
|
||||
* SiteRequest
|
||||
*/
|
||||
public class SiteRequest {
|
||||
public String name;
|
||||
public String description;
|
||||
public String address;
|
||||
}
|
||||
@ -40,26 +40,16 @@ public class JiService {
|
||||
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
|
||||
public void deleteJi(Long id) {
|
||||
Ji ji = getJiById(id);
|
||||
Ji ji = getJi(id);
|
||||
siteService.removeJi(ji.site, ji);
|
||||
jiRepository.deleteById(id);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void deleteJi(String name) {
|
||||
Ji ji = getJiByName(name);
|
||||
siteService.removeJi(ji.site, ji);
|
||||
jiRepository.delete(ji);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Instance createInstance(Long jiId, Long userId) {
|
||||
Ji ji = jiRepository.findById(jiId);
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 31ffd227c70fe3b3c6fc7022633c515b5b2bc20f
|
||||
Subproject commit 8c04856614474d177ec8fc5140ed0e780ceb6530
|
||||
Loading…
x
Reference in New Issue
Block a user