From 40afde89b715c1313955f1487263ce71ddf69804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Le=20Lez?= Date: Wed, 19 Feb 2025 18:41:37 +0100 Subject: [PATCH] Fix: renamed all the tables, with repo and controller associated to them (might have missed some), and fix some key dependency issues --- .../myinpulse/controller/AdminApi.java | 10 +- .../myinpulse/controller/EntrepreneurApi.java | 4 +- .../myinpulse/controller/SharedApi.java | 18 +-- .../myinpulse/model/Administrateurs.java | 43 ------- .../myinpulse/model/Administrator.java | 43 +++++++ .../enseirb/myinpulse/model/Annotation.java | 39 ++++++ .../enseirb/myinpulse/model/Appointment.java | 112 +++++++++++++++++- .../myinpulse/model/ComptesRendus.java | 46 ------- .../myinpulse/model/DelAppointment.java | 8 ++ .../enseirb/myinpulse/model/DelProject.java | 7 ++ .../enseirb/myinpulse/model/DelReport.java | 6 + .../enseirb/myinpulse/model/Entrepreneur.java | 78 ++++++++++++ .../myinpulse/model/Entrepreneurs.java | 80 ------------- .../myinpulse/model/MakeAppointment.java | 28 +++++ .../java/enseirb/myinpulse/model/Project.java | 95 ++++++++++++++- .../java/enseirb/myinpulse/model/Projets.java | 98 --------------- .../enseirb/myinpulse/model/RendezVous.java | 111 ----------------- .../java/enseirb/myinpulse/model/Report.java | 36 +++++- .../enseirb/myinpulse/model/SectionCell.java | 85 +++++++++++++ .../enseirb/myinpulse/model/Sections.java | 81 ------------- .../java/enseirb/myinpulse/model/User.java | 95 +++++++++++++++ .../enseirb/myinpulse/model/Utilisateurs.java | 95 --------------- .../repository/AdministrateursRepository.java | 14 --- .../repository/AdministratorRepository.java | 14 +++ ...sitory.java => AppointmentRepository.java} | 4 +- .../repository/EntrepreneurRepository.java | 14 +++ .../repository/EntrepreneursRepository.java | 14 --- ...Repository.java => ProjectRepository.java} | 4 +- ...sRepository.java => ReportRepository.java} | 4 +- ...sitory.java => SectionCellRepository.java} | 4 +- .../myinpulse/repository/UserRepository.java | 14 +++ .../repository/UtilisateursRepository.java | 14 --- .../myinpulse/service/AdminApiService.java | 11 +- .../service/EntrepreneurApiService.java | 5 +- .../myinpulse/service/SharedApiService.java | 10 +- .../service/database/CompteRenduService.java | 34 ------ .../service/database/ReportService.java | 34 ++++++ .../AdministrateursController.java | 38 ------ .../AdministratorController.java | 38 ++++++ .../AppointmentController.java | 69 +++++++++++ .../ComptesRendusController.java | 43 ------- .../EntrepreneurController.java | 58 +++++++++ .../EntrepreneursController.java | 58 --------- .../ProjectController.java | 64 ++++++++++ .../ProjetsController.java | 64 ---------- .../RendezVousController.java | 69 ----------- .../ReportController.java | 43 +++++++ .../SectionCellController.java | 62 ++++++++++ .../SectionsController.java | 60 ---------- .../UserController.java | 67 +++++++++++ .../UtilisateursController.java | 67 ----------- MyINPulse-back/src/main/resources/data.sql | 8 +- MyINPulse-back/src/main/resources/delete.sql | 2 +- MyINPulse-back/src/main/resources/schema.sql | 40 +++---- 54 files changed, 1161 insertions(+), 1101 deletions(-) delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrateurs.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrator.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/Annotation.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/ComptesRendus.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelAppointment.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelProject.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelReport.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneur.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneurs.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/MakeAppointment.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/Projets.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/RendezVous.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/SectionCell.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/Sections.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/model/Utilisateurs.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/repository/AdministrateursRepository.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/repository/AdministratorRepository.java rename MyINPulse-back/src/main/java/enseirb/myinpulse/repository/{RendezVousRepository.java => AppointmentRepository.java} (61%) create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/repository/EntrepreneurRepository.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/repository/EntrepreneursRepository.java rename MyINPulse-back/src/main/java/enseirb/myinpulse/repository/{ProjetsRepository.java => ProjectRepository.java} (67%) rename MyINPulse-back/src/main/java/enseirb/myinpulse/repository/{SectionsRepository.java => ReportRepository.java} (63%) rename MyINPulse-back/src/main/java/enseirb/myinpulse/repository/{ComptesRendusRepository.java => SectionCellRepository.java} (60%) create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/repository/UserRepository.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/repository/UtilisateursRepository.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/CompteRenduService.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/ReportService.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministrateursController.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministratorController.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AppointmentController.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ComptesRendusController.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/EntrepreneurController.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/EntrepreneursController.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ProjectController.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ProjetsController.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/RendezVousController.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ReportController.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/SectionCellController.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/SectionsController.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UserController.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UtilisateursController.java diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/AdminApi.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/AdminApi.java index 1a2a12a..466865e 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/AdminApi.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/AdminApi.java @@ -24,7 +24,7 @@ public class AdminApi { * @return a list of all project managed by the current admin user */ @GetMapping("/admin/projects") - public Iterable getProjects() { + public Iterable getProjects() { return adminApiService.getProjects(); } @@ -34,7 +34,7 @@ public class AdminApi { * @return a list of upcoming appointments for the current user */ @GetMapping("/admin/appointments/upcoming") - public Iterable getUpcomingAppointments() { + public Iterable getUpcomingAppointments() { return adminApiService.getUpcomingAppointments(); } @@ -44,7 +44,7 @@ public class AdminApi { * @return a list of current unvalidated projects, waiting to be accepted */ @GetMapping("/admin/projects/pending") - public Iterable getPendingProjects() { + public Iterable getPendingProjects() { return adminApiService.getPendingProjects(); } @@ -64,7 +64,7 @@ public class AdminApi { * @return the status code of the request */ @PostMapping("/admin/project/add") - public void addNewProject(@RequestBody Project project) { + public void addNewProject(@RequestBody DelProject project) { adminApiService.addNewProject(project); } @@ -77,7 +77,7 @@ public class AdminApi { */ @PostMapping("/admin/appoitements/report/{appointmentId}") public void createAppointmentReport( - @PathVariable String appointmentId, @RequestBody Report report) { + @PathVariable String appointmentId, @RequestBody DelReport report) { adminApiService.createAppointmentReport(appointmentId, report); } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/EntrepreneurApi.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/EntrepreneurApi.java index 0071c61..96966a8 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/EntrepreneurApi.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/EntrepreneurApi.java @@ -1,7 +1,7 @@ package enseirb.myinpulse.controller; import enseirb.myinpulse.model.LCSection; -import enseirb.myinpulse.model.Project; +import enseirb.myinpulse.model.DelProject; import enseirb.myinpulse.service.EntrepreneurApiService; import org.springframework.beans.factory.annotation.Autowired; @@ -63,7 +63,7 @@ public class EntrepreneurApi { * @return status code */ @PostMapping("/entrepreneur/project/request") - public void requestNewProject(@RequestBody Project project) { + public void requestNewProject(@RequestBody DelProject project) { entrepreneurApiService.requestNewProject(project); } } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/SharedApi.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/SharedApi.java index 038a083..b509cb3 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/SharedApi.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/SharedApi.java @@ -1,9 +1,9 @@ package enseirb.myinpulse.controller; -import enseirb.myinpulse.model.Administrateurs; -import enseirb.myinpulse.model.Appointment; -import enseirb.myinpulse.model.Entrepreneurs; -import enseirb.myinpulse.model.Sections; +import enseirb.myinpulse.model.Administrator; +import enseirb.myinpulse.model.DelAppointment; +import enseirb.myinpulse.model.Entrepreneur; +import enseirb.myinpulse.model.SectionCell; import enseirb.myinpulse.service.SharedApiService; import org.springframework.beans.factory.annotation.Autowired; @@ -31,7 +31,7 @@ public class SharedApi { * @return a list of lean canvas sections */ @GetMapping("/shared/project/lcsection/{projectId}/{title}/{date}") - public Iterable getLCSection( + public Iterable getLCSection( @PathVariable("projectId") String projectId, @PathVariable("title") String title, @PathVariable("date") String date) { @@ -44,7 +44,7 @@ public class SharedApi { * @return a list of all entrepreneurs in a project */ @GetMapping("/shared/entrepreneurs/{projectId}") - public Iterable getEntrepreneursByProjectId(@PathVariable int projectId) { + public Iterable getEntrepreneursByProjectId(@PathVariable int projectId) { return sharedApiService.getEntrepreneursByProjectId(projectId); } @@ -57,7 +57,7 @@ public class SharedApi { * @return a list of all project managed by the current admin user */ @GetMapping("/shared/projects/admin/{projectId}") - public Iterable getAdminByProjectId(@PathVariable int projectId) { + public Iterable getAdminByProjectId(@PathVariable int projectId) { return sharedApiService.getAdminByProjectId(projectId); } @@ -70,7 +70,7 @@ public class SharedApi { * @return a list of all appointments. */ @GetMapping("/shared/projects/appointments/{projectId}") - public Iterable getAppointmentsByProjectId(@PathVariable int projectId) { + public Iterable getAppointmentsByProjectId(@PathVariable int projectId) { return sharedApiService.getAppointmentsByProjectId(projectId); } @@ -90,7 +90,7 @@ public class SharedApi { * @return TODO */ @PostMapping("/shared/appointment/request") - public void createAppointmentRequest(@RequestBody Appointment appointment) { + public void createAppointmentRequest(@RequestBody DelAppointment appointment) { sharedApiService.createAppointmentRequest(appointment); } } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrateurs.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrateurs.java deleted file mode 100644 index 0ff00e1..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrateurs.java +++ /dev/null @@ -1,43 +0,0 @@ -package enseirb.myinpulse.model; - -import jakarta.persistence.*; -import jakarta.persistence.PrimaryKeyJoinColumn; -import jakarta.persistence.Table; - -import java.util.ArrayList; -import java.util.List; - -@Entity -@Table(name = "administrateurs") -@PrimaryKeyJoinColumn(name = "id_administrateur", referencedColumnName = "id_utilisateur") -public class Administrateurs extends Utilisateurs { - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "id_projet") - private Projets projetsAdministrateurs; - - @OneToMany(mappedBy = "administrateursSections", fetch = FetchType.LAZY, orphanRemoval = true) - private List ListSections = new ArrayList<>(); - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "id_rdv") - private RendezVous rendezVousAdministrateurs; - - public Administrateurs() {} - - public Administrateurs( - String nom_utilisateur, - Long id_utilisateur, - String prenom_utilisateur, - String mail_principal, - String mail_secondaire, - String numero_telephone) { - super( - nom_utilisateur, - id_utilisateur, - prenom_utilisateur, - mail_principal, - mail_secondaire, - numero_telephone); - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrator.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrator.java new file mode 100644 index 0000000..d90e3aa --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrator.java @@ -0,0 +1,43 @@ +package enseirb.myinpulse.model; + +import jakarta.persistence.*; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "administrator") +@PrimaryKeyJoinColumn(name = "idAdministrator", referencedColumnName = "idUser") +public class Administrator extends User { + + @OneToMany(mappedBy = "projectAdministrator", fetch = FetchType.LAZY, orphanRemoval = true) + private List listProject = new ArrayList<>(); + + /*@OneToMany(mappedBy = "administratorSectionCell", fetch = FetchType.LAZY, orphanRemoval = true) + private List listSectionCell = new ArrayList<>();*/ + // should now be useless + + @OneToMany(mappedBy = "administratorAnnotation", fetch = FetchType.LAZY, orphanRemoval = true) + private List listAnnotation = new ArrayList<>(); + + /*@OneToMany(mappedBy = "administratorAppointment", fetch = FetchType.LAZY, orphanRemoval = true) + private final List listAppointment = new ArrayList<>();*/ + // should now be useless + + @OneToOne(mappedBy = "administratorAppointment", fetch = FetchType.LAZY, orphanRemoval = true) + private MakeAppointment makeAppointment; + + public Administrator() {} + + public Administrator( + Long idUser, + String userSurname, + String username, + String mainMail, + String secondaryMail, + String phoneNumber) { + super(idUser, userSurname, username, mainMail, secondaryMail, phoneNumber); + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Annotation.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Annotation.java new file mode 100644 index 0000000..e7e9b3e --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Annotation.java @@ -0,0 +1,39 @@ +package enseirb.myinpulse.model; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; + +@Entity +@Table(name = "annotation") +public class Annotation { + + @Id + @NotNull + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long idAnnotation; + + private String comment; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "idSectionCell") + private SectionCell sectionCellAnnotation; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "idAdministrator") + private Administrator administratorAnnotation; + + public Annotation() {} + + public Annotation(Long idAnnotation, String commentary) { + this.idAnnotation = idAnnotation; + this.comment = comment; + } + + public String getComment() { + return comment; + } + + public void setCommentary(String comment) { + this.comment = comment; + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Appointment.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Appointment.java index 53727c1..91cf332 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Appointment.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Appointment.java @@ -1,8 +1,112 @@ package enseirb.myinpulse.model; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; + +import java.time.LocalDate; +import java.time.LocalTime; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "appointment") public class Appointment { - int validated; - int[] akserId; - int[] destId; - String date; // TODO: date type ? + + /*@OneToMany(mappedBy = "appointmentEntrepreneurs", fetch = FetchType.LAZY, orphanRemoval = true) + private final List listEntrepreneur = + new ArrayList<>(); */ + // should now be useless + + @OneToMany(mappedBy = "appointmentReport", fetch = FetchType.LAZY, orphanRemoval = true) + private final List listReport = new ArrayList<>(); + + @ManyToMany( + fetch = FetchType.LAZY, + cascade = {CascadeType.ALL}) + @JoinTable( + name = "concern", + joinColumns = @JoinColumn(name = "idAppointment"), + inverseJoinColumns = @JoinColumn(name = "idSectionCell")) + List listSectionCell = new ArrayList<>(); + + @Id + @NotNull + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long idAppointment; + + private LocalDate appointmentDate; + + private LocalTime appointmentTime; + + private LocalTime appointmentDuration; + + @Column(length = 255) + private String appointmentPlace; + + private String appointmentSubject; + + public Appointment() {} + + public Appointment( + Long idAppointment, + LocalDate appointmentDate, + LocalTime appointmentTime, + LocalTime appointmentDuration, + String appointmentPlace, + String appointmentSubject) { + this.idAppointment = idAppointment; + this.appointmentDate = appointmentDate; + this.appointmentTime = appointmentTime; + this.appointmentDuration = appointmentDuration; + this.appointmentPlace = appointmentPlace; + this.appointmentSubject = appointmentSubject; + } + + public Long getIdAppointment() { + return idAppointment; + } + + public void setIdAppointment(Long idAppointment) { + this.idAppointment = idAppointment; + } + + public LocalDate getAppointmentDate() { + return appointmentDate; + } + + public void setAppointmentDate(LocalDate appointmentDate) { + this.appointmentDate = appointmentDate; + } + + public LocalTime getAppointmentTime() { + return appointmentTime; + } + + public void setAppointmentTime(LocalTime appointmentTime) { + this.appointmentTime = appointmentTime; + } + + public LocalTime getAppointmentDuration() { + return appointmentDuration; + } + + public void setAppointmentDuration(LocalTime appointmentDuration) { + this.appointmentDuration = appointmentDuration; + } + + public String getAppointmentPlace() { + return appointmentPlace; + } + + public void setAppointmentPlace(String appointmentPlace) { + this.appointmentPlace = appointmentPlace; + } + + public String getAppointmentSubject() { + return appointmentSubject; + } + + public void setAppointmentSubject(String appointmentSubject) { + this.appointmentSubject = appointmentSubject; + } } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/ComptesRendus.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/ComptesRendus.java deleted file mode 100644 index 617b31a..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/ComptesRendus.java +++ /dev/null @@ -1,46 +0,0 @@ -package enseirb.myinpulse.model; - -import jakarta.persistence.*; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.validation.constraints.NotNull; - -@Entity -@Table(name = "comptes_rendus") -public class ComptesRendus { - - @Id - @NotNull - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id_compte_rendu; - - private String contenu_compte_rendu; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "id_rdv") - private RendezVous rendezVousComptesRendus; - - public ComptesRendus() {} - - public ComptesRendus(Long id_compte_rendu, String contenu_compte_rendu) { - this.id_compte_rendu = id_compte_rendu; - this.contenu_compte_rendu = contenu_compte_rendu; - } - - public Long getId_compte_rendu() { - return id_compte_rendu; - } - - public void setId_compte_rendu(Long id_compte_rendu) { - this.id_compte_rendu = id_compte_rendu; - } - - public String getContenu_compte_rendu() { - return contenu_compte_rendu; - } - - public void setContenu_compte_rendu(String contenu_compte_rendu) { - this.contenu_compte_rendu = contenu_compte_rendu; - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelAppointment.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelAppointment.java new file mode 100644 index 0000000..f29a2eb --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelAppointment.java @@ -0,0 +1,8 @@ +package enseirb.myinpulse.model; + +public class DelAppointment { + int validated; + int[] akserId; + int[] destId; + String date; // TODO: date type ? +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelProject.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelProject.java new file mode 100644 index 0000000..25a21f9 --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelProject.java @@ -0,0 +1,7 @@ +package enseirb.myinpulse.model; + +public class DelProject { + int projectId; + String projectName; + String projectDescription; +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelReport.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelReport.java new file mode 100644 index 0000000..bbdbae8 --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/DelReport.java @@ -0,0 +1,6 @@ +package enseirb.myinpulse.model; + +public class DelReport { + int projectId; + String reportContent; +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneur.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneur.java new file mode 100644 index 0000000..3773cea --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneur.java @@ -0,0 +1,78 @@ +package enseirb.myinpulse.model; + +import jakarta.persistence.*; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "entrepreneur") +@PrimaryKeyJoinColumn(name = "idEntrepreneur", referencedColumnName = "idUser") +public class Entrepreneur extends User { + + @Column(length = 255) + private String school; + + @Column(length = 255) + private String course; + + private boolean sneeStatus; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "idProjectParticipation", referencedColumnName = "idProject") + private Project projectParticipation; + + // @Column(insertable=false, updatable=false) + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "idProjectProposed", referencedColumnName = "idProject") + private Project projectProposed; + + /*@ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "idAppointment") + private Appointment appointmentEntrepreneur;*/ + // should now be useless + + @OneToOne(mappedBy = "entrepreneurAppointment", fetch = FetchType.LAZY, orphanRemoval = true) + private MakeAppointment makeAppointment; + + public Entrepreneur() {} + + public Entrepreneur( + Long idUser, + String userSurname, + String username, + String mainMail, + String secondaryMail, + String phoneNumber, + String school, + String course, + boolean sneeStatus) { + super(idUser, userSurname, username, mainMail, secondaryMail, phoneNumber); + this.school = school; + this.course = course; + this.sneeStatus = sneeStatus; + } + + public String getSchool() { + return school; + } + + public void setSchool(String school) { + this.school = school; + } + + public String getCourse() { + return course; + } + + public void setCourse(String course) { + this.course = course; + } + + public boolean isSneeStatus() { + return sneeStatus; + } + + public void setSneeStatus(boolean statusSnee) { + this.sneeStatus = sneeStatus; + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneurs.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneurs.java deleted file mode 100644 index ef605ea..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneurs.java +++ /dev/null @@ -1,80 +0,0 @@ -package enseirb.myinpulse.model; - -import jakarta.persistence.*; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; - -@Entity -@Table(name = "entrepreneurs") -@PrimaryKeyJoinColumn(name = "id_entrepreneur", referencedColumnName = "id_utilisateur") -public class Entrepreneurs extends Utilisateurs { - - @Column(length = 255) - private String ecole; - - @Column(length = 255) - private String filiere; - - private boolean status_snee; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "id_projet_participation", referencedColumnName = "id_projet") - private Projets projetsParticipation; - - // @Column(insertable=false, updatable=false) - @OneToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "id_projet_propose", referencedColumnName = "id_projet") - private Projets projetsPropose; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "id_rdv") - private RendezVous rendezVousEntrepreneurs; - - public Entrepreneurs() {} - - public Entrepreneurs( - String nom_utilisateur, - Long id_utilisateur, - String prenom_utilisateur, - String mail_principal, - String mail_secondaire, - String numero_telephone, - String ecole, - boolean status_snee, - String filiere) { - super( - nom_utilisateur, - id_utilisateur, - prenom_utilisateur, - mail_principal, - mail_secondaire, - numero_telephone); - this.ecole = ecole; - this.status_snee = status_snee; - this.filiere = filiere; - } - - public String getEcole() { - return ecole; - } - - public void setEcole(String ecole) { - this.ecole = ecole; - } - - public String getFiliere() { - return filiere; - } - - public void setFiliere(String filiere) { - this.filiere = filiere; - } - - public boolean isStatus_snee() { - return status_snee; - } - - public void setStatus_snee(boolean status_snee) { - this.status_snee = status_snee; - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/MakeAppointment.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/MakeAppointment.java new file mode 100644 index 0000000..2e08724 --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/MakeAppointment.java @@ -0,0 +1,28 @@ +package enseirb.myinpulse.model; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; + +@Entity +@Table(name = "make_apppointment") +public class MakeAppointment { + + @Id + @NotNull + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long idMakeAppointment; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "idAdministrator") + private Administrator administratorAppointment; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "idEntrepreneur") + private Entrepreneur entrepreneurAppointment; + + public MakeAppointment() {} + + public MakeAppointment(Long idMakeAppointment) { + this.idMakeAppointment = idMakeAppointment; + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java index 99c562a..824de16 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java @@ -1,7 +1,96 @@ package enseirb.myinpulse.model; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "project") public class Project { - int projectId; - String projectName; - String projectDescription; + + @Id + @NotNull + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long idProject; + + @Column(length = 255) + private String projectName; + + private byte[] logo; + + private LocalDate creationDate; + + @Column(length = 255) + private String projectStatus; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "idAdministrator") + private Administrator projectAdministrator; + + @OneToMany(mappedBy = "projectParticipation", fetch = FetchType.LAZY, orphanRemoval = true) + private List listEntrepreneurParticipation = new ArrayList<>(); + + @OneToOne(mappedBy = "projectProposed", fetch = FetchType.LAZY, orphanRemoval = true) + private Entrepreneur entrepreneurProposed; + + @OneToMany(mappedBy = "projectSectionCell", fetch = FetchType.LAZY, orphanRemoval = true) + private List listSectionCell = new ArrayList<>(); + + public Project() {} + + public Project( + Long idProject, + String projectName, + byte[] logo, + LocalDate creationDate, + String projectStatus) { + this.idProject = idProject; + this.projectName = projectName; + this.logo = logo; + this.creationDate = creationDate; + this.projectStatus = projectStatus; + } + + public Long getIdProject() { + return idProject; + } + + public void setIdProject(Long idProject) { + this.idProject = idProject; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public byte[] getLogo() { + return logo; + } + + public void setLogo(byte[] logo) { + this.logo = logo; + } + + public LocalDate getCreationDate() { + return creationDate; + } + + public void setCreationDate(LocalDate creationDate) { + this.creationDate = creationDate; + } + + public String getProjectStatus() { + return projectStatus; + } + + public void setProjectStatus(String projectStatus) { + this.projectStatus = projectStatus; + } } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Projets.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Projets.java deleted file mode 100644 index 2cc6a81..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Projets.java +++ /dev/null @@ -1,98 +0,0 @@ -package enseirb.myinpulse.model; - -import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; - -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Table(name = "projets") -public class Projets { - - @Id - @NotNull - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id_projet; - - @Column(length = 255) - private String nom_projet; - - private byte[] logo; - - private LocalDate date_creation; - - @Column(length = 255) - private String status_projet; - - @OneToMany(mappedBy = "projetsAdministrateurs", fetch = FetchType.LAZY, orphanRemoval = true) - private List listAdministrateurs = new ArrayList<>(); - - @OneToMany(mappedBy = "projetsParticipation", fetch = FetchType.LAZY, orphanRemoval = true) - private List ListEntrepreneursParticipation = new ArrayList<>(); - - @OneToOne(mappedBy = "projetsPropose", fetch = FetchType.LAZY, orphanRemoval = true) - private Entrepreneurs entrepreneursPropose; - - @OneToMany(mappedBy = "projetsSections", fetch = FetchType.LAZY, orphanRemoval = true) - private List ListSections = new ArrayList<>(); - - // Hibernate expects entities to have a no-arg constructor, - // though it does not necessarily have to be public. - - public Projets() {} - - public Projets( - Long id_projet, - String nom_projet, - byte[] logo, - LocalDate date_creation, - String status_projet) { - this.id_projet = id_projet; - this.nom_projet = nom_projet; - this.logo = logo; - this.date_creation = date_creation; - this.status_projet = status_projet; - } - - public Long getId_projet() { - return id_projet; - } - - public void setId_projet(Long id_projet) { - this.id_projet = id_projet; - } - - public String getNom_projet() { - return nom_projet; - } - - public void setNom_projet(String nom_projet) { - this.nom_projet = nom_projet; - } - - public byte[] getLogo() { - return logo; - } - - public void setLogo(byte[] logo) { - this.logo = logo; - } - - public LocalDate getDate_creation() { - return date_creation; - } - - public void setDate_creation(LocalDate date_creation) { - this.date_creation = date_creation; - } - - public String getStatus_projet() { - return status_projet; - } - - public void setStatus_projet(String status_projet) { - this.status_projet = status_projet; - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/RendezVous.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/RendezVous.java deleted file mode 100644 index ac25b96..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/RendezVous.java +++ /dev/null @@ -1,111 +0,0 @@ -package enseirb.myinpulse.model; - -import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; - -import java.time.LocalDate; -import java.time.LocalTime; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Table(name = "rendez_vous") -public class RendezVous { - - @OneToMany(mappedBy = "rendezVousEntrepreneurs", fetch = FetchType.LAZY, orphanRemoval = true) - private final List ListEntrepreneurs = new ArrayList<>(); - - @OneToMany(mappedBy = "rendezVousAdministrateurs", fetch = FetchType.LAZY, orphanRemoval = true) - private final List ListAdministrateurs = new ArrayList<>(); - - @OneToMany(mappedBy = "rendezVousComptesRendus", fetch = FetchType.LAZY, orphanRemoval = true) - private final List ListComptesRendus = new ArrayList<>(); - - @ManyToMany( - fetch = FetchType.LAZY, - cascade = {CascadeType.ALL}) - @JoinTable( - name = "concerner", - 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 LocalTime heure_rdv; - private LocalTime duree_rdv; - - @Column(length = 255) - private String lieu_rdv; - - private String sujet_rdv; - - public RendezVous() {} - - public RendezVous( - Long id_rdv, - LocalDate date_rdv, - LocalTime heure_rdv, - LocalTime duree_rdv, - String lieu_rdv, - String sujet_rdv) { - this.id_rdv = id_rdv; - this.date_rdv = date_rdv; - this.heure_rdv = heure_rdv; - this.duree_rdv = duree_rdv; - this.lieu_rdv = lieu_rdv; - this.sujet_rdv = sujet_rdv; - } - - public Long getId_rdv() { - return id_rdv; - } - - public void setId_rdv(Long id_rdv) { - this.id_rdv = id_rdv; - } - - public LocalDate getDate_rdv() { - return date_rdv; - } - - public void setDate_rdv(LocalDate date_rdv) { - this.date_rdv = date_rdv; - } - - public LocalTime getHeure_rdv() { - return heure_rdv; - } - - public void setHeure_rdv(LocalTime heure_rdv) { - this.heure_rdv = heure_rdv; - } - - public LocalTime getDuree_rdv() { - return duree_rdv; - } - - public void setDuree_rdv(LocalTime duree_rdv) { - this.duree_rdv = duree_rdv; - } - - public String getLieu_rdv() { - return lieu_rdv; - } - - public void setLieu_rdv(String lieu_rdv) { - this.lieu_rdv = lieu_rdv; - } - - public String getSujet_rdv() { - return sujet_rdv; - } - - public void setSujet_rdv(String sujet_rdv) { - this.sujet_rdv = sujet_rdv; - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Report.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Report.java index 7270115..410cd7c 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Report.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Report.java @@ -1,6 +1,38 @@ package enseirb.myinpulse.model; +import jakarta.persistence.*; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; + +@Entity +@Table(name = "report") public class Report { - int projectId; - String reportContent; + + @Id + @NotNull + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long idReport; + + private String reportContent; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "idAppointment") + private Appointment appointmentReport; + + public Report() {} + + public Report(Long idReport, String reportContent) { + this.idReport = idReport; + this.reportContent = reportContent; + } + + public String getReportContent() { + return reportContent; + } + + public void setReportContent(String reportContent) { + this.reportContent = reportContent; + } } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/SectionCell.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/SectionCell.java new file mode 100644 index 0000000..aec0a0e --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/SectionCell.java @@ -0,0 +1,85 @@ +package enseirb.myinpulse.model; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "section_cell") +public class SectionCell { + + @Id + @NotNull + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long idSectionCell; + + @Column(length = 255) + private String title; + + private String contentSectionCell; + + private LocalDateTime modificationDate; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "idProject") + private Project projectSectionCell; + + /*@ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "idAdministrator") + private Administrator administratorSectionCell;*/ + // should now be useless + + @ManyToMany(mappedBy = "listSectionCell") + private List appointment = new ArrayList<>(); + + @OneToMany(mappedBy = "sectionCellAnnotation", fetch = FetchType.LAZY, orphanRemoval = true) + private List listAnnotation = new ArrayList<>(); + + public SectionCell() {} + + public SectionCell( + Long idSectionCell, + String title, + String contentSectionCell, + LocalDateTime modificationDate) { + this.idSectionCell = idSectionCell; + this.title = title; + this.contentSectionCell = contentSectionCell; + this.modificationDate = modificationDate; + } + + public Long getIdSectionCell() { + return idSectionCell; + } + + public void setIdSectionCell(Long idSectionCell) { + this.idSectionCell = idSectionCell; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContentSectionCell() { + return contentSectionCell; + } + + public void setContentSectionCell(String contentSectionCell) { + this.contentSectionCell = contentSectionCell; + } + + public LocalDateTime getModificationDate() { + return modificationDate; + } + + public void setModificationDate(LocalDateTime modificationDate) { + this.modificationDate = modificationDate; + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Sections.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Sections.java deleted file mode 100644 index 6aef759..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Sections.java +++ /dev/null @@ -1,81 +0,0 @@ -package enseirb.myinpulse.model; - -import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Table(name = "sections") -public class Sections { - - @Id - @NotNull - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id_section; - - @Column(length = 255) - private String titre; - - private String contenu_section; - - private LocalDateTime date_modification; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "id_projet") - private Projets projetsSections; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "id_admnistrateur") - private Administrateurs administrateursSections; - - @ManyToMany(mappedBy = "ListSections") - private List rendezVous = new ArrayList<>(); - - public Sections() {} - - public Sections( - Long id_section, - String titre, - String contenu_section, - LocalDateTime date_modification) { - this.id_section = id_section; - this.titre = titre; - this.contenu_section = contenu_section; - this.date_modification = date_modification; - } - - public String getTitre() { - return titre; - } - - public void setTitre(String titre) { - this.titre = titre; - } - - public Long getId_section() { - return id_section; - } - - public void setId_section(Long id_section) { - this.id_section = id_section; - } - - public String getContenu_section() { - return contenu_section; - } - - public void setContenu_section(String contenu_section) { - this.contenu_section = contenu_section; - } - - public LocalDateTime getDate_modification() { - return date_modification; - } - - public void setDate_modification(LocalDateTime date_modification) { - this.date_modification = date_modification; - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java new file mode 100644 index 0000000..4a1578b --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java @@ -0,0 +1,95 @@ +package enseirb.myinpulse.model; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; + +@Entity +@Table(name = "user") +@Inheritance(strategy = InheritanceType.JOINED) +public class User { + + @Id + @NotNull + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long idUser; + + @Column(length = 255) + private String UserSurname; + + @Column(length = 255) + private String UserName; + + @Column(length = 255) + private String mainMail; + + @Column(length = 255) + private String secondaryMail; + + @Column(length = 20) + private String phoneNumber; + + public User() {} + + public User( + Long idUser, + String userSurname, + String userName, + String mainMail, + String secondaryMail, + String phoneNumber) { + this.idUser = idUser; + this.UserSurname = userSurname; + this.UserName = userName; + this.mainMail = mainMail; + this.secondaryMail = secondaryMail; + this.phoneNumber = phoneNumber; + } + + public Long getIdUser() { + return idUser; + } + + public void setIdUser(Long idUser) { + this.idUser = idUser; + } + + public String getUserSurname() { + return UserSurname; + } + + public void setUserSurname(String userSurname) { + UserSurname = userSurname; + } + + public String getUserName() { + return UserName; + } + + public void setUserName(String userName) { + UserName = userName; + } + + public String getMainMail() { + return mainMail; + } + + public void setMainMail(String mainMail) { + this.mainMail = mainMail; + } + + public String getSecondaryMail() { + return secondaryMail; + } + + public void setSecondaryMail(String secondaryMail) { + this.secondaryMail = secondaryMail; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + phoneNumber = phoneNumber; + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Utilisateurs.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Utilisateurs.java deleted file mode 100644 index 11dd163..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Utilisateurs.java +++ /dev/null @@ -1,95 +0,0 @@ -package enseirb.myinpulse.model; - -import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; - -@Entity -@Table(name = "utilisateurs") -@Inheritance(strategy = InheritanceType.JOINED) -public class Utilisateurs { - - @Id - @NotNull - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id_utilisateur; - - @Column(length = 255) - private String nom_utilisateur; - - @Column(length = 255) - private String prenom_utilisateur; - - @Column(length = 255) - private String mail_principal; - - @Column(length = 255) - private String mail_secondaire; - - @Column(length = 20) - private String numero_telephone; - - public Utilisateurs() {} - - public Utilisateurs( - String nom_utilisateur, - Long id_utilisateur, - String prenom_utilisateur, - String mail_principal, - String mail_secondaire, - String numero_telephone) { - this.nom_utilisateur = nom_utilisateur; - this.id_utilisateur = id_utilisateur; - this.prenom_utilisateur = prenom_utilisateur; - this.mail_principal = mail_principal; - this.mail_secondaire = mail_secondaire; - this.numero_telephone = numero_telephone; - } - - public Long getId_utilisateur() { - return id_utilisateur; - } - - public void setId_utilisateur(Long id_utilisateur) { - this.id_utilisateur = id_utilisateur; - } - - public String getNom_utilisateur() { - return nom_utilisateur; - } - - public void setNom_utilisateur(String nom_utilisateur) { - this.nom_utilisateur = nom_utilisateur; - } - - public String getPrenom_utilisateur() { - return prenom_utilisateur; - } - - public void setPrenom_utilisateur(String prenom_utilisateur) { - this.prenom_utilisateur = prenom_utilisateur; - } - - public String getMail_principal() { - return mail_principal; - } - - public void setMail_principal(String mail_principal) { - this.mail_principal = mail_principal; - } - - public String getMail_secondaire() { - return mail_secondaire; - } - - public void setMail_secondaire(String mail_secondaire) { - this.mail_secondaire = mail_secondaire; - } - - public String getNumero_telephone() { - return numero_telephone; - } - - public void setNumero_telephone(String numero_telephone) { - this.numero_telephone = numero_telephone; - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/AdministrateursRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/AdministrateursRepository.java deleted file mode 100644 index 543778e..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/AdministrateursRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package enseirb.myinpulse.repository; - -import enseirb.myinpulse.model.Administrateurs; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.rest.core.annotation.RepositoryRestResource; - -@RepositoryRestResource -public interface AdministrateursRepository extends JpaRepository { - - /* @Query("SELECT a from Administrateurs a") - Administrateurs findAllAdministrateurs(); */ - -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/AdministratorRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/AdministratorRepository.java new file mode 100644 index 0000000..34431fd --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/AdministratorRepository.java @@ -0,0 +1,14 @@ +package enseirb.myinpulse.repository; + +import enseirb.myinpulse.model.Administrator; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.rest.core.annotation.RepositoryRestResource; + +@RepositoryRestResource +public interface AdministratorRepository extends JpaRepository { + + /* @Query("SELECT a from Administrators a") + Administrator findAllAdministrator(); */ + +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/RendezVousRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/AppointmentRepository.java similarity index 61% rename from MyINPulse-back/src/main/java/enseirb/myinpulse/repository/RendezVousRepository.java rename to MyINPulse-back/src/main/java/enseirb/myinpulse/repository/AppointmentRepository.java index 127c2cb..11b0c00 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/RendezVousRepository.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/AppointmentRepository.java @@ -1,9 +1,9 @@ package enseirb.myinpulse.repository; -import enseirb.myinpulse.model.RendezVous; +import enseirb.myinpulse.model.Appointment; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; @RepositoryRestResource -public interface RendezVousRepository extends JpaRepository {} +public interface AppointmentRepository extends JpaRepository {} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/EntrepreneurRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/EntrepreneurRepository.java new file mode 100644 index 0000000..eee1020 --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/EntrepreneurRepository.java @@ -0,0 +1,14 @@ +package enseirb.myinpulse.repository; + +import enseirb.myinpulse.model.Entrepreneur; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.rest.core.annotation.RepositoryRestResource; + +@RepositoryRestResource +public interface EntrepreneurRepository extends JpaRepository { + + /* @Query("SELECT e from Entrepreneur e") + Entrepreneur findAllEntrepreneurl(); */ + +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/EntrepreneursRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/EntrepreneursRepository.java deleted file mode 100644 index 6a957f6..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/EntrepreneursRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package enseirb.myinpulse.repository; - -import enseirb.myinpulse.model.Entrepreneurs; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.rest.core.annotation.RepositoryRestResource; - -@RepositoryRestResource -public interface EntrepreneursRepository extends JpaRepository { - - /* @Query("SELECT e from Entrepreneurs e") - Entrepreneurs findAllEntrepreneurs(); */ - -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ProjetsRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ProjectRepository.java similarity index 67% rename from MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ProjetsRepository.java rename to MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ProjectRepository.java index 9d045d6..0da05d7 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ProjetsRepository.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ProjectRepository.java @@ -1,9 +1,9 @@ package enseirb.myinpulse.repository; -import enseirb.myinpulse.model.Projets; +import enseirb.myinpulse.model.Project; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; @RepositoryRestResource -public interface ProjetsRepository extends JpaRepository {} +public interface ProjectRepository extends JpaRepository {} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/SectionsRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ReportRepository.java similarity index 63% rename from MyINPulse-back/src/main/java/enseirb/myinpulse/repository/SectionsRepository.java rename to MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ReportRepository.java index 2ccff00..e228003 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/SectionsRepository.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ReportRepository.java @@ -1,9 +1,9 @@ package enseirb.myinpulse.repository; -import enseirb.myinpulse.model.Sections; +import enseirb.myinpulse.model.Report; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; @RepositoryRestResource -public interface SectionsRepository extends JpaRepository {} +public interface ReportRepository extends JpaRepository {} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ComptesRendusRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/SectionCellRepository.java similarity index 60% rename from MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ComptesRendusRepository.java rename to MyINPulse-back/src/main/java/enseirb/myinpulse/repository/SectionCellRepository.java index 60e0017..66ce004 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ComptesRendusRepository.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/SectionCellRepository.java @@ -1,9 +1,9 @@ package enseirb.myinpulse.repository; -import enseirb.myinpulse.model.ComptesRendus; +import enseirb.myinpulse.model.SectionCell; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; @RepositoryRestResource -public interface ComptesRendusRepository extends JpaRepository {} +public interface SectionCellRepository extends JpaRepository {} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/UserRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/UserRepository.java new file mode 100644 index 0000000..7dd3089 --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/UserRepository.java @@ -0,0 +1,14 @@ +package enseirb.myinpulse.repository; + +import enseirb.myinpulse.model.User; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.rest.core.annotation.RepositoryRestResource; + +@RepositoryRestResource +public interface UserRepository extends JpaRepository { + + /* @Query("SELECT u from User u") + User findAllUser(); */ + +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/UtilisateursRepository.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/UtilisateursRepository.java deleted file mode 100644 index 16f04c7..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/repository/UtilisateursRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package enseirb.myinpulse.repository; - -import enseirb.myinpulse.model.Utilisateurs; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.rest.core.annotation.RepositoryRestResource; - -@RepositoryRestResource -public interface UtilisateursRepository extends JpaRepository { - - /* @Query("SELECT u from Utilisateurs u") - Utilisateurs findAllUtilisateurs(); */ - -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/AdminApiService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/AdminApiService.java index 273e9cb..70b4c5a 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/AdminApiService.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/AdminApiService.java @@ -4,23 +4,22 @@ import enseirb.myinpulse.model.*; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; @Service public class AdminApiService { // TODO - public Iterable getProjects() { + public Iterable getProjects() { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } // TODO - public Iterable getUpcomingAppointments() { + public Iterable getUpcomingAppointments() { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } // TODO - public Iterable getPendingProjects() { + public Iterable getPendingProjects() { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } @@ -30,12 +29,12 @@ public class AdminApiService { } // TODO - public void addNewProject(Project project) { + public void addNewProject(DelProject project) { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } // TODO - public void createAppointmentReport(String appointmentId, Report report) { + public void createAppointmentReport(String appointmentId, DelReport report) { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/EntrepreneurApiService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/EntrepreneurApiService.java index adb17e6..2641ff7 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/EntrepreneurApiService.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/EntrepreneurApiService.java @@ -1,11 +1,10 @@ package enseirb.myinpulse.service; import enseirb.myinpulse.model.LCSection; -import enseirb.myinpulse.model.Project; +import enseirb.myinpulse.model.DelProject; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; @Service @@ -23,7 +22,7 @@ public class EntrepreneurApiService { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } - public void requestNewProject(Project project) { + public void requestNewProject(DelProject project) { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/SharedApiService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/SharedApiService.java index f750a59..cf5de12 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/SharedApiService.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/SharedApiService.java @@ -9,20 +9,20 @@ import org.springframework.web.server.ResponseStatusException; @Service public class SharedApiService { - public Iterable getLCSection(String projectId, String title, String date) { + public Iterable getLCSection(String projectId, String title, String date) { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } - public Iterable getEntrepreneursByProjectId(int projectId) { + public Iterable getEntrepreneursByProjectId(int projectId) { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } - public Iterable getAdminByProjectId(int projectId) { + public Iterable getAdminByProjectId(int projectId) { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } - public Iterable getAppointmentsByProjectId(int projectId) { + public Iterable getAppointmentsByProjectId(int projectId) { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } @@ -30,7 +30,7 @@ public class SharedApiService { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } - public void createAppointmentRequest(Appointment appointment) { + public void createAppointmentRequest(DelAppointment appointment) { throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet"); } } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/CompteRenduService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/CompteRenduService.java deleted file mode 100644 index 7355099..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/CompteRenduService.java +++ /dev/null @@ -1,34 +0,0 @@ -package enseirb.myinpulse.service.database; - -import enseirb.myinpulse.model.ComptesRendus; -import enseirb.myinpulse.repository.ComptesRendusRepository; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Service; -import org.springframework.web.server.ResponseStatusException; - -import java.util.Optional; - -@Service -public class CompteRenduService { - private final ComptesRendusRepository comptesRendusRepository; - - @Autowired - CompteRenduService(ComptesRendusRepository comptesRendusRepository) { - this.comptesRendusRepository = comptesRendusRepository; - } - - ComptesRendus getComptesRendusById(int id) { - Optional compteRendu = comptesRendusRepository.findById(id); - if (compteRendu.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce compte rendu n'existe pas"); - } - return compteRendu.get(); - } - - // TODO: do some validation - void saveCompteRendu(ComptesRendus compteRendu) { - comptesRendusRepository.save(compteRendu); - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/ReportService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/ReportService.java new file mode 100644 index 0000000..e9d8d27 --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/ReportService.java @@ -0,0 +1,34 @@ +package enseirb.myinpulse.service.database; + +import enseirb.myinpulse.model.Report; +import enseirb.myinpulse.repository.ReportRepository; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; +import org.springframework.web.server.ResponseStatusException; + +import java.util.Optional; + +@Service +public class ReportService { + private final ReportRepository reportRepository; + + @Autowired + ReportService(ReportRepository reportRepository) { + this.reportRepository = reportRepository; + } + + Report getReportById(int id) { + Optional report = reportRepository.findById(id); + if (report.isEmpty()) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce compte rendu n'existe pas"); + } + return report.get(); + } + + // TODO: do some validation + void saveReport(Report report) { + reportRepository.save(report); + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministrateursController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministrateursController.java deleted file mode 100644 index 8a96924..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministrateursController.java +++ /dev/null @@ -1,38 +0,0 @@ -package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; - -import enseirb.myinpulse.model.Administrateurs; -import enseirb.myinpulse.repository.AdministrateursRepository; - -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 { - - @Autowired AdministrateursRepository administrateursRepository; - - @GetMapping("/Administrateurs") - @ResponseBody - public Iterable allAdministrateurs() { - return this.administrateursRepository.findAll(); - } - - @GetMapping("/Administrateurs/{id}") - public Administrateurs getAdministrateursById(@PathVariable Long id) { - Optional administrateur = this.administrateursRepository.findById(id); - if (administrateur.isEmpty()) { - throw new ResponseStatusException( - HttpStatus.NOT_FOUND, "Cet administrateur n'existe pas"); - } - return administrateur.get(); - } - - @PostMapping("/Administrateurs") - public Administrateurs addAdministrateurs(@RequestBody Administrateurs administrateurs) { - return this.administrateursRepository.save(administrateurs); - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministratorController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministratorController.java new file mode 100644 index 0000000..7e2706a --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministratorController.java @@ -0,0 +1,38 @@ +package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; + +import enseirb.myinpulse.model.Administrator; +import enseirb.myinpulse.repository.AdministratorRepository; + +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 AdministratorController { + + @Autowired AdministratorRepository administratorRepository; + + @GetMapping("/Administrator") + @ResponseBody + public Iterable allAdministrators() { + return this.administratorRepository.findAll(); + } + + @GetMapping("/Administrator/{id}") + public Administrator getAdministratorById(@PathVariable Long id) { + Optional administrator = this.administratorRepository.findById(id); + if (administrator.isEmpty()) { + throw new ResponseStatusException( + HttpStatus.NOT_FOUND, "Cet administrateur n'existe pas"); + } + return administrator.get(); + } + + @PostMapping("/Administrateurs") + public Administrator addAdministrator(@RequestBody Administrator administrator) { + return this.administratorRepository.save(administrator); + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AppointmentController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AppointmentController.java new file mode 100644 index 0000000..3761d51 --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AppointmentController.java @@ -0,0 +1,69 @@ +package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; + +import enseirb.myinpulse.model.Appointment; +import enseirb.myinpulse.repository.AppointmentRepository; + +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.LocalTime; +import java.util.Optional; + +@RestController +public class AppointmentController { + + @Autowired AppointmentRepository appointmentRepository; + + @GetMapping("/Appointment") + @ResponseBody + public Iterable allAppointments() { + return this.appointmentRepository.findAll(); + } + + @GetMapping("/Appointment/{id}") + public Appointment getAppointmentById(@PathVariable Long id) { + Optional appointment = this.appointmentRepository.findById(id); + if (appointment.isEmpty()) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce rendez vous n'existe pas"); + } + return appointment.get(); + } + + @PostMapping("/Appointment") + public Appointment addAppointment(@RequestBody Appointment appointment) { + return this.appointmentRepository.save(appointment); + } + + @PostMapping("/Appointment/{id}") + public Appointment updateAppointment( + @PathVariable Long id, + LocalDate appointmentDate, + LocalTime appointmentTime, + LocalTime appointmentDuration, + String appointmentPlace, + String appointmentSubject) { + Optional appointment = this.appointmentRepository.findById(id); + if (appointment.isEmpty()) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce rendez vous n'existe pas"); + } + if (appointmentDate != null) { + appointment.get().setAppointmentDate(appointmentDate); + } + if (appointmentTime != null) { + appointment.get().setAppointmentTime(appointmentTime); + } + if (appointmentDuration != null) { + appointment.get().setAppointmentDuration(appointmentDuration); + } + if (appointmentPlace != null) { + appointment.get().setAppointmentPlace(appointmentPlace); + } + if (appointmentSubject != null) { + appointment.get().setAppointmentSubject(appointmentSubject); + } + return this.appointmentRepository.save(appointment.get()); + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ComptesRendusController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ComptesRendusController.java deleted file mode 100644 index 1567b6d..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ComptesRendusController.java +++ /dev/null @@ -1,43 +0,0 @@ -package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; - -import org.springframework.web.bind.annotation.*; - -@RestController -public class ComptesRendusController { - /* - private final ComptesRendusRepository comptesRendusRepository; - - @Autowired - public ComptesRendusController(ComptesRendusRepository comptesRendusRepository) { - this.comptesRendusRepository = comptesRendusRepository; - } - - @GetMapping("/ComptesRendus") - @ResponseBody - public Iterable allComptesRendus() { - System.out.println("\n\n"); - System.out.println(comptesRendusRepository); - System.out.println("\n\n"); - return this.comptesRendusRepository.findAll(); - } - - - @PostMapping("/ComptesRendus") - public ComptesRendus addComptesRendus(@RequestBody ComptesRendus comptesRendus) { - return this.comptesRendusRepository.save(comptesRendus); - } - - @PostMapping("/ComptesRendus/{id}") - public ComptesRendus updateProjets(@PathVariable Long id, String contenu_compte_rendu) { - Optional compteRendu = this.comptesRendusRepository.findById(id); - if (compteRendu.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce compte rendu n'existe pas"); - } - if (contenu_compte_rendu != null) { - compteRendu.get().setContenu_compte_rendu(contenu_compte_rendu); - } - return this.comptesRendusRepository.save(compteRendu.get()); - } - - */ -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/EntrepreneurController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/EntrepreneurController.java new file mode 100644 index 0000000..3e72159 --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/EntrepreneurController.java @@ -0,0 +1,58 @@ +package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; + +import enseirb.myinpulse.model.Entrepreneur; +import enseirb.myinpulse.repository.EntrepreneurRepository; + +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 EntrepreneurController { + + @Autowired EntrepreneurRepository entrepreneurRepository; + + @GetMapping("/Entrepreneur") + @ResponseBody + public Iterable allEntrepreneurs() { + return this.entrepreneurRepository.findAll(); + } + + @GetMapping("/Entrepreneur/{id}") + public Entrepreneur getEntrepreneurById(@PathVariable Long id) { + Optional entrepreneur = entrepreneurRepository.findById(id); + if (entrepreneur.isEmpty()) { + throw new ResponseStatusException( + HttpStatus.NOT_FOUND, "Cet entrepreneur n'existe pas"); + } + return entrepreneur.get(); + } + + @PostMapping("/Entrepreneur") + public Entrepreneur addEntrepreneur(@RequestBody Entrepreneur entrepreneur) { + return this.entrepreneurRepository.save(entrepreneur); + } + + @PostMapping("/Entrepreneur/{id}") + public Entrepreneur updateEntrepreneur( + @PathVariable Long id, String school, String course, Boolean sneeStatus) { + Optional entrepreneur = entrepreneurRepository.findById(id); + if (entrepreneur.isEmpty()) { + throw new ResponseStatusException( + HttpStatus.NOT_FOUND, "Cet entrepreneur n'existe pas"); + } + if (school != null) { + entrepreneur.get().setSchool(school); + } + if (course != null) { + entrepreneur.get().setCourse(course); + } + if (sneeStatus != null) { + entrepreneur.get().setSneeStatus(sneeStatus); + } + return this.entrepreneurRepository.save(entrepreneur.get()); + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/EntrepreneursController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/EntrepreneursController.java deleted file mode 100644 index 4a21078..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/EntrepreneursController.java +++ /dev/null @@ -1,58 +0,0 @@ -package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; - -import enseirb.myinpulse.model.Entrepreneurs; -import enseirb.myinpulse.repository.EntrepreneursRepository; - -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 { - - @Autowired EntrepreneursRepository entrepreneursRepository; - - @GetMapping("/Entrepreneurs") - @ResponseBody - public Iterable allEntrepreneurs() { - return this.entrepreneursRepository.findAll(); - } - - @GetMapping("/Entrepreneurs/{id}") - public Entrepreneurs getEntrepreneursById(@PathVariable Long id) { - Optional entrepreneur = entrepreneursRepository.findById(id); - if (entrepreneur.isEmpty()) { - throw new ResponseStatusException( - HttpStatus.NOT_FOUND, "Cet entrepreneur n'existe pas"); - } - return entrepreneur.get(); - } - - @PostMapping("/Entrepreneurs") - public Entrepreneurs addEntrepreneurs(@RequestBody Entrepreneurs entrepreneurs) { - return this.entrepreneursRepository.save(entrepreneurs); - } - - @PostMapping("/Entrepreneurs/{id}") - public Entrepreneurs updateEntrepreneurs( - @PathVariable Long id, String ecole, String filiere, Boolean status_snee) { - Optional entrepreneur = entrepreneursRepository.findById(id); - if (entrepreneur.isEmpty()) { - throw new ResponseStatusException( - HttpStatus.NOT_FOUND, "Cet entrepreneur n'existe pas"); - } - if (ecole != null) { - entrepreneur.get().setEcole(ecole); - } - if (filiere != null) { - entrepreneur.get().setFiliere(filiere); - } - if (status_snee != null) { - entrepreneur.get().setStatus_snee(status_snee); - } - return this.entrepreneursRepository.save(entrepreneur.get()); - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ProjectController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ProjectController.java new file mode 100644 index 0000000..ffbc8e4 --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ProjectController.java @@ -0,0 +1,64 @@ +package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; + +import enseirb.myinpulse.model.Project; +import enseirb.myinpulse.repository.ProjectRepository; + +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 ProjectController { + + @Autowired ProjectRepository projectRepository; + + @GetMapping("/Project") + @ResponseBody + public Iterable allProjects() { + return this.projectRepository.findAll(); + } + + @GetMapping("/Project/{id}") + public Project getProjectById(@PathVariable Long id) { + Optional project = this.projectRepository.findById(id); + if (project.isEmpty()) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce projet n'existe pas"); + } + return project.get(); + } + + @PostMapping("/Project") + public Project addProject(@RequestBody Project project) { + return this.projectRepository.save(project); + } + + @PostMapping("/Project/{id}") + public Project updateProject( + @PathVariable Long id, + String projectName, + byte[] logo, + LocalDate creationDate, + String projectStatus) { + Optional project = this.projectRepository.findById(id); + if (project.isEmpty()) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce projet n'existe pas"); + } + if (projectName != null) { + project.get().setProjectName(projectName); + } + if (logo != null) { + project.get().setLogo(logo); + } + if (creationDate != null) { + project.get().setCreationDate(creationDate); + } + if (projectStatus != null) { + project.get().setProjectStatus(projectStatus); + } + return this.projectRepository.save(project.get()); + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ProjetsController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ProjetsController.java deleted file mode 100644 index f33edbc..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ProjetsController.java +++ /dev/null @@ -1,64 +0,0 @@ -package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; - -import enseirb.myinpulse.model.Projets; -import enseirb.myinpulse.repository.ProjetsRepository; - -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 { - - @Autowired ProjetsRepository projetsRepository; - - @GetMapping("/Projets") - @ResponseBody - public Iterable allProjets() { - return this.projetsRepository.findAll(); - } - - @GetMapping("/Projets/{id}") - public Projets getProjetsById(@PathVariable Long id) { - Optional projet = this.projetsRepository.findById(id); - if (projet.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce projet n'existe pas"); - } - return projet.get(); - } - - @PostMapping("/Projets") - public Projets addProjets(@RequestBody Projets projet) { - return this.projetsRepository.save(projet); - } - - @PostMapping("/Projets/{id}") - public Projets updateProjets( - @PathVariable Long id, - String nom_projet, - byte[] logo, - LocalDate date_creation, - String status_projet) { - Optional projet = this.projetsRepository.findById(id); - if (projet.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce projet n'existe pas"); - } - if (nom_projet != null) { - projet.get().setNom_projet(nom_projet); - } - if (logo != null) { - projet.get().setLogo(logo); - } - if (date_creation != null) { - projet.get().setDate_creation(date_creation); - } - if (status_projet != null) { - projet.get().setStatus_projet(status_projet); - } - return this.projetsRepository.save(projet.get()); - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/RendezVousController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/RendezVousController.java deleted file mode 100644 index 522db14..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/RendezVousController.java +++ /dev/null @@ -1,69 +0,0 @@ -package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; - -import enseirb.myinpulse.model.RendezVous; -import enseirb.myinpulse.repository.RendezVousRepository; - -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.LocalTime; -import java.util.Optional; - -@RestController -public class RendezVousController { - - @Autowired RendezVousRepository rendezVousRepository; - - @GetMapping("/RendezVous") - @ResponseBody - public Iterable allRendezVous() { - return this.rendezVousRepository.findAll(); - } - - @GetMapping("/RendezVous/{id}") - public RendezVous getRendezVousById(@PathVariable Long id) { - Optional rendezVous = this.rendezVousRepository.findById(id); - if (rendezVous.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce rendez vous n'existe pas"); - } - return rendezVous.get(); - } - - @PostMapping("/RendezVous") - public RendezVous addRendezVous(@RequestBody RendezVous rendezVous) { - return this.rendezVousRepository.save(rendezVous); - } - - @PostMapping("/RendezVous/{id}") - public RendezVous updateRendezVous( - @PathVariable Long id, - LocalDate date_rdv, - LocalTime heure_rdv, - LocalTime duree_rdv, - String lieu_rdv, - String sujet_rdv) { - Optional rendezVous = this.rendezVousRepository.findById(id); - if (rendezVous.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce rendez vous n'existe pas"); - } - if (date_rdv != null) { - rendezVous.get().setDate_rdv(date_rdv); - } - if (heure_rdv != null) { - rendezVous.get().setHeure_rdv(heure_rdv); - } - if (duree_rdv != null) { - rendezVous.get().setDuree_rdv(duree_rdv); - } - if (lieu_rdv != null) { - rendezVous.get().setLieu_rdv(lieu_rdv); - } - if (sujet_rdv != null) { - rendezVous.get().setSujet_rdv(sujet_rdv); - } - return this.rendezVousRepository.save(rendezVous.get()); - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ReportController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ReportController.java new file mode 100644 index 0000000..7b3458b --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/ReportController.java @@ -0,0 +1,43 @@ +package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; + +import org.springframework.web.bind.annotation.*; + +@RestController +public class ReportController { + /* + private final ReportRepository reportRepository; + + @Autowired + public ReportController(ReportRepository reportRepository) { + this.reportRepository = reportRepository; + } + + @GetMapping("/Report") + @ResponseBody + public Iterable allReports() { + System.out.println("\n\n"); + System.out.println(ReportRepository); + System.out.println("\n\n"); + return this.reportRepository.findAll(); + } + + + @PostMapping("/Report") + public Report addReport(@RequestBody Report report) { + return this.reportRepository.save(report); + } + + @PostMapping("/Report/{id}") + public Report updateProject(@PathVariable Long id, String reportContent) { + Optional report = this.reportRepository.findById(id); + if (report.isEmpty()) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce compte rendu n'existe pas"); + } + if (reportContent != null) { + report.get().setReportContent(reportContent); + } + return this.reportRepository.save(report.get()); + } + + */ +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/SectionCellController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/SectionCellController.java new file mode 100644 index 0000000..519fd90 --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/SectionCellController.java @@ -0,0 +1,62 @@ +package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; + +import enseirb.myinpulse.model.SectionCell; +import enseirb.myinpulse.repository.SectionCellRepository; + +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 SectionCellController { + + @Autowired SectionCellRepository sectionCellRepository; + + @GetMapping("/SectionCell") + @ResponseBody + public Iterable allSectionCells() { + return this.sectionCellRepository.findAll(); + } + + @GetMapping("/SectionCell/{id}") + public SectionCell getSectionCellById(@PathVariable Long id) { + Optional sectionCell = this.sectionCellRepository.findById(id); + if (sectionCell.isEmpty()) { + throw new ResponseStatusException( + HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas"); + } + return sectionCell.get(); + } + + @PostMapping("/SectionCell") + public SectionCell addSectionCell(@RequestBody SectionCell sectionCell) { + return this.sectionCellRepository.save(sectionCell); + } + + @PostMapping("/SectionCell/{id}") + public SectionCell updateSectionCell( + @PathVariable Long id, + String title, + String contentSectionCell, + LocalDateTime modificationDate) { + Optional sectionCell = this.sectionCellRepository.findById(id); + if (sectionCell.isEmpty()) { + throw new ResponseStatusException( + HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas"); + } + if (title != null) { + sectionCell.get().setTitle(title); + } + if (contentSectionCell != null) { + sectionCell.get().setContentSectionCell(contentSectionCell); + } + if (modificationDate != null) { + sectionCell.get().setModificationDate(modificationDate); + } + return this.sectionCellRepository.save(sectionCell.get()); + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/SectionsController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/SectionsController.java deleted file mode 100644 index d3009c6..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/SectionsController.java +++ /dev/null @@ -1,60 +0,0 @@ -package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; - -import enseirb.myinpulse.model.Sections; -import enseirb.myinpulse.repository.SectionsRepository; - -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 { - - @Autowired SectionsRepository sectionsRepository; - - @GetMapping("/Sections") - @ResponseBody - public Iterable allSections() { - return this.sectionsRepository.findAll(); - } - - @GetMapping("/Sections/{id}") - public Sections getSectionsById(@PathVariable Long id) { - Optional section = this.sectionsRepository.findById(id); - if (section.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cette section n'extise pas"); - } - return section.get(); - } - - @PostMapping("/Sections") - public Sections addSections(@RequestBody Sections sections) { - return this.sectionsRepository.save(sections); - } - - @PostMapping("/Sections/{id}") - public Sections updateSections( - @PathVariable Long id, - String titre, - String contenu_section, - LocalDateTime date_modification) { - Optional section = this.sectionsRepository.findById(id); - if (section.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cette section n'extise pas"); - } - if (titre != null) { - section.get().setTitre(titre); - } - if (contenu_section != null) { - section.get().setContenu_section(contenu_section); - } - if (date_modification != null) { - section.get().setDate_modification(date_modification); - } - return this.sectionsRepository.save(section.get()); - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UserController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UserController.java new file mode 100644 index 0000000..a9abc1f --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UserController.java @@ -0,0 +1,67 @@ +package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; + +import enseirb.myinpulse.model.User; +import enseirb.myinpulse.repository.UserRepository; + +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 UserController { + + @Autowired UserRepository userRepository; + + @GetMapping("/User") + @ResponseBody + public Iterable allUsers() { + return this.userRepository.findAll(); + } + + @GetMapping("/User/{id}") + public User getUserById(@PathVariable Long id) { + Optional user = userRepository.findById(id); + if (user.isEmpty()) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas"); + } + return user.get(); + } + + @PostMapping("/User") + public User addUser(@RequestBody User user) { + return this.userRepository.save(user); + } + + @PostMapping("/User/{id}") + public User updateUser( + @PathVariable Long id, + String userSurname, + String userName, + String mainMail, + String secondaryMail, + String phoneNumber) { + Optional user = userRepository.findById(id); + if (user.isEmpty()) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas"); + } + if (userName != null) { + user.get().setUserName(userName); + } + if (userSurname != null) { + user.get().setUserSurname(userSurname); + } + if (mainMail != null) { + user.get().setMainMail(mainMail); + } + if (secondaryMail != null) { + user.get().setSecondaryMail(secondaryMail); + } + if (phoneNumber != null) { + user.get().setPhoneNumber(phoneNumber); + } + return this.userRepository.save(user.get()); + } +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UtilisateursController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UtilisateursController.java deleted file mode 100644 index ce0a66a..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UtilisateursController.java +++ /dev/null @@ -1,67 +0,0 @@ -package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; - -import enseirb.myinpulse.model.Utilisateurs; -import enseirb.myinpulse.repository.UtilisateursRepository; - -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 { - - @Autowired UtilisateursRepository utilisateursRepository; - - @GetMapping("/Utilisateurs") - @ResponseBody - public Iterable allUtilisateurs() { - return this.utilisateursRepository.findAll(); - } - - @GetMapping("/Utilisateurs/{id}") - public Utilisateurs getUtilisateursById(@PathVariable Long id) { - Optional utilisateur = utilisateursRepository.findById(id); - if (utilisateur.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas"); - } - return utilisateur.get(); - } - - @PostMapping("/Utilisateurs") - public Utilisateurs addUtilisateurs(@RequestBody Utilisateurs utilisateurs) { - return this.utilisateursRepository.save(utilisateurs); - } - - @PostMapping("/Utilisateurs/{id}") - public Utilisateurs updateUtilisateurs( - @PathVariable Long id, - String nom_utilisateur, - String prenom_utilisateur, - String mail_principal, - String mail_secondaire, - String numero_telephone) { - Optional utilisateur = utilisateursRepository.findById(id); - if (utilisateur.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas"); - } - if (nom_utilisateur != null) { - utilisateur.get().setNom_utilisateur(nom_utilisateur); - } - if (prenom_utilisateur != null) { - utilisateur.get().setPrenom_utilisateur(prenom_utilisateur); - } - if (mail_principal != null) { - utilisateur.get().setMail_principal(mail_principal); - } - if (mail_secondaire != null) { - utilisateur.get().setMail_secondaire(mail_secondaire); - } - if (numero_telephone != null) { - utilisateur.get().setNumero_telephone(numero_telephone); - } - return this.utilisateursRepository.save(utilisateur.get()); - } -} diff --git a/MyINPulse-back/src/main/resources/data.sql b/MyINPulse-back/src/main/resources/data.sql index a94541b..c5ae489 100644 --- a/MyINPulse-back/src/main/resources/data.sql +++ b/MyINPulse-back/src/main/resources/data.sql @@ -1,4 +1,4 @@ -TRUNCATE projets, utilisateurs, entrepreneurs, sections, rendez_vous, comptes_rendus CASCADE; +TRUNCATE projets, user, entrepreneur, sectionCell, rendez_vous, comptes_rendus CASCADE; 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'), @@ -9,7 +9,7 @@ VALUES ('Eau du robinet', decode('013d7d16d7ad4fefb61bd95b765c8ceb', 'hex'), TO_ ('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 +INSERT INTO user (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'), @@ -18,7 +18,7 @@ INSERT INTO utilisateurs (nom_utilisateur, prenom_utilisateur, mail_principal, m ('Ducaillou', 'Pierre', 'maildefou@xyz.fr', 'maildefou2@xyz.fr', '06 54 78 12 62'); -INSERT INTO entrepreneurs (ecole, filiere, status_snee, id_entrepreneur) VALUES +INSERT INTO entrepreneur (ecole, filiere, status_snee, id_entrepreneur) VALUES ('ENSEIRB-MATMECA', 'INFO', TRUE, 1), ('ENSC', 'Cognitique', TRUE, 2), ('ENSEIRB-MATMECA', 'MATMECA', FALSE, 3), @@ -26,7 +26,7 @@ INSERT INTO entrepreneurs (ecole, filiere, status_snee, id_entrepreneur) VALUES ('ENSEGID', 'Géoscience', FALSE, 5), ('ENSMAC', 'Matériaux composites - Mécanique', FALSE, 6); -INSERT INTO sections (titre, contenu_section, date_modification) VALUES +INSERT INTO sectionCell (titre, contenu_section, date_modification) VALUES ('Problème', 'les problèmes...', TO_TIMESTAMP('15-JAN-2025 09:30:20', 'DD-MON-YYYY, HH24:MI:SS')), ('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_TIMESTAMP('12-OCT-2022 17:47:38', 'DD-MON-YYYY, HH24:MI:SS')), diff --git a/MyINPulse-back/src/main/resources/delete.sql b/MyINPulse-back/src/main/resources/delete.sql index c494872..fb9e00a 100644 --- a/MyINPulse-back/src/main/resources/delete.sql +++ b/MyINPulse-back/src/main/resources/delete.sql @@ -1 +1 @@ -DROP TABLE IF EXISTS administrateurs, projets, utilisateurs, entrepreneurs, sections, rendez_vous, comptes_rendus, concerner CASCADE; \ No newline at end of file +DROP TABLE IF EXISTS administrator, projets, user, entrepreneur, sectionCell, rendez_vous, comptes_rendus, concerner CASCADE; \ No newline at end of file diff --git a/MyINPulse-back/src/main/resources/schema.sql b/MyINPulse-back/src/main/resources/schema.sql index aae3f91..b7b4f87 100644 --- a/MyINPulse-back/src/main/resources/schema.sql +++ b/MyINPulse-back/src/main/resources/schema.sql @@ -1,8 +1,8 @@ DROP TABLE IF EXISTS projets CASCADE; -DROP TABLE IF EXISTS utilisateurs CASCADE; -DROP TABLE IF EXISTS entrepreneurs CASCADE; -DROP TABLE IF EXISTS administrateurs CASCADE; -DROP TABLE IF EXISTS sections CASCADE; +DROP TABLE IF EXISTS user CASCADE; +DROP TABLE IF EXISTS entrepreneur CASCADE; +DROP TABLE IF EXISTS administrator CASCADE; +DROP TABLE IF EXISTS sectionCell CASCADE; DROP TABLE IF EXISTS rendez_vous CASCADE; DROP TABLE IF EXISTS comptes_rendus CASCADE; DROP TABLE IF EXISTS concerner CASCADE; @@ -18,7 +18,7 @@ CREATE TABLE projets CONSTRAINT pk_projet PRIMARY KEY (id_projet) ); -CREATE TABLE utilisateurs +CREATE TABLE user ( id_utilisateur SERIAL NOT NULL, nom_utilisateur VARCHAR(255) , @@ -28,22 +28,22 @@ mail_secondaire VARCHAR(255) , numero_telephone VARCHAR(20) , CONSTRAINT pk_utilisateur PRIMARY KEY (id_utilisateur) ); -CREATE TABLE entrepreneurs +CREATE TABLE entrepreneur ( - id_entrepreneur SERIAL REFERENCES utilisateurs (id_utilisateur), + id_entrepreneur SERIAL REFERENCES user (id_utilisateur), ecole VARCHAR(255), filiere VARCHAR(255), status_snee BOOLEAN, CONSTRAINT pk_entrepreneur PRIMARY KEY (id_entrepreneur) ); -CREATE TABLE administrateurs +CREATE TABLE administrator ( - id_administrateur SERIAL REFERENCES utilisateurs (id_utilisateur), + id_administrateur SERIAL REFERENCES user (id_utilisateur), CONSTRAINT pk_administrateur PRIMARY KEY (id_administrateur) ); -CREATE TABLE sections +CREATE TABLE sectionCell ( id_section SERIAL NOT NULL, titre VARCHAR(255), @@ -72,47 +72,47 @@ CREATE TABLE comptes_rendus CREATE TABLE concerner ( - id_section SERIAL REFERENCES sections (id_section), - id_rdv SERIAL REFERENCES sections (id_rdv), + id_section SERIAL REFERENCES sectionCell (id_section), + id_rdv SERIAL REFERENCES sectionCell (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) + REFERENCES administrator (id_administrateur) ON DELETE CASCADE; ALTER TABLE projets ADD CONSTRAINT fk2_projet FOREIGN KEY (id_entrepreneur_participation) - REFERENCES entrepreneurs (id_entrepreneur) + REFERENCES entrepreneur (id_entrepreneur) ON DELETE CASCADE; -ALTER TABLE entrepreneurs +ALTER TABLE entrepreneur ADD CONSTRAINT fk1_entrepreneur FOREIGN KEY (id_projet_propose) REFERENCES projets (id_projet) ON DELETE CASCADE; -ALTER TABLE sections +ALTER TABLE sectionCell ADD CONSTRAINT fk1_section FOREIGN KEY (id_projet) REFERENCES projets (id_projet) ON DELETE CASCADE; -ALTER TABLE sections +ALTER TABLE sectionCell ADD CONSTRAINT fk2_section FOREIGN KEY (id_administrateur) - REFERENCES administrateurs (id_administrateur) + REFERENCES administrator (id_administrateur) ON DELETE CASCADE; ALTER TABLE rendez-vous ADD CONSTRAINT fk1_rdv FOREIGN KEY (id_entrepreneur) - REFERENCES entrepreneurs (id_entrepreneur) + REFERENCES entrepreneur (id_entrepreneur) ON DELETE CASCADE; ALTER TABLE rendez-vous ADD CONSTRAINT fk2_rdv FOREIGN KEY (id_administrateur) - REFERENCES administrateurs (id_administrateur) + REFERENCES administrator (id_administrateur) ON DELETE CASCADE;