Hotfix/63 hotfix database and api correction

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();

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

@@ -7,8 +7,8 @@
 import ntnu.systemutvikling.team6.models.user.User;
 
 /**
- * This class is responsible for sending concurrent information about the user to the User
- * database, and user settings to the settings database.
+ * This class is responsible for sending concurrent information about the user to the User database,
+ * and user settings to the settings database.
  *
  * @author Robin Strand Prestmo
  */

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

@@ -9,7 +9,7 @@
 import ntnu.systemutvikling.team6.database.DatabaseSetup;
 import ntnu.systemutvikling.team6.models.Charity;
 import ntnu.systemutvikling.team6.models.registry.CharityRegistry;
-import ntnu.systemutvikling.team6.scraper.APICharityScraper;
+import ntnu.systemutvikling.team6.scraper.scraperComponents.APICharityScraper;
 import ntnu.systemutvikling.team6.service.APIToDatabaseService;
 
 public class HmHApplication extends Application {
@@ -49,6 +49,7 @@ public void init() {
     try {
       HttpClient https = HttpClient.newHttpClient();
       APICharityScraper scraper = new APICharityScraper(https);
+
       DatabaseConnection conn = new DatabaseConnection();
       APIToDatabaseService db = new APIToDatabaseService(conn);
 

helpmehelpapplication/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);
   }
 
   /**

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

@@ -16,8 +16,8 @@
 import ntnu.systemutvikling.team6.database.Readers.CharitySelect;
 import ntnu.systemutvikling.team6.database.Readers.DonationSelect;
 import ntnu.systemutvikling.team6.models.Charity;
-import ntnu.systemutvikling.team6.models.registry.CharityRegistry;
 import ntnu.systemutvikling.team6.models.Donation;
+import ntnu.systemutvikling.team6.models.registry.CharityRegistry;
 import ntnu.systemutvikling.team6.models.registry.DonationRegistry;
 
 /**