Merge pull request #70 from cathrkri/56-user-implemention-and-token

Contain fix to BatchExecption Thing

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java

@@ -3,7 +3,12 @@
 import static javafx.application.Application.launch;
 
 import java.net.http.HttpClient;
+import java.util.Objects;
+
 import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
 import ntnu.systemutvikling.team6.database.DatabaseSetup;
@@ -15,7 +20,6 @@
 public class HmHApplication extends Application {
   @Override
   public void start(Stage stage) throws Exception {
-    /*
     FXMLLoader fxmlLoader =
         new FXMLLoader(HmHApplication.class.getResource("/fxml/frontPage.fxml"));
     Scene scene = new Scene(fxmlLoader.load());
@@ -30,8 +34,6 @@ public void start(Stage stage) throws Exception {
     stage.setFullScreen(true);
 
     stage.show();
-    */
-
   }
 
   @Override

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/AvailableOrganizationController.java

@@ -9,6 +9,10 @@
 import javafx.scene.Parent;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.FlowPane;
+import ntnu.systemutvikling.team6.controller.components.BaseController;
+import ntnu.systemutvikling.team6.controller.components.LoaderScene;
+import ntnu.systemutvikling.team6.controller.components.NavbarFooterController;
+import ntnu.systemutvikling.team6.controller.components.OrganizationCardController;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
 import ntnu.systemutvikling.team6.database.Readers.CharitySelect;
 import ntnu.systemutvikling.team6.models.Charity;
@@ -22,7 +26,7 @@
  * on the featured charity to see more details about it. The user can also switch to the charity
  * page or donation page for the selected charity.
  */
-public class AvailableOrganizationController {
+public class AvailableOrganizationController extends BaseController implements NavbarFooterController {
 
   @FXML private TextField searchField;
   @FXML private FlowPane cardsContainer;
@@ -88,7 +92,7 @@ private void displayCharities(List<Charity> charities) {
 
     for (Charity charity : charities) {
       try {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/organizationCard.fxml"));
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/components/organizationCard.fxml"));
         Parent card = loader.load();
 
         OrganizationCardController cardController = loader.getController();
@@ -115,15 +119,6 @@ public void setInitialSearch(String query) {
     searchField.setText(query);
   }
 
-  /**
-   * This method is used to switch to the front page.
-   *
-   * @param event action event from button click
-   */
-  @FXML
-  public void switchToFrontPage(ActionEvent event) {
-    LoaderScene.LoadScene("FrontPage", event, charity, null);
-  }
 
   /**
    * This method is used to switch to the charity page for the selected charity.

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java

@@ -4,6 +4,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
+import ntnu.systemutvikling.team6.controller.components.LoaderScene;
 import ntnu.systemutvikling.team6.models.Charity;
 
 /**
@@ -40,16 +41,6 @@ public void setCharity(Charity charity) {
     CharityName.setText(charity.getName());
   }
 
-  /**
-   * This method is used to switch to the front page.
-   *
-   * @param event
-   */
-  @FXML
-  public void switchToFrontPage(ActionEvent event) {
-    System.out.println("Click");
-    LoaderScene.LoadScene("FrontPage", event, charity, null);
-  }
 
   /**
    * This method is used to switch to the donation page.

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/DonationPageController.java

@@ -7,7 +7,9 @@
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
-import ntnu.systemutvikling.team6.DAO.DonationDAO;
+import ntnu.systemutvikling.team6.controller.components.LoaderScene;
+import ntnu.systemutvikling.team6.database.DAO.DonationDAO;
+import ntnu.systemutvikling.team6.database.DatabaseConnection;
 import ntnu.systemutvikling.team6.models.Charity;
 import ntnu.systemutvikling.team6.models.user.User;
 
@@ -24,6 +26,8 @@ public class DonationPageController {
 
   @FXML private TextField donationSearchField;
 
+  private DonationDAO donationSender = new DonationDAO(new DatabaseConnection());
+
   /**
    * Initialize method for the donation page. Sets the charity name label to the name of the charity
    * that is being donated to. The charity is set from the original page it was called from when the
@@ -116,7 +120,7 @@ public void Donate(ActionEvent event) {
    * @param amount
    */
   public void processDonation(Charity charity, User user, double amount) {
-    DonationDAO.addDonation(charity, user, amount);
+    donationSender.addDonation(charity, user, amount);
   }
 
   /**

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java

@@ -12,6 +12,10 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.FlowPane;
+import ntnu.systemutvikling.team6.controller.components.BaseController;
+import ntnu.systemutvikling.team6.controller.components.LoaderScene;
+import ntnu.systemutvikling.team6.controller.components.NavbarFooterController;
+import ntnu.systemutvikling.team6.controller.components.OrganizationCardController;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
 import ntnu.systemutvikling.team6.database.Readers.CharitySelect;
 import ntnu.systemutvikling.team6.database.Readers.DonationSelect;
@@ -27,7 +31,7 @@
  * it, or click on the featured charity to see more details about it. It also has buttons to switch
  * to the charity page and the donation page for the featured charity
  */
-public class FrontpageController {
+public class FrontpageController extends BaseController implements NavbarFooterController {
   @FXML private Charity featuredCharity;
   @FXML private FlowPane cardsContainer;
   @FXML private Label Carosel_Organisasjon;
@@ -43,6 +47,11 @@ public class FrontpageController {
 
   private List<Charity> allCharities = new ArrayList<>();
 
+  @Override
+  protected void authTokenisSet(){
+
+  }
+
   /**
    * Initialize method for the front page. This method is called when the front page is loaded. It
    * retrieves the list of charities and donations from the database. The list of charities is
@@ -88,6 +97,7 @@ public void initialize() {
     }
   }
 
+
   /**
    * This method is used to switch to the charity page for the selected charity
    *
@@ -210,7 +220,7 @@ private void displayCharities(List<Charity> charities) {
 
     for (Charity charity : charities) {
       try {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/organizationCard.fxml"));
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/components/organizationCard.fxml"));
         Parent card = loader.load();
         OrganizationCardController cardController = loader.getController();
         cardController.setOrganization(charity);

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/BaseController.java

@@ -0,0 +1,17 @@
+package ntnu.systemutvikling.team6.controller.components;
+
+import ntnu.systemutvikling.team6.service.AuthenticationService;
+
+public abstract class BaseController {
+    protected AuthenticationService authToken;
+
+    public void setAuthToken(AuthenticationService authToken){
+        this.authToken = authToken;
+        authTokenisSet();
+    };
+    protected void authTokenisSet(){} // Do stuff after authtoken is set, on each controller
+
+    protected boolean isLoggedin(){
+        return authToken.isLoggedin() && authToken != null;
+    }
+}

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/LoaderScene.java → helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/LoaderScene.java

@@ -1,4 +1,4 @@
-package ntnu.systemutvikling.team6.controller;
+package ntnu.systemutvikling.team6.controller.components;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -10,6 +10,9 @@
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import ntnu.systemutvikling.team6.HmHApplication;
+import ntnu.systemutvikling.team6.controller.AvailableOrganizationController;
+import ntnu.systemutvikling.team6.controller.CharityPageController;
+import ntnu.systemutvikling.team6.controller.DonationPageController;
 import ntnu.systemutvikling.team6.models.Charity;
 
 /**

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarFooterController.java

@@ -0,0 +1,33 @@
+package ntnu.systemutvikling.team6.controller.components;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.TextField;
+
+public interface NavbarFooterController {
+
+    default void switchToFrontPage(ActionEvent event) {
+        System.out.println("Click!");
+        LoaderScene.LoadScene("FrontPage", event, null, null);
+    }
+
+    default void switchToAboutPage(ActionEvent event) {
+        System.out.println("Click!");
+        LoaderScene.LoadScene("aboutPage", event, null, null);
+    }
+
+    default void switchToProfilePage(ActionEvent event) {
+        System.out.println("Click!");
+        LoaderScene.LoadScene("aboutPage", event, null, null);
+    }
+
+    default void handleSearch(ActionEvent event) {
+        System.out.println("Click!");
+        LoaderScene.LoadScene("aboutPage", event, null, null);
+    }
+
+    default void switchToLoginPage(ActionEvent event) {
+        System.out.println("Click!");
+        LoaderScene.LoadScene("aboutPage", event, null, null);
+    }
+}

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/OrganizationCardController.java → helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java

@@ -1,4 +1,4 @@
-package ntnu.systemutvikling.team6.controller;
+package ntnu.systemutvikling.team6.controller.components;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/DonationDAO.java → helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/DonationDAO.java

@@ -1,4 +1,4 @@
-package ntnu.systemutvikling.team6.DAO;
+package ntnu.systemutvikling.team6.database.DAO;
 
 import java.sql.*;
 import java.util.UUID;
@@ -11,16 +11,20 @@
  * Database. Usally called from the DonationPageController, where the user confirms their donation.
  */
 public class DonationDAO {
-  private static final DatabaseConnection connection = new DatabaseConnection();
+  private final DatabaseConnection connection;
 
-  /**
+    public DonationDAO(DatabaseConnection connection) {
+        this.connection = connection;
+    }
+
+    /**
    * Gets the total ammount of donations for a given charity, and sends it to the database throught
    * MySQL.
    *
    * @param charity
    * @param amount
    */
-  public static void addDonation(Charity charity, User user, double amount) {
+  public void addDonation(Charity charity, User user, double amount) {
     String sql_query =
         """
                 INSERT INTO Donations (UUID_Donations, amount, date, charity_id, user_id)

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/UserDAO.java → helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/UserDAO.java

@@ -1,4 +1,4 @@
-package ntnu.systemutvikling.team6.DAO;
+package ntnu.systemutvikling.team6.database.DAO;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -14,16 +14,21 @@
  */
 public class UserDAO {
 
-  private static final DatabaseConnection connection = new DatabaseConnection();
+  private final DatabaseConnection connection;
 
-  /**
+    public UserDAO(DatabaseConnection connection) {
+        this.connection = connection;
+    }
+
+    /**
    * Gets the user and settings information and sends it to the database through MySQL.
    *
+   *
    * @param user the user to be saved in the database.
    * @throws RuntimeException if a database error occurs during the operation
+   * @return true or false based on if the register is a success or not
    */
-  public static void registerUser(User user) {
-
+  public boolean registerUser(User user) {
     String userSql =
         """
       INSERT INTO User (
@@ -48,20 +53,23 @@ INSERT INTO Settings (
       VALUES (?, ?, ?, ?)
         """;
 
+    int psUserRows = 0;
+    int psSettingsRows = 0;
+
     try (Connection conn = connection.getMySqlConnection()) {
 
       conn.setAutoCommit(false);
 
       try (PreparedStatement psUser = conn.prepareStatement(userSql)) {
 
         psUser.setString(1, user.getId().toString());
-        psUser.setString(2, user.getName()); // display name
-        psUser.setString(3, user.getName()); // username
+        psUser.setString(2, user.getDisplayName()); // display name
+        psUser.setString(3, user.getUsername()); // username
         psUser.setString(4, user.getEmail());
         psUser.setString(5, user.getPasswordHash());
         psUser.setString(6, user.getRole().name());
 
-        psUser.executeUpdate();
+        psUserRows = psUser.executeUpdate();
       }
 
       try (PreparedStatement psSettings = conn.prepareStatement(settingsSql)) {
@@ -71,13 +79,16 @@ INSERT INTO Settings (
         psSettings.setString(3, user.getSettings().getLanguage().name());
         psSettings.setBoolean(4, user.getSettings().isLightMode());
 
-        psSettings.executeUpdate();
+        psSettingsRows = psSettings.executeUpdate();
+
       }
 
       conn.commit();
 
+      return psUserRows > 0 && psSettingsRows > 0;
     } catch (SQLException e) {
-      throw new RuntimeException("Failed to insert user into database", e);
+      e.printStackTrace();
+      return false;
     }
   }
 }

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseSetup.java

@@ -42,7 +42,6 @@ public boolean testConnection() {
       System.out.println("Database connection failed.");
       e.printStackTrace();
     }
-
     return false;
   }
 
@@ -74,6 +73,7 @@ PRIMARY KEY (`UUID_charities`),
         CREATE TABLE IF NOT EXISTS `apbaluna`.`Donations` (
           `UUID_Donations` CHAR(36) NOT NULL,
           `amount` DECIMAL NOT NULL,
+          `isAnonymous` TINYINT NOT NULL,
           `date` DATE NOT NULL,
           `charity_id` CHAR(36) NOT NULL,
           `user_id` CHAR(36) NOT NULL,
@@ -260,12 +260,11 @@ FOREIGN KEY (`User_UUID_User`)
         `key_values` TEXT NULL,
         `logoBLOB` MEDIUMBLOB NULL,
         INDEX `fk_CharityVanity_Charities1_idx` (`UUID_charity` ASC) VISIBLE,
-        PRIMARY KEY (`UUID_charity`),
         CONSTRAINT `fk_CharityVanity_Charities1`
           FOREIGN KEY (`UUID_charity`)
           REFERENCES `apbaluna`.`Charities` (`UUID_charities`)
           ON DELETE NO ACTION
-          ON UPDATE NO ACTION)
+          ON UPDATE CASCADE)
       ENGINE = InnoDB;
     """;