Maven: mvn clean

cathrkri · Apr 12, 2026 · 7d0960c · 7d0960c
1 parent 8d3c6f1
commit 7d0960c
Show file tree

Hide file tree

Showing 12 changed files with 322 additions and 268 deletions.
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
@@ -3,14 +3,14 @@
 import static javafx.application.Application.launch;
 
 import java.net.http.HttpClient;
-
 import javafx.application.Application;
 import javafx.stage.Stage;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
 import ntnu.systemutvikling.team6.database.DatabaseSetup;
 import ntnu.systemutvikling.team6.models.Charity;
 import ntnu.systemutvikling.team6.models.CharityRegistry;
 import ntnu.systemutvikling.team6.scraper.APICharityScraper;
+import ntnu.systemutvikling.team6.service.APIToDatabaseService;
 
 public class HmHApplication extends Application {
   @Override
@@ -50,7 +50,7 @@ public void init() {
       HttpClient https = HttpClient.newHttpClient();
       APICharityScraper scraper = new APICharityScraper(https);
       DatabaseConnection conn = new DatabaseConnection();
-      DatabaseSetup db = new DatabaseSetup(conn);
+      APIToDatabaseService db = new APIToDatabaseService(conn);
 
       if (scraper.checkConnection()) {
         CharityRegistry charityRegistry = scraper.parseJSON(scraper.getJSONData());

diff --git a/.../src/main/java/ntnu/systemutvikling/team6/controller/AvailableOrganizationController.java b/.../src/main/java/ntnu/systemutvikling/team6/controller/AvailableOrganizationController.java
@@ -10,7 +10,7 @@
 import javafx.scene.control.TextField;
 import javafx.scene.layout.FlowPane;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
-import ntnu.systemutvikling.team6.database.DatabaseSetup;
+import ntnu.systemutvikling.team6.database.Readers.CharitySelect;
 import ntnu.systemutvikling.team6.models.Charity;
 import ntnu.systemutvikling.team6.models.CharityRegistry;
 
@@ -40,7 +40,7 @@ public class AvailableOrganizationController {
   @FXML
   public void initialize() {
     DatabaseConnection conn = new DatabaseConnection();
-    DatabaseSetup db = new DatabaseSetup(conn);
+    CharitySelect db = new CharitySelect(conn);
     CharityRegistry charities = db.getCharitiesFromDB();
     allCharities = charities.getAllCharities();
 

diff --git a/...papplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java b/...papplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java
@@ -13,7 +13,6 @@
 import javafx.scene.control.TextField;
 import javafx.scene.layout.FlowPane;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
-import ntnu.systemutvikling.team6.database.DatabaseSetup;
 import ntnu.systemutvikling.team6.database.Readers.CharitySelect;
 import ntnu.systemutvikling.team6.database.Readers.DonationSelect;
 import ntnu.systemutvikling.team6.models.Charity;

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseSetup.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseSetup.java
@@ -1,22 +1,14 @@
 package ntnu.systemutvikling.team6.database;
 
 import java.sql.*;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.UUID;
-
 import ntnu.systemutvikling.team6.models.*;
 import ntnu.systemutvikling.team6.models.user.*;
-import ntnu.systemutvikling.team6.scraper.APICharityData;
 
 /**
- * Manages the Database with MySQL tables and JDBC.
+ * Manages the Database with MySQL tables and test connection.
  *
- * <p>This class is responsible for creating the tables needed for the application, if not done
- * already and maintaining the {@code charities} table based on data retrieved from the IK API. It
- * is also responsible for retrieving the data from the database and sending it to the application
- * through the CharityRegistry and DonationRegistry. It is used by the FrontpageController to
- * retrieve the data needed to display the charities
+ * <p>This class object is able to create MySQL to ntnu localized database and able to
+ * testConnection to it.
  */
 public class DatabaseSetup {
   private final DatabaseConnection connection;
@@ -57,8 +49,6 @@ public boolean testConnection() {
   /**
    * Creates the {@code Charities} and {@code Donations} tables if they do not already exist.
    *
-   * <p>The table structure for Charities is based on fields from {@link APICharityData}.
-   *
    * @throws RuntimeException if a {@link SQLException} occurs while creating the table
    */
   public void createTables() {
@@ -281,4 +271,4 @@ FOREIGN KEY (`User_UUID_User`)
       throw new RuntimeException("Error creating table.");
     }
   }
-}
+}
diff --git a/...application/src/main/java/ntnu/systemutvikling/team6/database/Readers/DonationSelect.java b/...application/src/main/java/ntnu/systemutvikling/team6/database/Readers/DonationSelect.java
@@ -1,28 +1,28 @@
 package ntnu.systemutvikling.team6.database.Readers;
 
-import ntnu.systemutvikling.team6.database.DatabaseConnection;
-import ntnu.systemutvikling.team6.models.Charity;
-import ntnu.systemutvikling.team6.models.Donation;
-import ntnu.systemutvikling.team6.models.DonationRegistry;
-
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import ntnu.systemutvikling.team6.database.DatabaseConnection;
+import ntnu.systemutvikling.team6.models.Charity;
+import ntnu.systemutvikling.team6.models.Donation;
+import ntnu.systemutvikling.team6.models.DonationRegistry;
 
 public class DonationSelect {
-    private final DatabaseConnection connection;
+  private final DatabaseConnection connection;
 
-    public DonationSelect (DatabaseConnection connection){
-        this.connection = connection;
-    }
-    public DonationRegistry getDonationFromDB() {
-        DonationRegistry registry = null;
-        Connection conn = null;
-        try {
-            conn = connection.getMySqlConnection();
-            String sql_query =
-                    """
+  public DonationSelect(DatabaseConnection connection) {
+    this.connection = connection;
+  }
+
+  public DonationRegistry getDonationFromDB() {
+    DonationRegistry registry = null;
+    Connection conn = null;
+    try {
+      conn = connection.getMySqlConnection();
+      String sql_query =
+          """
                 SELECT
                 d.UUID_Donations,
                 d.amount,
@@ -37,32 +37,32 @@ public DonationRegistry getDonationFromDB() {
                 JOIN Charities c
                 ON d.Charities_UUID_charities = c.UUID_charities
                 """;
-            Statement stmt = conn.createStatement();
-            ResultSet rs = stmt.executeQuery(sql_query);
+      Statement stmt = conn.createStatement();
+      ResultSet rs = stmt.executeQuery(sql_query);
 
-            registry = new DonationRegistry();
-            while (rs.next()) {
-                Charity charity =
-                        new Charity(
-                                rs.getString("UUID_charities"),
-                                rs.getString("org_number"),
-                                rs.getString("charity_name"),
-                                rs.getString("charity_link"),
-                                rs.getBoolean("pre_approved"),
-                                rs.getString("status"));
+      registry = new DonationRegistry();
+      while (rs.next()) {
+        Charity charity =
+            new Charity(
+                rs.getString("UUID_charities"),
+                rs.getString("org_number"),
+                rs.getString("charity_name"),
+                rs.getString("charity_link"),
+                rs.getBoolean("pre_approved"),
+                rs.getString("status"));
 
-                Donation donation =
-                        new Donation(
-                                rs.getString("UUID_Donations"),
-                                rs.getDouble("amount"),
-                                rs.getDate("date").toLocalDate(),
-                                charity);
-                registry.addDonation(donation);
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-            throw new RuntimeException("ERROR: Something went wrong during updating charities table.");
-        }
-        return registry;
+        Donation donation =
+            new Donation(
+                rs.getString("UUID_Donations"),
+                rs.getDouble("amount"),
+                rs.getDate("date").toLocalDate(),
+                charity);
+        registry.addDonation(donation);
+      }
+    } catch (SQLException e) {
+      e.printStackTrace();
+      throw new RuntimeException("ERROR: Something went wrong during updating charities table.");
     }
+    return registry;
+  }
 }