Fix: Moved UserSelect methods to UserDAO so that the userDAO file man…

…ages all user-table related activites
cathrkri · Apr 23, 2026 · 7de8e67 · 7de8e67
1 parent fd72eaf
commit 7de8e67
Show file tree

Hide file tree

Showing 7 changed files with 526 additions and 584 deletions.
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
@@ -6,17 +6,13 @@
 import java.util.Objects;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import ntnu.systemutvikling.team6.controller.components.BaseController;
 import ntnu.systemutvikling.team6.database.DAO.UserDAO;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
 import ntnu.systemutvikling.team6.database.DatabaseSetup;
-import ntnu.systemutvikling.team6.database.Readers.UserSelect;
-import ntnu.systemutvikling.team6.models.Charity;
-import ntnu.systemutvikling.team6.models.registry.CharityRegistry;
 import ntnu.systemutvikling.team6.scraper.FullCharityScrape;
 import ntnu.systemutvikling.team6.service.APIToDatabaseService;
 import ntnu.systemutvikling.team6.service.AuthenticationService;
@@ -25,7 +21,7 @@ public class HmHApplication extends Application {
   @Override
   public void start(Stage stage) throws Exception {
     DatabaseConnection conn = new DatabaseConnection();
-    AuthenticationService authToken = new AuthenticationService(new UserSelect(conn), new UserDAO(conn));
+    AuthenticationService authToken = new AuthenticationService(new UserDAO(conn));
 
     FXMLLoader fxmlLoader =
         new FXMLLoader(HmHApplication.class.getResource("/fxml/frontPage.fxml"));

diff --git a/...va/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgSettingsController.java b/...va/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgSettingsController.java
@@ -12,17 +12,10 @@
 import javafx.stage.Stage;
 import ntnu.systemutvikling.team6.controller.components.*;
 import ntnu.systemutvikling.team6.database.DAO.CharityUserDAO;
-import ntnu.systemutvikling.team6.database.DAO.UserDAO;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
-import ntnu.systemutvikling.team6.database.Readers.UserSelect;
 import ntnu.systemutvikling.team6.models.Charity;
-import ntnu.systemutvikling.team6.models.Donation;
-import ntnu.systemutvikling.team6.models.registry.DonationRegistry;
-import ntnu.systemutvikling.team6.models.user.User;
-import ntnu.systemutvikling.team6.security.PasswordHasher;
 
 import java.io.IOException;
-import java.util.Base64;
 import java.util.List;
 
 public class profileOrgSettingsController extends BaseController {

diff --git a/...java/ntnu/systemutvikling/team6/controller/profileUser/profileUserSettingsController.java b/...java/ntnu/systemutvikling/team6/controller/profileUser/profileUserSettingsController.java
@@ -10,7 +10,6 @@
 import ntnu.systemutvikling.team6.controller.components.NavbarController;
 import ntnu.systemutvikling.team6.database.DAO.UserDAO;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
-import ntnu.systemutvikling.team6.database.Readers.UserSelect;
 import ntnu.systemutvikling.team6.models.user.*;
 import ntnu.systemutvikling.team6.security.PasswordHasher;
 
@@ -119,10 +118,9 @@ private void handleNewProfile(ActionEvent event){
         boolean updateSuccess;
         DatabaseConnection conn = new DatabaseConnection();
         UserDAO userDataObject = new UserDAO(conn);
-        UserSelect userReaderObject = new UserSelect(conn);
         try {
             if (!emailText.equals(authToken.getCurrentUser().getEmail())) {
-                boolean isEmailTaken = userReaderObject.isEmailTaken(emailText);
+                boolean isEmailTaken = userDataObject.isEmailTaken(emailText);
                 if (!isEmailTaken) {
                     updateSuccess = userDataObject.updateUserDetails(newUserOnlyCredentials);
                 } else {