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

started changes required by review

Browse Source
This commit is contained in:
Arthur Wambst 2025-09-08 23:43:16 +02:00
parent 27332ff809
commit a82677b3bb
No known key found for this signature in database
6 changed files with 23 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/fr/la_banquise/backend/data/model/Site.java
View File

@ -15,10 +15,12 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.ToString;
@Entity @Entity
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ToString
@Table(name = "site", @Table(name = "site",
uniqueConstraints = { @UniqueConstraint(columnNames = "name") }) uniqueConstraints = { @UniqueConstraint(columnNames = "name") })
public class Site { public class Site {
@ -43,12 +45,4 @@ public class Site {
this.address = address; this.address = address;
this.jiInSite = new ArrayList<Ji>(); this.jiInSite = new ArrayList<Ji>();
} }
@Override
public String toString() {
return "Site{id=" + id + ", name='" + name + "', description='" +
description + "', address='" + address + "'}";
}
// public Site() {}
} }

4
src/main/java/fr/la_banquise/backend/rest/Endpoints.java
View File

@ -3,6 +3,7 @@ package fr.la_banquise.backend.rest;
import fr.la_banquise.backend.rest.response.DashboardResponse; import fr.la_banquise.backend.rest.response.DashboardResponse;
import fr.la_banquise.backend.services.InstanceService; import fr.la_banquise.backend.services.InstanceService;
import fr.la_banquise.backend.services.SujetService; import fr.la_banquise.backend.services.SujetService;
import io.quarkus.security.Authenticated;
import io.quarkus.security.identity.SecurityIdentity; import io.quarkus.security.identity.SecurityIdentity;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import jakarta.ws.rs.GET; import jakarta.ws.rs.GET;
@ -22,13 +23,14 @@ public class Endpoints {
@Inject SujetService sujetService; @Inject SujetService sujetService;
@GET @GET
@Authenticated
@Path("dashboard") @Path("dashboard")
public Response getDashboard() { public Response getDashboard() {
String username = identity.getPrincipal().getName(); String username = identity.getPrincipal().getName();
DashboardResponse dashboard = new DashboardResponse(); DashboardResponse dashboard = new DashboardResponse();
dashboard.tps = dashboard.tps =
sujetService.getAllSujetsRespo(identity.getPrincipal().getName()); sujetService.getAllSujetsRespo(identity.getPrincipal().getName());
//dashboard.instances = instanceService.getAllInstances(username); // dashboard.instances = instanceService.getAllInstances(username);
return Response.ok(dashboard).build(); return Response.ok(dashboard).build();
} }
} }

52
src/main/java/fr/la_banquise/backend/rest/JiResource.java
View File

@ -41,13 +41,11 @@ public class JiResource {
@Path("/create") @Path("/create")
@RolesAllowed("ROOT") @RolesAllowed("ROOT")
public Response createJi(@QueryParam("name") String name, public Response createJi(@QueryParam("name") String name,
@QueryParam("desc") String desc, // TODO : change @QueryParam("date") String date,
// desc to date
@QueryParam("address") String address,
@QueryParam("respo") String respo, @QueryParam("respo") String respo,
@QueryParam("site") String name_site) { @QueryParam("site") String name_site) {
try { try {
Ji jsp = jiService.createJi(name, desc, address, name_site); Ji jsp = jiService.createJi(name, date, respo, name_site);
return Response.ok(Map.of("created", jsp)).build(); return Response.ok(Map.of("created", jsp)).build();
} catch (Exception e) { } catch (Exception e) {
return Response.status(500) return Response.status(500)
@ -72,7 +70,7 @@ public class JiResource {
@DELETE @DELETE
@Path("/del") @Path("/del")
@RolesAllowed("root") @RolesAllowed("ROOT")
@APIResponses({ @APIResponses({
@APIResponse(responseCode = "200", description = "Successfully deleted") @APIResponse(responseCode = "200", description = "Successfully deleted")
, @APIResponse(responseCode = "500", , @APIResponse(responseCode = "500",
@ -90,48 +88,4 @@ public class JiResource {
.build(); .build();
} }
} }
/*
@GET
@Path("/all")
public Response listContainers() {
try {
String id = dockerService.listAllContainers();
return Response.ok(id).build();
} catch (Exception e) {
return Response.status(500).entity(Map.of("error",
e.getMessage())).build();
}
}
@POST
@Path("/start")
public Response start(@QueryParam("id") String id) {
try {
dockerService.start(id);
return Response.ok(Map.of("containerId", id, "status",
"Running")).build(); } catch (Exception e) { return
Response.status(500).entity(Map.of("error", e.getMessage())).build();
}
}
@POST
@Path("/stop")
public Response stop(@QueryParam("id") String id) {
try {
dockerService.stop(id);
return Response.ok(Map.of("containerId", id, "status",
"removed")).build(); } catch (Exception e) { return
Response.status(500).entity(Map.of("error", e.getMessage())).build();
}
}
@DELETE
@Path("/remove")
public Response remove(@QueryParam("id") String id) {
try {
dockerService.remove(id);
return Response.ok(Map.of("containerId", id, "status",
"removed")).build(); } catch (Exception e) { return
Response.status(500).entity(Map.of("error", e.getMessage())).build();
}
}*/
} }

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

@ -20,7 +20,7 @@ import java.util.Map;
/** /**
* TpEndpoints * TpEndpoints
*/ */
@Path("/api/subject") @Path("/api/subjects")
public class SujetEndpoints { public class SujetEndpoints {
@Inject SecurityIdentity identity; @Inject SecurityIdentity identity;
@ -52,10 +52,10 @@ public class SujetEndpoints {
@Path("/respo") @Path("/respo")
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@RolesAllowed("ROOT") @RolesAllowed("ROOT")
public Response addRespoSujet(@QueryParam("name_sujet") String name_sujet, public Response addRespoSujet(@QueryParam("nameSujet") String nameSujet,
@QueryParam("name_user") String name_user) { @QueryParam("nameUser") String nameUser) {
try { try {
if (sujetService.addRespo(name_sujet, name_user)) { if (sujetService.addRespo(nameSujet, nameUser)) {
return Response.ok("Respo added sucessfully.").build(); return Response.ok("Respo added sucessfully.").build();
} }
return Response.status(404) return Response.status(404)
@ -71,11 +71,11 @@ public class SujetEndpoints {
@DELETE @DELETE
@Path("/respo") @Path("/respo")
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@RolesAllowed("root") @RolesAllowed("ROOT")
public Response rmRespoSujet(@QueryParam("name_sujet") String name_sujet, public Response rmRespoSujet(@QueryParam("nameSujet") String nameSujet,
@QueryParam("name_user") String name_user) { @QueryParam("nameUser") String nameUser) {
try { try {
if (sujetService.rmRespo(name_sujet, name_user)) { if (sujetService.rmRespo(nameSujet, nameUser)) {
return Response.ok("Respo removed sucessfully.").build(); return Response.ok("Respo removed sucessfully.").build();
} }
return Response.status(404) return Response.status(404)

12
src/main/java/fr/la_banquise/backend/services/SujetService.java
View File

@ -68,9 +68,9 @@ public class SujetService {
} }
@Transactional @Transactional
public boolean addRespo(String name_sujet, String name_user) { public boolean addRespo(String nameSujet, String nameUser) {
User user = userRepository.find("name", name_user).firstResult(); User user = userRepository.find("name", nameUser).firstResult();
Sujet sujet = sujetRepository.find("name", name_sujet).firstResult(); Sujet sujet = sujetRepository.find("name", nameSujet).firstResult();
if (!sujet.respos.contains(user)) { if (!sujet.respos.contains(user)) {
sujet.respos.add(user); sujet.respos.add(user);
return true; return true;
@ -79,9 +79,9 @@ public class SujetService {
} }
@Transactional @Transactional
public boolean rmRespo(String name_sujet, String name_user) { public boolean rmRespo(String nameSujet, String nameUser) {
User user = userRepository.find("name", name_user).firstResult(); User user = userRepository.find("name", nameUser).firstResult();
Sujet sujet = sujetRepository.find("name", name_sujet).firstResult(); Sujet sujet = sujetRepository.find("name", nameSujet).firstResult();
if (sujet.respos.contains(user)) { if (sujet.respos.contains(user)) {
sujet.respos.remove(user); sujet.respos.remove(user);
return true; return true;

2
src/main/java/fr/la_banquise/backend/services/UserService.java
View File

@ -45,7 +45,7 @@ public class UserService {
userRepository.deleteById(id); userRepository.deleteById(id);
} }
@Transactional // wtf ? this is get user no ? @Transactional // wtf ? this is get user no ? EDIT : this is x)
public User updateUser(Long id) { public User updateUser(Long id) {
User user = userRepository.findById(id); User user = userRepository.findById(id);
return user; return user;