Fix: DonationDAO tests and database setup will still fail because of …

…foreign key contraint but hey all work
cathrkri · Apr 14, 2026 · c0e9652 · c0e9652
1 parent 6e54d0a
commit c0e9652
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/DonationDAO.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/DonationDAO.java
@@ -4,6 +4,7 @@
 import java.util.UUID;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
 import ntnu.systemutvikling.team6.models.Charity;
+import ntnu.systemutvikling.team6.models.user.User;
 
 /**
  * This class is responsible for sending concurrent information about the donation to the Donation
@@ -19,11 +20,11 @@ public class DonationDAO {
    * @param charity
    * @param amount
    */
-  public static void addDonation(Charity charity, double amount) {
+  public static void addDonation(Charity charity, User user, double amount) {
     String sql_query =
         """
-                INSERT INTO Donations (UUID_Donations, amount, date, Charities_UUID_charities)
-                VALUES (?, ?, ?, ?)
+                INSERT INTO Donations (UUID_Donations, amount, date, charity_id, user_id)
+                VALUES (?, ?, ?, ?, ?)
                 """;
     try (Connection conn = connection.getMySqlConnection();
         PreparedStatement ps = conn.prepareStatement(sql_query)) {
@@ -33,6 +34,8 @@ INSERT INTO Donations (UUID_Donations, amount, date, Charities_UUID_charities)
       ps.setDouble(2, amount);
       ps.setDate(3, new Date(System.currentTimeMillis()));
       ps.setString(4, charity.getUUID().toString());
+      ps.setString(5, user.getId().toString());
+
 
       ps.executeUpdate();
       conn.commit();

diff --git a/...plication/src/main/java/ntnu/systemutvikling/team6/controller/DonationPageController.java b/...plication/src/main/java/ntnu/systemutvikling/team6/controller/DonationPageController.java
@@ -9,6 +9,7 @@
 import javafx.scene.control.TextField;
 import ntnu.systemutvikling.team6.DAO.DonationDAO;
 import ntnu.systemutvikling.team6.models.Charity;
+import ntnu.systemutvikling.team6.models.user.User;
 
 /**
  * This controller represents the donation page, where the user can enter a donation amount and
@@ -97,7 +98,7 @@ public void Donate(ActionEvent event) {
 
     if (result.isPresent() && result.get() == ButtonType.OK) {
       // Process donation
-      processDonation(charity, amount);
+      //processDonation(charity, user, amount);
       showAlert(
           Alert.AlertType.INFORMATION,
           "Thank you!",
@@ -114,8 +115,8 @@ public void Donate(ActionEvent event) {
    * @param charity
    * @param amount
    */
-  public void processDonation(Charity charity, double amount) {
-    DonationDAO.addDonation(charity, amount);
+  public void processDonation(Charity charity, User user, double amount) {
+    DonationDAO.addDonation(charity, user, amount);
   }
 
   /**

diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/DAO/DonationDAOTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/DAO/DonationDAOTest.java
@@ -5,9 +5,12 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.util.UUID;
+
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
 import ntnu.systemutvikling.team6.database.DatabaseSetup;
 import ntnu.systemutvikling.team6.models.Charity;
+import ntnu.systemutvikling.team6.models.user.User;
 import ntnu.systemutvikling.team6.service.APIToDatabaseService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -38,12 +41,11 @@ void setUp() {
   void addDonationShouldInsertDonationIntoDatabase() throws Exception {
     double amount = 100.0;
 
-    DonationDAO.addDonation(charity, amount);
+    DonationDAO.addDonation(charity, new User(UUID.randomUUID().toString(), "ad", "dwad@ca.com", "CHARITY_USER", "NORMAL_USER"), amount);
 
     try (Connection conn = new DatabaseConnection().getMySqlConnection()) {
-
       PreparedStatement stmt =
-          conn.prepareStatement("SELECT amount FROM Donations WHERE Charities_UUID_charities = ?");
+          conn.prepareStatement("SELECT amount FROM Donations WHERE charity_id = ?");
 
       stmt.setString(1, charity.getUUID().toString());