Feat: Moved DAO objects into database, cuz they interact with database

cathrkri · Apr 15, 2026 · 02dfb32 · 02dfb32
1 parent 0b42690
commit 02dfb32
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...ystemutvikling/team6/DAO/DonationDAO.java → ...kling/team6/database/DAO/DonationDAO.java b/...ystemutvikling/team6/DAO/DonationDAO.java → ...kling/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;

diff --git a/...nu/systemutvikling/team6/DAO/UserDAO.java → ...utvikling/team6/database/DAO/UserDAO.java b/...nu/systemutvikling/team6/DAO/UserDAO.java → ...utvikling/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;
@@ -55,8 +55,8 @@ INSERT INTO Settings (
       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());

diff --git a/...mutvikling/team6/DAO/DonationDAOTest.java → ...g/team6/database/DAO/DonationDAOTest.java b/...mutvikling/team6/DAO/DonationDAOTest.java → ...g/team6/database/DAO/DonationDAOTest.java
@@ -1,4 +1,4 @@
-package ntnu.systemutvikling.team6.DAO;
+package ntnu.systemutvikling.team6.database.DAO;
 
 import static org.junit.jupiter.api.Assertions.*;