From 7d0960ccb57c30d229f5cab8997700ceb6d65522 Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Sun, 12 Apr 2026 20:36:22 +0200 Subject: [PATCH] Maven: mvn clean --- .../systemutvikling/team6/HmHApplication.java | 4 +- .../AvailableOrganizationController.java | 4 +- .../team6/controller/FrontpageController.java | 1 - .../team6/database/DatabaseSetup.java | 18 +- .../database/Readers/DonationSelect.java | 82 ++-- .../team6/database/Readers/UserSelect.java | 400 +++++++++++------- .../systemutvikling/team6/models/Charity.java | 5 +- .../team6/models/Feedback.java | 3 - .../team6/models/UserRegistry.java | 49 +-- .../team6/models/user/Message.java | 4 +- .../team6/models/user/Settings.java | 1 - .../team6/models/user/User.java | 19 +- 12 files changed, 322 insertions(+), 268 deletions(-) diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java index da9cebb..b910eb3 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java @@ -3,7 +3,6 @@ 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; @@ -11,6 +10,7 @@ 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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/AvailableOrganizationController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/AvailableOrganizationController.java index 139a5d2..f29ee61 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/AvailableOrganizationController.java +++ b/helpmehelpapplication/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java index 9ce1e2e..7fa2b6c 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java +++ b/helpmehelpapplication/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 index 421c8bc..62de2e8 100644 --- 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. * - *

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 + *

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. * - *

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."); } } -} \ No newline at end of file +} diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/DonationSelect.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/DonationSelect.java index 97bc639..abcca9a 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/DonationSelect.java +++ b/helpmehelpapplication/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; + } } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/UserSelect.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/UserSelect.java index e232d08..b62ebae 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/UserSelect.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/UserSelect.java @@ -1,89 +1,159 @@ package ntnu.systemutvikling.team6.database.Readers; -import ntnu.systemutvikling.team6.database.DatabaseConnection; -import ntnu.systemutvikling.team6.models.UserRegistry; -import ntnu.systemutvikling.team6.models.user.*; - import java.sql.*; import java.time.LocalDate; import java.util.UUID; +import ntnu.systemutvikling.team6.database.DatabaseConnection; +import ntnu.systemutvikling.team6.models.UserRegistry; +import ntnu.systemutvikling.team6.models.user.*; +import ntnu.systemutvikling.team6.security.PasswordHasher; public class UserSelect { - private final DatabaseConnection connection; + private final DatabaseConnection connection; + + public UserSelect(DatabaseConnection connection) { + this.connection = connection; + } + + public User getUserFromDBUsernameAndPassword(String username, String password) { + PasswordHasher hasher = new PasswordHasher(); + String hashedpassword = hasher.getHashPassword(password); + + User user = null; + Connection conn = null; + try { + conn = connection.getMySqlConnection(); + String sql_query = + """ + SELECT + u.UUID_User, u.user_name, u.user_email, u.user_password, u.role, + s.User_UUID_User, s.isAnonymous, s.language, s.lightmode, + m.UUID_message, m.message_title, m.message_content, m.message_date, m.sender_user_id, m.sender_charity_id, m.user_id + FROM User u + LEFT JOIN Settings s ON u.UUID_User = s.User_UUID_user + LEFT JOIN Messages m ON u.UUID_User = m.user_id + WHERE u.user_password = ? AND u.user_password = ?; + """; + PreparedStatement stmt = conn.prepareStatement(sql_query); + stmt.setString(1, username); + stmt.setString(2, hashedpassword); - public UserSelect(DatabaseConnection connection){ - this.connection = connection; + ResultSet rs = stmt.executeQuery(); + + String lastUserid = null; + while (rs.next()) { + String userId = rs.getString("UUID_User"); + if (lastUserid == null || !userId.equals(lastUserid)) { + user = + new User( + userId, + rs.getString("user_name"), + rs.getString("user_email"), + rs.getString("user_password"), + rs.getString("role")); + if (rs.getString("isAnonymous") != null) { + Settings settings = + new Settings( + rs.getBoolean("isAnonymous"), + Language.valueOf(rs.getString("language").toUpperCase()), + rs.getBoolean("lightmode")); + user.setSettings(settings); + } + user.setInbox(new Inbox()); + lastUserid = userId; + } + String messageId = rs.getString("UUID_message"); + if (messageId != null) { + Message message = + new Message( + rs.getString("message_title"), + UUID.fromString(rs.getString("sender_charity_id")), + rs.getString("message_content"), + LocalDate.parse(rs.getString("message_date"))); + + user.getInbox().addMessage(message); + } + } + } catch (SQLException e) { + e.printStackTrace(); + throw new RuntimeException("ERROR: Something went wrong during updating charities table."); + } finally { + conn = null; } + return user; + } - public User getUserFromDBUuid(String user_id){ - User user = null; - Connection conn = null; - try { - conn = connection.getMySqlConnection(); - String sql_query = - """ - SELECT + public User getUserFromDBUuid(String user_id) { + User user = null; + Connection conn = null; + try { + conn = connection.getMySqlConnection(); + String sql_query = + """ + SELECT u.UUID_User, u.user_name, u.user_email, u.user_password, u.role, s.User_UUID_User, s.isAnonymous, s.language, s.lightmode, m.UUID_message, m.message_title, m.message_content, m.message_date, m.sender_user_id, m.sender_charity_id, m.user_id FROM User u LEFT JOIN Settings s ON u.UUID_User = s.User_UUID_user LEFT JOIN Messages m ON u.UUID_User = m.user_id - WHERE u.UUID_User = ?; + WHERE u.UUID_User = ?; """; - PreparedStatement stmt = conn.prepareStatement(sql_query); - stmt.setString(1, user_id); - ResultSet rs = stmt.executeQuery(); - - String lastUserid = null; - while (rs.next()) { - String userId = rs.getString("UUID_User"); - if (lastUserid == null || !userId.equals(lastUserid)) { - user = new User( - userId, - rs.getString("user_name"), - rs.getString("user_email"), - rs.getString("user_password"), - rs.getString("role") - ); - if (rs.getString("isAnonymous") != null){ - Settings settings = new Settings( - rs.getBoolean("isAnonymous"), - Language.valueOf(rs.getString("language").toUpperCase()), - rs.getBoolean("lightmode") - ); - user.setSettings(settings); - } - user.setInbox(new Inbox()); - lastUserid = userId; - } - String messageId = rs.getString("UUID_message"); - if (messageId != null) { - Message message = new Message( - rs.getString("message_title"), - UUID.fromString(rs.getString("sender_charity_id")), - rs.getString("message_content"), - LocalDate.parse(rs.getString("message_date")) - ); - - user.getInbox().addMessage(message); - } - } - } catch (SQLException e) { - e.printStackTrace(); - throw new RuntimeException("ERROR: Something went wrong during updating charities table."); + PreparedStatement stmt = conn.prepareStatement(sql_query); + stmt.setString(1, user_id); + ResultSet rs = stmt.executeQuery(); + + String lastUserid = null; + while (rs.next()) { + String userId = rs.getString("UUID_User"); + if (lastUserid == null || !userId.equals(lastUserid)) { + user = + new User( + userId, + rs.getString("user_name"), + rs.getString("user_email"), + rs.getString("user_password"), + rs.getString("role")); + if (rs.getString("isAnonymous") != null) { + Settings settings = + new Settings( + rs.getBoolean("isAnonymous"), + Language.valueOf(rs.getString("language").toUpperCase()), + rs.getBoolean("lightmode")); + user.setSettings(settings); + } + user.setInbox(new Inbox()); + lastUserid = userId; + } + String messageId = rs.getString("UUID_message"); + if (messageId != null) { + Message message = + new Message( + rs.getString("message_title"), + UUID.fromString(rs.getString("sender_charity_id")), + rs.getString("message_content"), + LocalDate.parse(rs.getString("message_date"))); + + user.getInbox().addMessage(message); } - return user; + } + } catch (SQLException e) { + e.printStackTrace(); + throw new RuntimeException("ERROR: Something went wrong during updating charities table."); + } finally { + conn = null; } + return user; + } - public UserRegistry getUsersFromDB(){ - UserRegistry registry = new UserRegistry(); - Connection conn = null; - try { - conn = connection.getMySqlConnection(); - String sql_query = - """ - SELECT + public UserRegistry getUsersFromDB() { + UserRegistry registry = new UserRegistry(); + Connection conn = null; + try { + conn = connection.getMySqlConnection(); + String sql_query = + """ + SELECT u.UUID_User, u.user_name, u.user_email, u.user_password, u.role, s.User_UUID_User, s.isAnonymous, s.language, s.lightmode, m.UUID_message, m.message_title, m.message_content, m.message_date, m.sender_user_id, m.sender_charity_id, m.user_id @@ -91,111 +161,117 @@ public UserRegistry getUsersFromDB(){ LEFT JOIN Settings s ON u.UUID_User = s.User_UUID_user LEFT JOIN Messages m ON u.UUID_User = m.user_id """; - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery(sql_query); - - User currentUser = null; - String lastUserid = null; - - while (rs.next()) { - String userId = rs.getString("UUID_User"); - - if (lastUserid == null || !userId.equals(lastUserid)) { - currentUser = new User( - userId, - rs.getString("user_name"), - rs.getString("user_email"), - rs.getString("user_password"), - rs.getString("role") - ); - if (rs.getString("isAnonymous") != null){ - Settings settings = new Settings( - rs.getBoolean("isAnonymous"), - Language.valueOf(rs.getString("language").toUpperCase()), - rs.getBoolean("lightmode") - ); - currentUser.setSettings(settings); - } - currentUser.setInbox(new Inbox()); - registry.addUser(currentUser); - lastUserid = userId; - } - String messageId = rs.getString("UUID_message"); - if (messageId != null) { - Message message = new Message( - rs.getString("message_title"), - UUID.fromString(rs.getString("sender_charity_id")), - rs.getString("message_content"), - LocalDate.parse(rs.getString("message_date")) - ); - - currentUser.getInbox().addMessage(message); - } - } - } catch (SQLException e) { - e.printStackTrace(); - throw new RuntimeException("ERROR: Something went wrong during updating charities table."); + Statement stmt = conn.createStatement(); + ResultSet rs = stmt.executeQuery(sql_query); + + User currentUser = null; + String lastUserid = null; + + while (rs.next()) { + String userId = rs.getString("UUID_User"); + + if (lastUserid == null || !userId.equals(lastUserid)) { + currentUser = + new User( + userId, + rs.getString("user_name"), + rs.getString("user_email"), + rs.getString("user_password"), + rs.getString("role")); + if (rs.getString("isAnonymous") != null) { + Settings settings = + new Settings( + rs.getBoolean("isAnonymous"), + Language.valueOf(rs.getString("language").toUpperCase()), + rs.getBoolean("lightmode")); + currentUser.setSettings(settings); + } + currentUser.setInbox(new Inbox()); + registry.addUser(currentUser); + lastUserid = userId; + } + String messageId = rs.getString("UUID_message"); + if (messageId != null) { + Message message = + new Message( + rs.getString("message_title"), + UUID.fromString(rs.getString("sender_charity_id")), + rs.getString("message_content"), + LocalDate.parse(rs.getString("message_date"))); + + currentUser.getInbox().addMessage(message); } - return registry; + } + } catch (SQLException e) { + e.printStackTrace(); + throw new RuntimeException("ERROR: Something went wrong during updating charities table."); + } finally { + conn = null; } + return registry; + } - public Settings getSettingsForUser(String user_id){ - Settings settings = null; - Connection conn = null; - try { - conn = connection.getMySqlConnection(); - String sql_query = - """ + public Settings getSettingsForUser(String user_id) { + Settings settings = null; + Connection conn = null; + try { + conn = connection.getMySqlConnection(); + String sql_query = + """ SELECT User_UUID_User, isAnonymous, language, lightmode FROM Settings - WHERE User_UUID_User = ?; + WHERE User_UUID_User = ?; """; - PreparedStatement stmt = conn.prepareStatement(sql_query); - stmt.setString(1, user_id); - stmt.setMaxRows(1); - ResultSet rs = stmt.executeQuery(); - - while (rs.next()) { - settings = new Settings( - rs.getBoolean("isAnonymous"), - Language.valueOf(rs.getString("language").toUpperCase()), - rs.getBoolean("lightmode") - ); - } - } catch (SQLException e) { - e.printStackTrace(); - throw new RuntimeException("ERROR: Something went wrong during updating charities table."); - } + PreparedStatement stmt = conn.prepareStatement(sql_query); + stmt.setString(1, user_id); + stmt.setMaxRows(1); + ResultSet rs = stmt.executeQuery(); - return settings; + while (rs.next()) { + settings = + new Settings( + rs.getBoolean("isAnonymous"), + Language.valueOf(rs.getString("language").toUpperCase()), + rs.getBoolean("lightmode")); + } + } catch (SQLException e) { + e.printStackTrace(); + throw new RuntimeException("ERROR: Something went wrong during updating charities table."); + } finally { + conn = null; } - public Inbox getInboxForUser(String user_id){ - Inbox inbox = new Inbox(); - Connection conn = null; - try { - conn = connection.getMySqlConnection(); - String sql_query = - """ + return settings; + } + + public Inbox getInboxForUser(String user_id) { + Inbox inbox = new Inbox(); + Connection conn = null; + try { + conn = connection.getMySqlConnection(); + String sql_query = + """ SELECT UUID_message, message_title, message_content, message_date, sender_user_id, sender_charity_id, user_id FROM Messages - WHERE user_id = ?; + WHERE user_id = ?; """; - PreparedStatement stmt = conn.prepareStatement(sql_query); - stmt.setString(1, user_id); - ResultSet rs = stmt.executeQuery(); - - while (rs.next()) { - Message message = new Message( - rs.getString("message_title"), - UUID.fromString(rs.getString("sender_charity_id")), - rs.getString("message_date"), - LocalDate.parse(rs.getString("message_date")) - ); - inbox.addMessage(message); - } - } catch (SQLException e) { - e.printStackTrace(); - throw new RuntimeException("ERROR: Something went wrong during updating charities table."); - } - return inbox; + PreparedStatement stmt = conn.prepareStatement(sql_query); + stmt.setString(1, user_id); + ResultSet rs = stmt.executeQuery(); + + while (rs.next()) { + Message message = + new Message( + rs.getString("message_title"), + UUID.fromString(rs.getString("sender_charity_id")), + rs.getString("message_date"), + LocalDate.parse(rs.getString("message_date"))); + inbox.addMessage(message); + } + } catch (SQLException e) { + e.printStackTrace(); + throw new RuntimeException("ERROR: Something went wrong during updating charities table."); + } finally { + conn = null; } + return inbox; + } } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Charity.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Charity.java index eaae882..fdae199 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Charity.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Charity.java @@ -125,12 +125,11 @@ public void setUnverified() { } /** - * Set method for feedbacks. - * Primarily will be used to set feedbacks taken from database. + * Set method for feedbacks. Primarily will be used to set feedbacks taken from database. * * @param feedbacks */ - public void setFeedbacks(ArrayList feedbacks){ + public void setFeedbacks(ArrayList feedbacks) { this.feedbacks = feedbacks; } } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Feedback.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Feedback.java index 75ce7bd..6e78c3b 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Feedback.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Feedback.java @@ -1,8 +1,6 @@ package ntnu.systemutvikling.team6.models; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Date; import java.util.UUID; import ntnu.systemutvikling.team6.models.user.User; @@ -42,7 +40,6 @@ public Feedback(User user, String comment) { * @param user The user who gives the feedback. * @param comment The content of the feedback. * @param feedback_date The content of the feedback. - */ public Feedback(String feedback_id, User user, String feedback_comment, LocalDate feedback_date) { this.feedbackId = UUID.fromString(feedback_id); diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/UserRegistry.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/UserRegistry.java index 3035d48..454fc11 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/UserRegistry.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/UserRegistry.java @@ -1,40 +1,37 @@ package ntnu.systemutvikling.team6.models; -import ntnu.systemutvikling.team6.models.user.User; - import java.util.*; +import ntnu.systemutvikling.team6.models.user.User; public class UserRegistry { - private final List Users; + private final List Users; - public UserRegistry() { - this.Users = new ArrayList<>(); - } + public UserRegistry() { + this.Users = new ArrayList<>(); + } - public List getAllUsers() { - return Collections.unmodifiableList(Users); - } + public List getAllUsers() { + return Collections.unmodifiableList(Users); + } - public Optional findUserById(UUID userUUID) { - if (userUUID == null) { - throw new IllegalArgumentException("DonationId can not be null."); - } - return Users.stream() - .filter(u -> userUUID.equals(u.getId())) - .findFirst(); + public Optional findUserById(UUID userUUID) { + if (userUUID == null) { + throw new IllegalArgumentException("DonationId can not be null."); } + return Users.stream().filter(u -> userUUID.equals(u.getId())).findFirst(); + } - public void addUser(User user) { - if (user == null) { - throw new IllegalArgumentException("Donation can not be null."); - } - Users.add(user); + public void addUser(User user) { + if (user == null) { + throw new IllegalArgumentException("Donation can not be null."); } + Users.add(user); + } - public boolean removeUserByUUID(UUID userUUID) { - if (userUUID == null) { - throw new IllegalArgumentException("DonationId can not be null."); - } - return Users.removeIf(user -> userUUID.equals(user.getId())); + public boolean removeUserByUUID(UUID userUUID) { + if (userUUID == null) { + throw new IllegalArgumentException("DonationId can not be null."); } + return Users.removeIf(user -> userUUID.equals(user.getId())); + } } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Message.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Message.java index 3f0fe44..3a2a75d 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Message.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Message.java @@ -1,7 +1,6 @@ package ntnu.systemutvikling.team6.models.user; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.UUID; // Enhetstester mangler @@ -50,8 +49,7 @@ public Message(String title, UUID from, String content) { /** * Creates a message with a unique identifier. The message includes a title, a string who it's - * from, content and the time and date. - * This one creates a message that has been created before. + * from, content and the time and date. This one creates a message that has been created before. * * @param title the title of the message * @param from who the message is from diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Settings.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Settings.java index 36d049b..d814283 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Settings.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Settings.java @@ -33,7 +33,6 @@ public Settings(boolean lightMode, Language language, boolean anonymous) { this.anonymous = anonymous; } - /** Toggles between light and dark mode */ public void toggleLightMode() { lightMode = !lightMode; diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java index 4c3f108..ed375dc 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java @@ -67,9 +67,10 @@ public User( this.settings = settings; this.inbox = inbox; } + /** - * Creates a new user taylored for getting info from DATABASE. - * Settings and inbox can be set on a later date throught another method in databaseManager class + * Creates a new user taylored for getting info from DATABASE. Settings and inbox can be set on a + * later date throught another method in databaseManager class * * @param uuid gives the user a unique identifier with UUID * @param name the name of the user @@ -78,8 +79,7 @@ public User( * @param role users role * @throws IllegalArgumentException if any required argument is invalid. */ - public User( - String uuid, String name, String email, String password, String role) { + public User(String uuid, String name, String email, String password, String role) { if (uuid == null || uuid.isBlank()) { throw new IllegalArgumentException("UUID cannot be null or blank."); @@ -91,14 +91,13 @@ public User( if (email == null || email.isBlank() || !email.contains("@") || !email.contains(".")) { throw new IllegalArgumentException( - "Email cannot be null or blank," + " and must contain '@' and '.'"); + "Email cannot be null or blank," + " and must contain '@' and '.'"); } if (role == null) { throw new IllegalArgumentException("Role cannot be null"); } - this.id = UUID.fromString(uuid); this.name = name; this.email = email; @@ -186,15 +185,15 @@ public boolean checkPassword(String password) { return passwordHasher.isValidPassword(password, passwordHash); } - public void setSettings(Settings settings){ - if (settings == null){ + public void setSettings(Settings settings) { + if (settings == null) { throw new IllegalArgumentException("Settings cannot be null"); } this.settings = settings; } - public void setInbox(Inbox inbox){ - if (inbox == null){ + public void setInbox(Inbox inbox) { + if (inbox == null) { throw new IllegalArgumentException("Inbox cannot be null"); } this.inbox = inbox;