From 746fa97cf3148038b62abb3e218a521281613592 Mon Sep 17 00:00:00 2001 From: Pierre Tellier Date: Wed, 12 Feb 2025 15:29:12 +0100 Subject: [PATCH] fix: applied formatter (on all import as well :) --- .../WebSecurityCustomConfiguration.java | 21 ++- .../controller/AdministrateursController.java | 4 +- .../controller/ComptesRendusController.java | 4 +- .../controller/EntrepreneursController.java | 4 +- .../controller/ProjetsController.java | 6 +- .../controller/RendezVousController.java | 8 +- .../controller/SectionsController.java | 6 +- .../controller/UtilisateursController.java | 4 +- .../postgres_db/model/Administrateurs.java | 1 + .../myinpulse/postgres_db/model/Projets.java | 1 + .../postgres_db/model/RendezVous.java | 41 ++--- .../repository/AdministrateursRepository.java | 1 + .../repository/ComptesRendusRepository.java | 1 + .../repository/EntrepreneursRepository.java | 1 + .../repository/ProjetsRepository.java | 1 + .../repository/RendezVousRepository.java | 1 + .../repository/SectionsRepository.java | 1 + .../repository/UtilisateursRepository.java | 1 + .../security/KeycloakJwtRolesConverter.java | 4 +- MyINPulse-back/src/main/resources/data.sql | 96 +++++++----- MyINPulse-back/src/main/resources/schema.sql | 148 ++++++++++-------- 21 files changed, 197 insertions(+), 158 deletions(-) diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/config/WebSecurityCustomConfiguration.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/config/WebSecurityCustomConfiguration.java index 637b6c2..b8f0e4f 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/config/WebSecurityCustomConfiguration.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/config/WebSecurityCustomConfiguration.java @@ -1,6 +1,9 @@ package enseirb.myinpulse.config; +import static org.springframework.security.authorization.AuthorityAuthorizationManager.hasRole; + import enseirb.myinpulse.security.KeycloakJwtRolesConverter; + import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -13,9 +16,6 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import java.util.Arrays; import java.util.List; -import static org.springframework.security.authorization.AuthorityAuthorizationManager.hasRole; - - @Configuration public class WebSecurityCustomConfiguration { // CORS configuration @@ -24,8 +24,8 @@ public class WebSecurityCustomConfiguration { private String frontendUrl; /** - * Configure the CORS (Cross Origin Ressource Sharing -- a security feature) configuration. - * The only allowed website is the frontend, defined in the .env file. + * Configure the CORS (Cross Origin Ressource Sharing -- a security feature) configuration. The + * only allowed website is the frontend, defined in the .env file. * * @return the CORS configuration used by the backend */ @@ -35,10 +35,7 @@ public class WebSecurityCustomConfiguration { configuration.setAllowedOrigins(List.of(frontendUrl)); configuration.setAllowedMethods(Arrays.asList("GET", "OPTIONS")); configuration.setAllowedHeaders( - Arrays.asList( - "authorization", - "content-type", - "x-auth-token")); + Arrays.asList("authorization", "content-type", "x-auth-token")); UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", configuration); @@ -47,8 +44,10 @@ public class WebSecurityCustomConfiguration { /** * Configure the authorisation required for each path. - * admin endpoints are under /admin/* and entrepreneur are under /entrepreneur/* - * If endpoints dont require authentication, they are under /unauth/ + * + *

admin endpoints are under /admin/* and entrepreneur are under /entrepreneur/* + * + *

If endpoints dont require authentication, they are under /unauth/ * * @param http automatically filled in by spring. * @return a securityfilterchain, automatically used by spring. diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/AdministrateursController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/AdministrateursController.java index 2a5d05e..b9a8259 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/AdministrateursController.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/AdministrateursController.java @@ -2,12 +2,14 @@ package enseirb.myinpulse.postgres_db.controller; import enseirb.myinpulse.postgres_db.model.Administrateurs; import enseirb.myinpulse.postgres_db.repository.AdministrateursRepository; -import java.util.Optional; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; +import java.util.Optional; + @RestController public class AdministrateursController { diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/ComptesRendusController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/ComptesRendusController.java index 312ae9e..5d35227 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/ComptesRendusController.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/ComptesRendusController.java @@ -2,12 +2,14 @@ package enseirb.myinpulse.postgres_db.controller; import enseirb.myinpulse.postgres_db.model.ComptesRendus; import enseirb.myinpulse.postgres_db.repository.ComptesRendusRepository; -import java.util.Optional; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; +import java.util.Optional; + @RestController public class ComptesRendusController { diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/EntrepreneursController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/EntrepreneursController.java index f789e0d..3124257 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/EntrepreneursController.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/EntrepreneursController.java @@ -2,12 +2,14 @@ package enseirb.myinpulse.postgres_db.controller; import enseirb.myinpulse.postgres_db.model.Entrepreneurs; import enseirb.myinpulse.postgres_db.repository.EntrepreneursRepository; -import java.util.Optional; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; +import java.util.Optional; + @RestController public class EntrepreneursController { diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/ProjetsController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/ProjetsController.java index f3a469c..62dfce2 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/ProjetsController.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/ProjetsController.java @@ -2,13 +2,15 @@ package enseirb.myinpulse.postgres_db.controller; import enseirb.myinpulse.postgres_db.model.Projets; import enseirb.myinpulse.postgres_db.repository.ProjetsRepository; -import java.time.LocalDate; -import java.util.Optional; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; +import java.time.LocalDate; +import java.util.Optional; + @RestController public class ProjetsController { diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/RendezVousController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/RendezVousController.java index 6f2a39f..027b394 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/RendezVousController.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/RendezVousController.java @@ -2,14 +2,16 @@ package enseirb.myinpulse.postgres_db.controller; import enseirb.myinpulse.postgres_db.model.RendezVous; import enseirb.myinpulse.postgres_db.repository.RendezVousRepository; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Optional; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Optional; + @RestController public class RendezVousController { diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/SectionsController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/SectionsController.java index 5b4df39..7aaf15f 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/SectionsController.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/SectionsController.java @@ -2,13 +2,15 @@ package enseirb.myinpulse.postgres_db.controller; import enseirb.myinpulse.postgres_db.model.Sections; import enseirb.myinpulse.postgres_db.repository.SectionsRepository; -import java.time.LocalDateTime; -import java.util.Optional; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; +import java.time.LocalDateTime; +import java.util.Optional; + @RestController public class SectionsController { diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/UtilisateursController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/UtilisateursController.java index a6c128d..c6c8878 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/UtilisateursController.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/controller/UtilisateursController.java @@ -2,12 +2,14 @@ package enseirb.myinpulse.postgres_db.controller; import enseirb.myinpulse.postgres_db.model.Utilisateurs; import enseirb.myinpulse.postgres_db.repository.UtilisateursRepository; -import java.util.Optional; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; +import java.util.Optional; + @RestController public class UtilisateursController { diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/Administrateurs.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/Administrateurs.java index 30b70d1..ac42bdb 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/Administrateurs.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/Administrateurs.java @@ -3,6 +3,7 @@ package enseirb.myinpulse.postgres_db.model; import jakarta.persistence.*; import jakarta.persistence.PrimaryKeyJoinColumn; import jakarta.persistence.Table; + import java.util.ArrayList; import java.util.List; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/Projets.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/Projets.java index b49c12f..e543549 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/Projets.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/Projets.java @@ -2,6 +2,7 @@ package enseirb.myinpulse.postgres_db.model; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; + import java.time.LocalDate; import java.util.ArrayList; import java.util.List; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/RendezVous.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/RendezVous.java index e1625e5..b1cc5a2 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/RendezVous.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/model/RendezVous.java @@ -12,31 +12,6 @@ import java.util.List; @Table(name = "rendez_vous") public class RendezVous { - @Id - @NotNull - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id_rdv; - - private LocalDate date_rdv; - - private LocalDateTime heure_rdv; - - private LocalDateTime duree_rdv; - - @Column(length = 255) - private String lieu_rdv; - - private String sujet_rdv; - - @OneToMany(mappedBy = "rendezVousEntrepreneurs", fetch = FetchType.LAZY, orphanRemoval = true) - private List ListEntrepreneurs = new ArrayList<>(); - - @OneToMany(mappedBy = "rendezVousAdministrateurs", fetch = FetchType.LAZY, orphanRemoval = true) - private List ListAdministrateurs = new ArrayList<>(); - - @OneToMany(mappedBy = "rendezVousComptesRendus", fetch = FetchType.LAZY, orphanRemoval = true) - private List ListComptesRendus = new ArrayList<>(); - @ManyToMany( fetch = FetchType.LAZY, cascade = {CascadeType.ALL}) @@ -45,6 +20,22 @@ public class RendezVous { joinColumns = @JoinColumn(name = "id_rdv"), inverseJoinColumns = @JoinColumn(name = "id_section")) List ListSections = new ArrayList<>(); + @Id + @NotNull + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id_rdv; + private LocalDate date_rdv; + private LocalDateTime heure_rdv; + private LocalDateTime duree_rdv; + @Column(length = 255) + private String lieu_rdv; + private String sujet_rdv; + @OneToMany(mappedBy = "rendezVousEntrepreneurs", fetch = FetchType.LAZY, orphanRemoval = true) + private List ListEntrepreneurs = new ArrayList<>(); + @OneToMany(mappedBy = "rendezVousAdministrateurs", fetch = FetchType.LAZY, orphanRemoval = true) + private List ListAdministrateurs = new ArrayList<>(); + @OneToMany(mappedBy = "rendezVousComptesRendus", fetch = FetchType.LAZY, orphanRemoval = true) + private List ListComptesRendus = new ArrayList<>(); public RendezVous() {} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/AdministrateursRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/AdministrateursRepository.java index b59d2c0..0454e64 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/AdministrateursRepository.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/AdministrateursRepository.java @@ -1,6 +1,7 @@ package enseirb.myinpulse.postgres_db.repository; import enseirb.myinpulse.postgres_db.model.Administrateurs; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/ComptesRendusRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/ComptesRendusRepository.java index e4de376..168fd87 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/ComptesRendusRepository.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/ComptesRendusRepository.java @@ -1,6 +1,7 @@ package enseirb.myinpulse.postgres_db.repository; import enseirb.myinpulse.postgres_db.model.ComptesRendus; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/EntrepreneursRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/EntrepreneursRepository.java index bb09b74..fc288f5 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/EntrepreneursRepository.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/EntrepreneursRepository.java @@ -1,6 +1,7 @@ package enseirb.myinpulse.postgres_db.repository; import enseirb.myinpulse.postgres_db.model.Entrepreneurs; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/ProjetsRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/ProjetsRepository.java index 37f5d8e..d9d2e59 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/ProjetsRepository.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/ProjetsRepository.java @@ -1,6 +1,7 @@ package enseirb.myinpulse.postgres_db.repository; import enseirb.myinpulse.postgres_db.model.Projets; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/RendezVousRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/RendezVousRepository.java index 93074f8..2856de3 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/RendezVousRepository.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/RendezVousRepository.java @@ -1,6 +1,7 @@ package enseirb.myinpulse.postgres_db.repository; import enseirb.myinpulse.postgres_db.model.RendezVous; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/SectionsRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/SectionsRepository.java index cc25ab1..4d68027 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/SectionsRepository.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/SectionsRepository.java @@ -1,6 +1,7 @@ package enseirb.myinpulse.postgres_db.repository; import enseirb.myinpulse.postgres_db.model.Sections; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/UtilisateursRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/UtilisateursRepository.java index 28aca29..de8371c 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/UtilisateursRepository.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/postgres_db/repository/UtilisateursRepository.java @@ -1,6 +1,7 @@ package enseirb.myinpulse.postgres_db.repository; import enseirb.myinpulse.postgres_db.model.Utilisateurs; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/security/KeycloakJwtRolesConverter.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/security/KeycloakJwtRolesConverter.java index dba41cc..c73b82a 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/security/KeycloakJwtRolesConverter.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/security/KeycloakJwtRolesConverter.java @@ -1,5 +1,7 @@ package enseirb.myinpulse.security; +import static java.util.stream.Collectors.toSet; + import org.springframework.core.convert.converter.Converter; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.GrantedAuthority; @@ -14,8 +16,6 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import static java.util.stream.Collectors.toSet; - public class KeycloakJwtRolesConverter implements Converter { /** Prefix used for realm level roles. */ public static final String PREFIX_REALM_ROLE = "ROLE_REALM_"; diff --git a/MyINPulse-back/src/main/resources/data.sql b/MyINPulse-back/src/main/resources/data.sql index 4014267..788f9dd 100644 --- a/MyINPulse-back/src/main/resources/data.sql +++ b/MyINPulse-back/src/main/resources/data.sql @@ -1,50 +1,62 @@ -INSERT INTO projets (nom_projet, logo, date_creation, status_projet) VALUES -('Eau du robinet', decode('013d7d16d7ad4fefb61bd95b765c8ceb', 'hex'), TO_DATE('01-OCT-2023', 'DD-MON-YYYY'), 'En cours'), -('Air oxygéné', decode('150647a0984e8f228cd14b54', 'hex'), TO_DATE('04-APR-2024', 'DD-MON-YYYY'), 'En cours'), -('Débat concours', decode('022024abd5486e245c145dda65116f', 'hex'), TO_DATE('22-NOV-2023', 'DD-MON-YYYY'), 'Suspendu'), -('HDeirbMI', decode('ab548d6c1d595a2975e6476f544d14c55a', 'hex'), TO_DATE('07-DEC-2024', 'DD-MON-YYYY'), 'Lancement'); +INSERT INTO projets (nom_projet, logo, date_creation, status_projet) +VALUES ('Eau du robinet', decode('013d7d16d7ad4fefb61bd95b765c8ceb', 'hex'), TO_DATE('01-OCT-2023', 'DD-MON-YYYY'), + 'En cours'), + ('Air oxygéné', decode('150647a0984e8f228cd14b54', 'hex'), TO_DATE('04-APR-2024', 'DD-MON-YYYY'), 'En cours'), + ('Débat concours', decode('022024abd5486e245c145dda65116f', 'hex'), TO_DATE('22-NOV-2023', 'DD-MON-YYYY'), + 'Suspendu'), + ('HDeirbMI', decode('ab548d6c1d595a2975e6476f544d14c55a', 'hex'), TO_DATE('07-DEC-2024', 'DD-MON-YYYY'), + 'Lancement'); -INSERT INTO utilisateurs (nom_utilisateur, prenom_utilisateur, mail_principal, mail_secondaire, numero_telephone) VALUES -('Dupont', 'Dupond', 'super@mail.fr', 'super2@mail.fr', '06 45 72 45 98'), -('Martin', 'Matin', 'genial@mail.fr', 'genial2@mail.fr', '06 52 14 58 73'), -('Charvet', 'Lautre', 'mieux@tmail.fr', 'mieux2@tmail.fr', '07 49 82 16 35'), -('Leguez', 'Theo', 'bof@mesmails.fr', 'bof2@mesmails.fr', '+33 6 78 14 25 29'), -('Kia', 'Bi', 'special@mail.fr', 'special2@mail.fr', '07 65 31 38 95'); +INSERT INTO utilisateurs (nom_utilisateur, prenom_utilisateur, mail_principal, mail_secondaire, numero_telephone) +VALUES ('Dupont', 'Dupond', 'super@mail.fr', 'super2@mail.fr', '06 45 72 45 98'), + ('Martin', 'Matin', 'genial@mail.fr', 'genial2@mail.fr', '06 52 14 58 73'), + ('Charvet', 'Lautre', 'mieux@tmail.fr', 'mieux2@tmail.fr', '07 49 82 16 35'), + ('Leguez', 'Theo', 'bof@mesmails.fr', 'bof2@mesmails.fr', '+33 6 78 14 25 29'), + ('Kia', 'Bi', 'special@mail.fr', 'special2@mail.fr', '07 65 31 38 95'); -INSERT INTO entrepreneurs (ecole, filiere, status_snee) VALUES -('ENSEIRB-MATMECA', 'INFO', TRUE), -('ENSC', 'Cognitique', TRUE), -('ENSEIRB-MATMECA', 'MATMECA', FALSE), -('SupOptique', 'Classique', TRUE), -('ENSEGID', 'Géoscience', FALSE), -('ENSMAC', 'Matériaux composites - Mécanique', FALSE); +INSERT INTO entrepreneurs (ecole, filiere, status_snee) +VALUES ('ENSEIRB-MATMECA', 'INFO', TRUE), + ('ENSC', 'Cognitique', TRUE), + ('ENSEIRB-MATMECA', 'MATMECA', FALSE), + ('SupOptique', 'Classique', TRUE), + ('ENSEGID', 'Géoscience', FALSE), + ('ENSMAC', 'Matériaux composites - Mécanique', FALSE); -INSERT INTO sections (titre, contenu_section, date_modification) VALUES -("Problème", "les problèmes...", TO_DATE('15-JAN-2025', 'DD-MON-YYYY')), -("Segment de client", "Le segment AB passant le client n°8 est de longueur 32mm. - Le segment BC a quant à lui un longueur de 28mm. Quelle la longueur du segment AC ?", TO_DATE('12-OCT-2022', 'DD-MON-YYYY')), -("Proposition de valeur unique", "'Son prix est de 2594€' 'Ah oui c'est unique en effet'", TO_DATE('25-MAY-2024', 'DD-MON-YYYY')), -("Solution", "Un problème ? Une solution", TO_DATE('08-FEB-2024', 'DD-MON-YYYY')), -("Canaux", "Ici nous avons la Seine, là-bas le Rhin, oh et plus loin le canal de Suez", TO_DATE('19-JUL-2023', 'DD-MON-YYYY')), -("Sources de revenus", "Y'en n'a pas on est pas payé. Enfin y'a du café quoi", TO_DATE('12-JAN-2025', 'DD-MON-YYYY')), -("Structure des coûts", "'Ah oui là ça va faire au moins 1000€ par mois', Eirbware", TO_DATE('06-FEB-2025', 'DD-MON-YYYY')), -("Indicateurs clés", "On apprend les clés comme des badges, ça se fait", TO_DATE('05-FEB-2025', 'DD-MON-YYYY')), -("Avantages concurrentiel", "On est meilleur", TO_DATE('23-APR-2024', 'DD-MON-YYYY')); +INSERT INTO sections (titre, contenu_section, date_modification) +VALUES ("Problème", "les problèmes...", TO_DATE('15-JAN-2025', 'DD-MON-YYYY')), + ("Segment de client", "Le segment AB passant le client n°8 est de longueur 32mm. + Le segment BC a quant à lui un longueur de 28mm. Quelle la longueur du segment AC ?", + TO_DATE('12-OCT-2022', 'DD-MON-YYYY')), + ("Proposition de valeur unique", "'Son prix est de 2594€' 'Ah oui c'est unique en effet'", + TO_DATE('25-MAY-2024', 'DD-MON-YYYY')), + ("Solution", "Un problème ? Une solution", TO_DATE('08-FEB-2024', 'DD-MON-YYYY')), + ("Canaux", "Ici nous avons la Seine, là-bas le Rhin, oh et plus loin le canal de Suez", + TO_DATE('19-JUL-2023', 'DD-MON-YYYY')), + ("Sources de revenus", "Y'en n'a pas on est pas payé. Enfin y'a du café quoi", + TO_DATE('12-JAN-2025', 'DD-MON-YYYY')), + ("Structure des coûts", "'Ah oui là ça va faire au moins 1000€ par mois', Eirbware", + TO_DATE('06-FEB-2025', 'DD-MON-YYYY')), + ("Indicateurs clés", "On apprend les clés comme des badges, ça se fait", TO_DATE('05-FEB-2025', 'DD-MON-YYYY')), + ("Avantages concurrentiel", "On est meilleur", TO_DATE('23-APR-2024', 'DD-MON-YYYY')); -INSERT INTO rendez_vous (date_rdv, heure_rdv, duree_rdv, lieu_rdv, sujet_rdv) VALUES -(TO_DATE('24-DEC-2023', 'DD-MON-YYYY'), '00:00:00', '00:37:53', "À la maison", "Ouvrir les cadeaux"), -(TO_DATE('15-AUG-2024', 'DD-MON-YYYY'), '22:35:00', '00:12:36', "Sur les quais ou dans un champ probablement", "BOUM BOUM les feux d'artifices (on fête quoi déjà ?)"), -(TO_DATE('29-FEB-2023', 'DD-MON-YYYY'), '14:20:00', '00:20:00', "Salle TD 15", "Ah mince c'est pas une année bissextile !"), -(TO_DATE('23-JAN-2024', 'DD-MON-YYYY'), '12:56:27', '11:03:33', "Là où le vent nous porte", "Journée la plus importante de l'année"), -(TO_DATE('25-AUG-2025', 'DD-MON-YYYY'), '00:09:00', '01:00:00', "Euh c'est par où l'amphi 56 ?", "Rentrée scolaire (il fait trop froid c'est quoi ça on est en août)"); +INSERT INTO rendez_vous (date_rdv, heure_rdv, duree_rdv, lieu_rdv, sujet_rdv) +VALUES (TO_DATE('24-DEC-2023', 'DD-MON-YYYY'), '00:00:00', '00:37:53', "À la maison", "Ouvrir les cadeaux"), + (TO_DATE('15-AUG-2024', 'DD-MON-YYYY'), '22:35:00', '00:12:36', "Sur les quais ou dans un champ probablement", + "BOUM BOUM les feux d'artifices (on fête quoi déjà ?)"), + (TO_DATE('29-FEB-2023', 'DD-MON-YYYY'), '14:20:00', '00:20:00', "Salle TD 15", + "Ah mince c'est pas une année bissextile !"), + (TO_DATE('23-JAN-2024', 'DD-MON-YYYY'), '12:56:27', '11:03:33', "Là où le vent nous porte", + "Journée la plus importante de l'année"), + (TO_DATE('25-AUG-2025', 'DD-MON-YYYY'), '00:09:00', '01:00:00', "Euh c'est par où l'amphi 56 ?", + "Rentrée scolaire (il fait trop froid c'est quoi ça on est en août)"); -INSERT INTO comptes_rendus (contenu_compte_rendu) VALUES -("Ah oui ça c'est super, ah ouais j'aime bien, bien vu de penser à ça"), -("Bonne réunion"), -("Ouais, j'ai rien compris mais niquel on fait comme vous avez dit"), -("Non non ça va pas du tout ce que tu me proposes, faut tout refaire"), -("Réponse de la DSI : non"), -("Trop dommage qu'Apple ait sorti leur logiciel avant nous, on avait la même idée et tout on aurait tellement pu leur faire de la concurrence"); +INSERT INTO comptes_rendus (contenu_compte_rendu) +VALUES ("Ah oui ça c'est super, ah ouais j'aime bien, bien vu de penser à ça"), + ("Bonne réunion"), + ("Ouais, j'ai rien compris mais niquel on fait comme vous avez dit"), + ("Non non ça va pas du tout ce que tu me proposes, faut tout refaire"), + ("Réponse de la DSI : non"), + ("Trop dommage qu'Apple ait sorti leur logiciel avant nous, on avait la même idée et tout on aurait tellement pu leur faire de la concurrence"); diff --git a/MyINPulse-back/src/main/resources/schema.sql b/MyINPulse-back/src/main/resources/schema.sql index 4916414..9ad3241 100644 --- a/MyINPulse-back/src/main/resources/schema.sql +++ b/MyINPulse-back/src/main/resources/schema.sql @@ -10,106 +10,120 @@ DROP TABLE IF EXISTS formes CASCADE; CREATE TABLE projets ( -id_projet SERIAL NOT NULL, -nom_projet VARCHAR(255) , -logo BYTEA , -date_creation DATE , -status_projet VARCHAR(255) , -CONSTRAINT pk_projet PRIMARY KEY (id_projet) ); + id_projet SERIAL NOT NULL, + nom_projet VARCHAR(255), + logo BYTEA, + date_creation DATE, + status_projet VARCHAR(255), + CONSTRAINT pk_projet PRIMARY KEY (id_projet) +); CREATE TABLE utilisateurs ( -id_utilisateur SERIAL NOT NULL, -nom_utilisateur VARCHAR(255) , -prenom_utilisateur VARCHAR(255) , -mail_principal VARCHAR(255) , -mail_secondaire VARCHAR(255) , -numero_telephone VARCHAR(15) , -CONSTRAINT pk_utilisateur PRIMARY KEY (id_utilisateur) ); + id_utilisateur SERIAL NOT NULL, + nom_utilisateur VARCHAR(255), + prenom_utilisateur VARCHAR(255), + mail_principal VARCHAR(255), + mail_secondaire VARCHAR(255), + numero_telephone VARCHAR(15), + CONSTRAINT pk_utilisateur PRIMARY KEY (id_utilisateur) +); CREATE TABLE entrepreneurs ( -id_entrepreneur SERIAL REFERENCES utilisateurs (id_utilisateur), -ecole VARCHAR(255) , -filiere VARCHAR(255) , -status_snee BOOLEAN , -CONSTRAINT pk_entrepreneur PRIMARY KEY (id_entrepreneur) ); + id_entrepreneur SERIAL REFERENCES utilisateurs (id_utilisateur), + ecole VARCHAR(255), + filiere VARCHAR(255), + status_snee BOOLEAN, + CONSTRAINT pk_entrepreneur PRIMARY KEY (id_entrepreneur) +); CREATE TABLE administrateurs -( -id_administrateur SERIAL REFERENCES utilisateurs (id_utilisateur), -CONSTRAINT pk_administrateur PRIMARY KEY (id_administrateur) ); +( + id_administrateur SERIAL REFERENCES utilisateurs (id_utilisateur), + CONSTRAINT pk_administrateur PRIMARY KEY (id_administrateur) +); CREATE TABLE sections ( -id_section SERIAL NOT NULL, -titre VARCHAR(255) , -contenu_section TEXT , -date_modification TIMESTAMP , -CONSTRAINT pk_section PRIMARY KEY (id_section) ); + id_section SERIAL NOT NULL, + titre VARCHAR(255), + contenu_section TEXT, + date_modification TIMESTAMP, + CONSTRAINT pk_section PRIMARY KEY (id_section) +); CREATE TABLE rendez_vous ( -id_rdv SERIAL NOT NULL, -date_rdv DATE , -heure_rdv TIME , -duree_rdv TIME , -lieu_rdv VARCHAR(255) , -sujet_rdv TEXT , -CONSTRAINT pk_rdv PRIMARY KEY (id_rdv) ); + id_rdv SERIAL NOT NULL, + date_rdv DATE, + heure_rdv TIME, + duree_rdv TIME, + lieu_rdv VARCHAR(255), + sujet_rdv TEXT, + CONSTRAINT pk_rdv PRIMARY KEY (id_rdv) +); -CREATE TABLE comptes_rendus +CREATE TABLE comptes_rendus ( -id_compte_rendu SERIAL NOT NULL, -contenu_compte_rendu TEXT , -CONSTRAINT pk_compte_rendu PRIMARY KEY (id_compte_rendu) ); + id_compte_rendu SERIAL NOT NULL, + contenu_compte_rendu TEXT, + CONSTRAINT pk_compte_rendu PRIMARY KEY (id_compte_rendu) +); CREATE TABLE concerner ( -id_section SERIAL REFERENCES sections (id_section), -id_rdv SERIAL REFERENCES sections (id_rdv), -CONSTRAINT pk_concerner PRIMARY KEY (id_section, id_rdv) ); + id_section SERIAL REFERENCES sections (id_section), + id_rdv SERIAL REFERENCES sections (id_rdv), + CONSTRAINT pk_concerner PRIMARY KEY (id_section, id_rdv) +); ALTER TABLE projets - ADD CONSTRAINT fk1_projet FOREIGN KEY (id_administrateur) - REFERENCES administrateurs (id_administrateur) - ON DELETE CASCADE; + ADD CONSTRAINT fk1_projet FOREIGN KEY (id_administrateur) + REFERENCES administrateurs (id_administrateur) + ON DELETE CASCADE; ALTER TABLE projets ADD CONSTRAINT fk2_projet FOREIGN KEY (id_entrepreneur_participation) REFERENCES entrepreneurs (id_entrepreneur) ON DELETE CASCADE; -ALTER TABLE entrepreneurs - ADD CONSTRAINT fk1_entrepreneur FOREIGN KEY (id_projet_propose) - REFERENCES projets (id_projet) - ON DELETE CASCADE; +ALTER TABLE entrepreneurs + ADD CONSTRAINT fk1_entrepreneur FOREIGN KEY (id_projet_propose) + REFERENCES projets (id_projet) + ON DELETE CASCADE; -ALTER TABLE sections - ADD CONSTRAINT fk1_section FOREIGN KEY (id_projet) - REFERENCES projets (id_projet) - ON DELETE CASCADE; +ALTER TABLE sections + ADD CONSTRAINT fk1_section FOREIGN KEY (id_projet) + REFERENCES projets (id_projet) + ON DELETE CASCADE; -ALTER TABLE sections - ADD CONSTRAINT fk2_section FOREIGN KEY (id_administrateur) - REFERENCES administrateurs (id_administrateur) - ON DELETE CASCADE; +ALTER TABLE sections + ADD CONSTRAINT fk2_section FOREIGN KEY (id_administrateur) + REFERENCES administrateurs (id_administrateur) + ON DELETE CASCADE; -ALTER TABLE rendez-vous - ADD CONSTRAINT fk1_rdv FOREIGN KEY (id_entrepreneur) - REFERENCES entrepreneurs (id_entrepreneur) - ON DELETE CASCADE; +ALTER TABLE rendez-vous + ADD CONSTRAINT fk1_rdv FOREIGN KEY (id_entrepreneur) + REFERENCES entrepreneurs (id_entrepreneur) + ON +DELETE +CASCADE; -ALTER TABLE rendez-vous - ADD CONSTRAINT fk2_rdv FOREIGN KEY (id_administrateur) - REFERENCES administrateurs (id_administrateur) - ON DELETE CASCADE; +ALTER TABLE rendez-vous + ADD CONSTRAINT fk2_rdv FOREIGN KEY (id_administrateur) + REFERENCES administrateurs (id_administrateur) + ON +DELETE +CASCADE; -ALTER TABLE comptes-rendus - ADD CONSTRAINT fk1_compte_rendu FOREIGN KEY (id_rdv) - REFERENCES rendez_vous (id_rdv) - ON DELETE CASCADE; +ALTER TABLE comptes-rendus + ADD CONSTRAINT fk1_compte_rendu FOREIGN KEY (id_rdv) + REFERENCES rendez_vous (id_rdv) + ON +DELETE +CASCADE;