Merge dev into main

.gitignore

@@ -40,5 +40,5 @@ build/
 .DS_Store
 
 ### data ###
-*.db
+givehope.db
 /data/

pom.xml

@@ -17,8 +17,6 @@
     </properties>
 
     <dependencies>
-
-        <!-- JavaFX -->
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
@@ -31,7 +29,6 @@
             <version>${javafx.version}</version>
         </dependency>
 
-        <!-- JUnit -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -42,7 +39,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.17.0</version>
+            <version>2.18.3</version>
         </dependency>
 
         <dependency>
@@ -51,28 +48,34 @@
             <version>3.46.1.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.17.2</version>
+        </dependency>
+
     </dependencies>
 
     <build>
         <plugins>
-
-            <!-- JavaFX Plugin -->
             <plugin>
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.8</version>
                 <configuration>
-                    <mainClass>ui.GiveHopeGIU</mainClass>
+                    <mainClass>app.Main</mainClass>
+                    <options>
+                        <option>-Dfile.encoding=UTF-8</option>
+                        <option>-Dstdout.encoding=UTF-8</option>
+                    </options>
                 </configuration>
             </plugin>
 
-            <!-- Surefire for JUnit -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.5.4</version>
             </plugin>
-
         </plugins>
     </build>
 </project>

src/main/java/app/Main.java

@@ -1,63 +1,87 @@
 package app;
 
+import domain.organization.Organization;
+import integration.OrganizationDetails;
+import integration.InnsamlingskontrollenClient;
 import application.security.PasswordHasher;
-import application.user.UserRegister;
 import domain.donation.Donation;
-import domain.organization.Organization;
 import domain.user.User;
-import integration.InnsamlingskontrollenClient;
 import integration.security.Sha256PasswordHasher;
 import java.math.BigDecimal;
-import java.util.List;
-import persistence.DonationDao;
-import persistence.OrganizationDao;
-import persistence.UserDao;
-import persistence.UserRepository;
+import java.sql.SQLException;
+
+import persistence.dao.DonationDao;
+import persistence.dao.OrganizationDao;
+import persistence.dao.UserDao;
 import persistence.db.Database;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 
-public class Main {
+public class Main extends Application{
   public static void main(String[] args) {
-    try {
-      Database.getConnection();
-      System.out.println("Database connected");
-
-      UserDao userDao = new UserDao();
-      OrganizationDao orgDao = new OrganizationDao();
-      DonationDao donationDao = new DonationDao();
-
-      PasswordHasher hasher = new Sha256PasswordHasher();
-      UserRepository userRepo = new UserDao();
-      UserRegister userReg = new UserRegister(hasher, userRepo);
-
-      // Test brukerregistrering
-      userReg.execute("testuser", "12345678", "passord123", "test@example.com");
-      System.out.println("Inserted user!");
-
-      User user = userDao.findByEmail("test@example.com").orElseThrow();
-      System.out.println("Hentet bruker: " + user.getUsername() + ", id=" + user.getID());
-
-      // Hent og lagre organisasjoner fra Innsamlingskontrollen
-      System.out.println("Henter organisasjoner fra Innsamlingskontrollen...");
-      Organization[] fetchedOrgs = InnsamlingskontrollenClient.fetchOrganizations();
-      for (Organization org : fetchedOrgs) {
-        orgDao.insert(org);
+    launch(args);
+  }
+
+  @Override
+  public void start(Stage stage) throws Exception {
+    Database.initializeDatabase();
+    System.out.println("DB path: " + new java.io.File("givehope.db").getAbsolutePath());
+    OrganizationDetails details = InnsamlingskontrollenClient.fetchDetails(
+        "https://www.innsamlingskontrollen.no/organisasjoner/caritas-norge/"
+    );
+    System.out.println("Description: " + details.getDescription());
+    System.out.println("Logo: " + details.getLogoUrl());
+    OrganizationDao orgDao = new OrganizationDao();
+    Organization[] orgs = InnsamlingskontrollenClient.fetchOrganizations();
+    for (Organization org : orgs) {
+      orgDao.insert(org);
       }
-      System.out.println("Lastet inn " + fetchedOrgs.length + " organisasjoner");
 
-      List<Organization> orgs = orgDao.getAll();
-      System.out.println("Organisasjoner i DB: " + orgs.size());
-      System.out.println("Første org: " + orgs.get(0).getName() + ", org_number=" + orgs.get(0).getOrgNumber());
+    addTestdata();
 
-      // Test donasjon med første org fra DB
-      Donation donation = new Donation(new BigDecimal("100.00"), user, orgs.get(0));
-      donationDao.insert(donation);
-      System.out.println("Inserted donation, id=" + donation.getId());
+    Parent root = FXMLLoader.load(getClass().getResource("/view/MainView.fxml"));
+    Scene scene = new Scene(root, 1275, 725);
+
+    stage.setTitle("GiveHope");
+    stage.setScene(scene);
+    stage.show();
+  }
 
-      List<Donation> donations = donationDao.findByUser(user.getID());
-      System.out.println("Antall donasjoner for bruker: " + donations.size());
+  private void addTestdata() throws SQLException {
+    UserDao userDao = new UserDao();
+    DonationDao donationDao = new DonationDao();
+    OrganizationDao orgDao = new OrganizationDao();
 
-    } catch (Exception e) {
-      e.printStackTrace();
+    if (userDao.existsByEmail("test@test.no")) return;
+
+    PasswordHasher hasher = new Sha256PasswordHasher();
+    String hashedPassword = hasher.hash("test");
+    User user = new User("test", "12345678", hashedPassword, "test@test.no");
+    userDao.insert(user);
+
+    Organization org = orgDao.getAll().get(0);
+
+    donationDao.insert(new Donation(new BigDecimal(100), user, org));
+    donationDao.insert(new Donation(new BigDecimal(250), user, org));
+    donationDao.insert(new Donation(new BigDecimal(500), user, org));
+    donationDao.insert(new Donation(new BigDecimal(300), user, org));
+    donationDao.insert(new Donation(new BigDecimal(1000), user, org));
+    donationDao.insert(new Donation(new BigDecimal(700), user, org));
+    donationDao.insert(new Donation(new BigDecimal(250), user, org));
+
+    if (!userDao.existsByEmail("test2@test.no")) {
+      String hashedPassword2 = hasher.hash("test2");
+      User user2 = new User("test2", "87654321", hashedPassword2, "test2@test.no");
+      userDao.insert(user2);
+
+      Organization org2 = orgDao.getAll().get(1);
+
+      donationDao.insert(new Donation(new BigDecimal(150), user2, org2));
+      donationDao.insert(new Donation(new BigDecimal(400), user2, org2));
+      donationDao.insert(new Donation(new BigDecimal(600), user2, org2));
+    }
     }
-  }
 }

src/main/java/application/security/PasswordHasher.java

@@ -1,5 +1,9 @@
 package application.security;
 
+/**
+ * Interface that creates a "contract" for which methods the class that implements it, needs.
+ * Interface is created for SHA256PasswordHasher.
+ */
 public interface PasswordHasher {
 
     String hash(String password);

src/main/java/application/user/UserDonate.java

@@ -0,0 +1,33 @@
+package application.user;
+
+import domain.donation.Donation;
+import domain.organization.Organization;
+import domain.user.User;
+import persistence.dao.DonationDao;
+import java.math.BigDecimal;
+
+/**
+ * Use case for handling donations made by a user to an organization.
+ * Creates a {@link Donation} and persists it to the database.
+ */
+public class UserDonate {
+    private final DonationDao donationDao;
+
+    /**
+     * Creates a new {@code UserDonate} with a default {@link DonationDao}.
+     */
+    public UserDonate() {
+        this.donationDao = new DonationDao();
+    }
+
+    /**
+     * Executes the donation use case by creating and saving a donation.
+     * @param user the user making the donation
+     * @param org the organization receiving the donation
+     * @param amount the donation amount in NOK
+     */
+    public void execute(User user, Organization org, BigDecimal amount) {
+        Donation donation = new Donation(amount, user, org);
+        donationDao.insert(donation);
+    }
+}

src/main/java/application/user/UserLogin.java

@@ -2,7 +2,7 @@
 
 import application.security.PasswordHasher;
 import domain.user.User;
-import persistence.UserRepository;
+import persistence.dao.UserRepository;
 
 public class UserLogin {
 
@@ -16,7 +16,7 @@ public UserLogin(PasswordHasher hasher, UserRepository repo) {
 
     public User execute(String login, String password) {
         // normalize (trim etc.)
-        login.trim().toLowerCase();
+        login = login.trim().toLowerCase();
 
         User user = repo.findByLogin(login)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid credentials"));

src/main/java/application/user/UserRegister.java

@@ -2,38 +2,57 @@
 
 import application.security.PasswordHasher;
 import domain.user.User;
-import persistence.UserRepository;
-
+import persistence.dao.UserRepository;
+
+/**
+ * The UserRegister class is responsible for handling the user registration process.
+ * It ensures that the provided user details meet the necessary criteria and that
+ * the username and email are not already in use. It also hashes the user's password
+ * before saving the user information into the repository.
+ */
 public class UserRegister {
 
     private final PasswordHasher hasher;
     private final UserRepository repo;
 
-    public UserRegister(PasswordHasher hasher, UserRepository repo) {
+  /**
+   * Constructs a {@code UserRegister} instance responsible for handling the user registration process.
+   * It ensures user details meet validation criteria, such as uniqueness of username and email,
+   * and hashes passwords before saving user information into the repository.
+   *
+   * @param hasher a {@code PasswordHasher} implementation used to hash user passwords.
+   * @param repo a {@code UserRepository} implementation responsible for storing user data.
+   */
+  public UserRegister(PasswordHasher hasher, UserRepository repo) {
         this.hasher = hasher;
         this.repo = repo;
     }
 
+  /**
+   * Executes a user registration.
+   * Validation checks, checks if username or e-mail already exists.
+   * Hashes inputted password using PasswordHasher, that uses SHA256PasswordHasher.
+   * Creates user object, and inserts it into UserRepository using insert method.
+   * @param username
+   * @param phoneNumber
+   * @param password
+   * @param email
+   */
     public void execute(String username, String phoneNumber, String password, String email) {
         username = username.trim();
         email = email.trim().toLowerCase();
         phoneNumber = phoneNumber.trim();
 
-        // duplicate check (repo.existsByEmail)
         if (repo.existsByEmail(email)) {
             throw new IllegalArgumentException("Email already in use");
         }
         if (repo.existsByUsername(username)) {
             throw new IllegalArgumentException("This username is taken");
         }
 
-        // hash password (optional)
         String hashedPassword = hasher.hash(password);
 
-        // new User(...)  (domain validates)
         User user = new User(username, phoneNumber, hashedPassword, email);
-
-        // saves user
         repo.insert(user);
     }
 }

src/main/java/application/user/UserSignIn.java

@@ -0,0 +1,52 @@
+package application.user;
+
+import application.security.PasswordHasher;
+import domain.user.User;
+import persistence.dao.UserRepository;
+
+/**
+ * The UserSignIn class handles the process of user authentication.
+ * It verifies the input credentials (login and password) against the stored user data.
+ * The password is validated through hashing and comparison with the stored hash.
+ */
+public class UserSignIn {
+
+    private final PasswordHasher hasher;
+    private final UserRepository repo;
+
+  /**
+   * Constructs a {@code UserSignIn} instance responsible for user authentication.
+   * It handles the process of verifying user credentials by comparing the provided
+   * input with stored data in the repository and validating the password through hashing.
+   *
+   * @param hasher a {@code PasswordHasher} implementation used to hash and validate user passwords.
+   * @param repo a {@code UserRepository} implementation that stores user authentication data.
+   */
+  public UserSignIn(PasswordHasher hasher, UserRepository repo) {
+        this.hasher = hasher;
+        this.repo = repo;
+    }
+
+  /**
+   * Execute methods, that takes in inputted login and password.
+   * Checks via UserRepository if login exists in database.
+   * Compares hashed input password with hashed password in database.
+   * @param login inputted login by user
+   * @param password inputted password by user
+   * @return user object, if it exists.
+   */
+    public User execute(String login, String password) {
+        login.trim().toLowerCase();
+
+        User user = repo.findByLogin(login)
+                .orElseThrow(() -> new IllegalArgumentException("Invalid credentials"));
+
+        String hashedInput = hasher.hash(password);
+
+        if (!hashedInput.equals(user.getPassword())) {
+            throw new IllegalArgumentException("Invalid password");
+        }
+
+        return user;
+    }
+}