From 1c244aaefa87d6518c03209311a79d3c6dd4bd50 Mon Sep 17 00:00:00 2001 From: Arthur Wambst Date: Thu, 16 Oct 2025 02:40:39 +0200 Subject: [PATCH] format and adaptation for front --- src/main/java/fr/la_banquise/backend/data/model/Ji.java | 7 ++++--- src/main/java/fr/la_banquise/backend/rest/Endpoints.java | 4 +++- .../backend/rest/{JiResource.java => JiEndpoints.java} | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) rename src/main/java/fr/la_banquise/backend/rest/{JiResource.java => JiEndpoints.java} (99%) diff --git a/src/main/java/fr/la_banquise/backend/data/model/Ji.java b/src/main/java/fr/la_banquise/backend/data/model/Ji.java index 49bffce..0802835 100644 --- a/src/main/java/fr/la_banquise/backend/data/model/Ji.java +++ b/src/main/java/fr/la_banquise/backend/data/model/Ji.java @@ -12,7 +12,6 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; - import java.util.ArrayList; import java.util.List; import lombok.AllArgsConstructor; @@ -35,7 +34,7 @@ public class Ji { @ManyToOne @JoinColumn(name = "site_id") //@JsonIgnore public Site site; - + @JsonIgnore @ManyToMany @JoinTable(name = "ji_respos", // Table de liaison @@ -50,7 +49,9 @@ public class Ji { inverseJoinColumns = @JoinColumn(name = "user_id")) public List participants; - @OneToMany @JoinColumn(name = "instance_id") public List instances; + @OneToMany + @JoinColumn(name = "instance_id") + public List instances; public Ji(String name, String description, List respos, String date, Site site) { diff --git a/src/main/java/fr/la_banquise/backend/rest/Endpoints.java b/src/main/java/fr/la_banquise/backend/rest/Endpoints.java index 3d368e8..86d72fa 100644 --- a/src/main/java/fr/la_banquise/backend/rest/Endpoints.java +++ b/src/main/java/fr/la_banquise/backend/rest/Endpoints.java @@ -30,9 +30,11 @@ public class Endpoints { @Authenticated @Path("dashboard") public Response getDashboard() { - User user = userService.getUser(identity.getPrincipal().getName()); + String username = identity.getPrincipal().getName(); + User user = userService.getUser(username); DashboardResponse dashboard = new DashboardResponse(); dashboard.roles = user.getRoles(); + dashboard.name = username; dashboard.jiRespo = user.jiRespo; dashboard.jiParticipant = user.jiParticipant; diff --git a/src/main/java/fr/la_banquise/backend/rest/JiResource.java b/src/main/java/fr/la_banquise/backend/rest/JiEndpoints.java similarity index 99% rename from src/main/java/fr/la_banquise/backend/rest/JiResource.java rename to src/main/java/fr/la_banquise/backend/rest/JiEndpoints.java index b005c83..f6db8a3 100644 --- a/src/main/java/fr/la_banquise/backend/rest/JiResource.java +++ b/src/main/java/fr/la_banquise/backend/rest/JiEndpoints.java @@ -16,7 +16,7 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; @Path("/api/ji") @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) -public class JiResource { +public class JiEndpoints { @Inject SecurityIdentity identity;