Modified LoginController

-Added method setSessionAttributes in LoginController
-Added method getPersonalInfo in DAOPersonalInfo
-Refactored DAOAPersonalInfo to DAOPersonalInfo
-Added method getPersonalInfo to UserRegistry
-Added methods getUserByIdOrEmail and isTherapist in UserData
-Added Servlet-API in pom.xml

pom.xml

@@ -56,10 +56,11 @@
             <artifactId>jakarta.mail</artifactId>
             <version>1.6.5</version>
         </dependency>
+
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>4.0.1</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
         </dependency>
 
     </dependencies>

src/main/java/controller/LoginController.java

@@ -1,8 +1,11 @@
 package controller;
 
-import model.DAO.DAOUser;
+import model.DAO.DAOPersonalInfo;
+import model.entity.PersonalInfo;
 import model.entity.User;
 import model.service.login.Authenticator;
+import model.service.user.UserData;
+import model.service.user.UserRegistry;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -27,24 +30,40 @@ public void init() {
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
-
         String email = request.getParameter("email");
         String password = request.getParameter("password");
 
-        System.out.println(email);
-        System.out.println(password);
         int result = authService.authenticate(email, password);
 
         if (result > 0) {
-            // Login success, redirect to the welcome page
-            HttpSession session = request.getSession();
-            DAOUser daouser=new DAOUser();
-            User user_logged= daouser.getUserByIdOrEmail(email);
-            session.setAttribute("user_logged", user_logged);
+            // Login success, defining its Session attributes
+            setSessionAttributes(result,request);
             response.sendRedirect("JSP/welcome.jsp");
         } else {
             // Login failed, redirect back to the login page
             response.sendRedirect("JSP/login.jsp?error=1");
         }
     }
+
+    private void setSessionAttributes(int id, HttpServletRequest request){
+        HttpSession session = request.getSession();
+
+        UserData userData = new UserData();
+        UserRegistry userReg = new UserRegistry();
+
+        User user = userData.getUserByIdOrEmail(id);
+        PersonalInfo personalInfo = userReg.getPersonalInfo(id);
+
+        session.setAttribute("id", id);
+        session.setAttribute("name", personalInfo.getFirstname());
+
+        if(userData.isTherapist(user)) {
+            session.setAttribute("type", "patient");
+            session.setAttribute("therapist", user.getIdTherapist());
+        }
+        else {
+            session.setAttribute("type", "therapist");
+        }
+    }
+
 }

src/main/java/model/DAO/DAOPersonalInfo.java

@@ -7,7 +7,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-public class DAOAPersonalInfo {
+public class DAOPersonalInfo {
 
     private PersonalInfo getPersonalInfoFromResultSet(ResultSet resultSet) throws SQLException {
         PersonalInfo personalInfo = new PersonalInfo();

src/main/java/model/service/user/UserData.java

@@ -1,6 +1,7 @@
 package model.service.user;
 
 import model.DAO.DAOUser;
+import model.entity.User;
 
 public class UserData /*implements UserDataInterface */{
     DAOUser daoUser = new DAOUser();
@@ -12,4 +13,12 @@ public boolean checkIfEmailExists(String email) {
     public int createUser(String email, String password, int therapistId) {
         return daoUser.createUser(email, password, therapistId);
     }
+
+    public User getUserByIdOrEmail(Object idOrEmail) {
+        return daoUser.getUserByIdOrEmail(idOrEmail);
+    }
+
+    public boolean isTherapist(User user){
+        return user.getIdTherapist() > 0;
+    }
 }

src/main/java/model/service/user/UserRegistry.java

@@ -1,9 +1,18 @@
 package model.service.user;
 
+import model.DAO.DAOPersonalInfo;
+import model.entity.PersonalInfo;
+
 public class UserRegistry implements UserRegistryInterface {
+    DAOPersonalInfo db = new DAOPersonalInfo();
 
     public boolean firstAccess(int id, String name, String surname) {//TODO e da inserire nel metodo di registrazione!
         System.out.println("hello, this is a placeholder");
         return true; //TODO Remove it!
     }
+
+    public PersonalInfo getPersonalInfo(int id) {
+        return db.getPersonalInfo(id);
+    }
+
 }