From 0250b42b7b5bb66be3c3c24565fc67b203ecdbe1 Mon Sep 17 00:00:00 2001
From: Giorgio UTZERI <giorgio.utzeri.etu@univ-lille.fr>
Date: Sat, 15 Mar 2025 16:05:41 +0100
Subject: [PATCH] refacto all

---
 WEB-INF/classes/res/config.prop                           | 6 +++---
 .../src/controleurs/{Authent.java => AccountAuthent.java} | 4 ++--
 .../src/controleurs/{Create.java => AccountCreate.java}   | 2 +-
 .../src/controleurs/{addUserFil.java => FilAddUser.java}  | 3 +--
 .../src/controleurs/{CreateFil.java => FilCreate.java}    | 2 +-
 WEB-INF/src/controleurs/{LeaveFil.java => FilLeave.java}  | 2 +-
 WEB-INF/src/controleurs/{AddUser.java => FilUser.java}    | 8 +++-----
 .../{ControleurLike.java => LikeControler.java}           | 2 +-
 .../{LogoutServlet.java => LogoutControler.java}          | 4 ++--
 .../controleurs/{EnvoyerMessage.java => MessageSend.java} | 5 +----
 login.html                                                | 2 +-
 menu.jsp                                                  | 2 +-
 12 files changed, 18 insertions(+), 24 deletions(-)
 rename WEB-INF/src/controleurs/{Authent.java => AccountAuthent.java} (92%)
 rename WEB-INF/src/controleurs/{Create.java => AccountCreate.java} (97%)
 rename WEB-INF/src/controleurs/{addUserFil.java => FilAddUser.java} (97%)
 rename WEB-INF/src/controleurs/{CreateFil.java => FilCreate.java} (97%)
 rename WEB-INF/src/controleurs/{LeaveFil.java => FilLeave.java} (95%)
 rename WEB-INF/src/controleurs/{AddUser.java => FilUser.java} (89%)
 rename WEB-INF/src/controleurs/{ControleurLike.java => LikeControler.java} (97%)
 rename WEB-INF/src/controleurs/{LogoutServlet.java => LogoutControler.java} (85%)
 rename WEB-INF/src/controleurs/{EnvoyerMessage.java => MessageSend.java} (95%)

diff --git a/WEB-INF/classes/res/config.prop b/WEB-INF/classes/res/config.prop
index 865020e..686154e 100644
--- a/WEB-INF/classes/res/config.prop
+++ b/WEB-INF/classes/res/config.prop
@@ -1,5 +1,5 @@
 nbday=7
 driver=org.postgresql.Driver
-url=jdbc:postgresql://localhost:5432/sae
-login=admin
-mdp=admin
+url=jdbc:postgresql://psqlserv/but2
+login=giorgioutzerietu
+mdp=moi
\ No newline at end of file
diff --git a/WEB-INF/src/controleurs/Authent.java b/WEB-INF/src/controleurs/AccountAuthent.java
similarity index 92%
rename from WEB-INF/src/controleurs/Authent.java
rename to WEB-INF/src/controleurs/AccountAuthent.java
index 9a44bea..716f5f6 100644
--- a/WEB-INF/src/controleurs/Authent.java
+++ b/WEB-INF/src/controleurs/AccountAuthent.java
@@ -9,8 +9,8 @@ import dao.UtilisateurDAO;
 import dto.Utilisateur;
 import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
 
-@WebServlet("/servlet-Authent")
-public class Authent extends HttpServlet {
+@WebServlet("/Authent")
+public class AccountAuthent extends HttpServlet {
 
     UtilisateurDAO utilisateurDAO = new UtilisateurDAO();
 
diff --git a/WEB-INF/src/controleurs/Create.java b/WEB-INF/src/controleurs/AccountCreate.java
similarity index 97%
rename from WEB-INF/src/controleurs/Create.java
rename to WEB-INF/src/controleurs/AccountCreate.java
index d196145..b185df2 100644
--- a/WEB-INF/src/controleurs/Create.java
+++ b/WEB-INF/src/controleurs/AccountCreate.java
@@ -10,7 +10,7 @@ import dto.Utilisateur;
 import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
 
 @WebServlet("/Create")
-public class Create extends HttpServlet {
+public class AccountCreate extends HttpServlet {
     UtilisateurDAO utilisateurDAO = new UtilisateurDAO();
 
     protected void service(HttpServletRequest req, HttpServletResponse res)
diff --git a/WEB-INF/src/controleurs/addUserFil.java b/WEB-INF/src/controleurs/FilAddUser.java
similarity index 97%
rename from WEB-INF/src/controleurs/addUserFil.java
rename to WEB-INF/src/controleurs/FilAddUser.java
index 53f6d3a..02a2c93 100644
--- a/WEB-INF/src/controleurs/addUserFil.java
+++ b/WEB-INF/src/controleurs/FilAddUser.java
@@ -1,6 +1,5 @@
 package controleurs;
 
-import dao.FilDAO;
 import dao.ParticipantFilDAO;
 import dao.UtilisateurDAO;
 import dto.Utilisateur;
@@ -17,7 +16,7 @@ import java.util.Arrays;
 import java.util.List;
 
 @WebServlet("/addUserFil")
-public class addUserFil extends HttpServlet {
+public class FilAddUser extends HttpServlet {
     protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         res.setContentType("text/html;charset=UTF-8");
         HttpSession session = req.getSession(true);
diff --git a/WEB-INF/src/controleurs/CreateFil.java b/WEB-INF/src/controleurs/FilCreate.java
similarity index 97%
rename from WEB-INF/src/controleurs/CreateFil.java
rename to WEB-INF/src/controleurs/FilCreate.java
index c3a8b91..9a78689 100644
--- a/WEB-INF/src/controleurs/CreateFil.java
+++ b/WEB-INF/src/controleurs/FilCreate.java
@@ -13,7 +13,7 @@ import jakarta.servlet.annotation.WebServlet;
 import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
 
 @WebServlet("/CreateFil")
-public class CreateFil extends HttpServlet {
+public class FilCreate extends HttpServlet {
 
     protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         res.setContentType("text/html;charset=UTF-8");
diff --git a/WEB-INF/src/controleurs/LeaveFil.java b/WEB-INF/src/controleurs/FilLeave.java
similarity index 95%
rename from WEB-INF/src/controleurs/LeaveFil.java
rename to WEB-INF/src/controleurs/FilLeave.java
index f47db28..4355aeb 100644
--- a/WEB-INF/src/controleurs/LeaveFil.java
+++ b/WEB-INF/src/controleurs/FilLeave.java
@@ -10,7 +10,7 @@ import dto.Utilisateur;
 import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
 
 @WebServlet("/LeaveFil")
-public class LeaveFil extends HttpServlet {
+public class FilLeave extends HttpServlet {
     protected void service(HttpServletRequest req, HttpServletResponse res)
             throws ServletException, IOException {
         HttpSession session = req.getSession(false);
diff --git a/WEB-INF/src/controleurs/AddUser.java b/WEB-INF/src/controleurs/FilUser.java
similarity index 89%
rename from WEB-INF/src/controleurs/AddUser.java
rename to WEB-INF/src/controleurs/FilUser.java
index addbd30..46bae1f 100644
--- a/WEB-INF/src/controleurs/AddUser.java
+++ b/WEB-INF/src/controleurs/FilUser.java
@@ -5,7 +5,6 @@ import java.util.List;
 
 import dao.FilDAO;
 import dao.ParticipantFilDAO;
-import dao.UtilisateurDAO;
 import dto.Fil;
 import dto.Utilisateur;
 import jakarta.servlet.*;
@@ -14,7 +13,9 @@ import jakarta.servlet.annotation.WebServlet;
 import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
 
 @WebServlet("/AddUser")
-public class AddUser extends HttpServlet {
+public class FilUser extends HttpServlet {
+    private ParticipantFilDAO participantFilDAO = new ParticipantFilDAO();
+    private FilDAO filDAO = new FilDAO();
 
     protected void doGet(HttpServletRequest req, HttpServletResponse res)
             throws ServletException, IOException {
@@ -24,8 +25,6 @@ public class AddUser extends HttpServlet {
         if (utilisateur == null) {
             res.sendRedirect("login.html");
         } else {
-            FilDAO filDAO = new FilDAO();
-            ParticipantFilDAO participantFilDAO = new ParticipantFilDAO();
             List<Fil> fils = filDAO.getFilsByUser(utilisateur.getId());
             req.setAttribute("fils", fils);
             String rese = req.getParameter("filId");
@@ -54,7 +53,6 @@ public class AddUser extends HttpServlet {
             int userId = Integer.parseInt(userIdString);
             int filId = Integer.parseInt(filIdString);
 
-            ParticipantFilDAO participantFilDAO = new ParticipantFilDAO();
             participantFilDAO.deleteUserById(userId, filId);
 
             res.sendRedirect("Menu?filId=" + filIdString);
diff --git a/WEB-INF/src/controleurs/ControleurLike.java b/WEB-INF/src/controleurs/LikeControler.java
similarity index 97%
rename from WEB-INF/src/controleurs/ControleurLike.java
rename to WEB-INF/src/controleurs/LikeControler.java
index 947cee4..1dd2300 100644
--- a/WEB-INF/src/controleurs/ControleurLike.java
+++ b/WEB-INF/src/controleurs/LikeControler.java
@@ -14,7 +14,7 @@ import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
 import java.io.IOException;
 
 @WebServlet("/ControleurLike")
-public class ControleurLike extends HttpServlet {
+public class LikeControler extends HttpServlet {
     private static final long serialVersionUID = 1L;
     private LikeDAO likeDAO;
     private MessageDAO messageDAO;
diff --git a/WEB-INF/src/controleurs/LogoutServlet.java b/WEB-INF/src/controleurs/LogoutControler.java
similarity index 85%
rename from WEB-INF/src/controleurs/LogoutServlet.java
rename to WEB-INF/src/controleurs/LogoutControler.java
index fe332a2..d5e5137 100644
--- a/WEB-INF/src/controleurs/LogoutServlet.java
+++ b/WEB-INF/src/controleurs/LogoutControler.java
@@ -6,8 +6,8 @@ import jakarta.servlet.*;
 import jakarta.servlet.http.*;
 import jakarta.servlet.annotation.WebServlet;
 
-@WebServlet("/LogoutServlet")
-public class LogoutServlet extends HttpServlet {
+@WebServlet("/Logout")
+public class LogoutControler extends HttpServlet {
 
     protected void service(HttpServletRequest req, HttpServletResponse res)
             throws ServletException, IOException {
diff --git a/WEB-INF/src/controleurs/EnvoyerMessage.java b/WEB-INF/src/controleurs/MessageSend.java
similarity index 95%
rename from WEB-INF/src/controleurs/EnvoyerMessage.java
rename to WEB-INF/src/controleurs/MessageSend.java
index 02ce79f..7c51f9f 100644
--- a/WEB-INF/src/controleurs/EnvoyerMessage.java
+++ b/WEB-INF/src/controleurs/MessageSend.java
@@ -2,11 +2,8 @@ package controleurs;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.List;
 
-import dao.FilDAO;
 import dao.MessageDAO;
-import dto.Fil;
 import dto.Utilisateur;
 import jakarta.servlet.*;
 import jakarta.servlet.annotation.MultipartConfig;
@@ -20,7 +17,7 @@ import org.apache.tomcat.jakartaee.commons.lang3.StringEscapeUtils;
         maxRequestSize = 1024 * 1024 * 50
 )
 @WebServlet("/EnvoyerMessage")
-public class EnvoyerMessage extends HttpServlet {
+public class MessageSend extends HttpServlet {
     private static final long serialVersionUID = 1L;
     private MessageDAO messageDAO;
 
diff --git a/login.html b/login.html
index 7abb6bc..93834ad 100644
--- a/login.html
+++ b/login.html
@@ -10,7 +10,7 @@
 </head>
 <body>  
     <div class="container">
-    <form action=servlet-Authent method=get>
+    <form action=Authent method=get>
         <h2>Se connecter</h2>
         <div class="mb-3">
           <label for="login" class="form-label">Adresse Mail</label>
diff --git a/menu.jsp b/menu.jsp
index 53bccb6..11f69a6 100644
--- a/menu.jsp
+++ b/menu.jsp
@@ -38,7 +38,7 @@
                 <span><%= utilisateur.getPrenom() + " " + utilisateur.getNom() %></span>
             </a>
 
-            <a href="LogoutServlet" class="text-danger fs-3">
+            <a href="Logout" class="text-danger fs-3">
                 <i class="bi bi-box-arrow-right"></i>
             </a>
         </div>
-- 
GitLab