getAllDonations() {
/**
* Adds a new donation to the repository
*
- * The donation is stored using its {@code donationId} as the key.
- * If a donation with the same ID already exists, the donation
- * will not be added.
+ * The donation is stored using its {@code donationId} as the key.
+ * If a donation with the same ID already exists, the donation
+ * will not be added.
*
*
* @param donation the donation to add
* @return {@code true} if the donation was successfully added, and
- * {@code false} if a donation with the same ID already exists
+ * {@code false} if a donation with the same ID already exists
*/
@Override
public boolean addContent(Donation donation) {
if (donation == null) {
throw new IllegalArgumentException("Donation cannot be null");
}
- if (content.containsKey(donation.donationId())){
- return false;
+ if (content.containsKey(donation.donationId())) {
+ return false;
}
this.content.put(donation.donationId(), donation);
return true;
@@ -116,12 +136,12 @@ public boolean addContent(Donation donation) {
* Returns all donations sorted by date (ascending).
*
*
- * The returned map preserves the sorted order.
+ * The returned map preserves the sorted order.
*
*
* @return a new {@link HashMap} containing the donations sorted by date
*/
- public HashMap sortByDate(){
+ public HashMap sortByDate() {
return content.entrySet().stream()
.sorted(Map.Entry.comparingByValue(
Comparator.comparing(Donation::date)))
@@ -136,7 +156,7 @@ public HashMap sortByDate(){
* Returns all donations sorted by amount (ascending).
*
*
- * The returned map preserves the sorted order from lowest to highest amount.
+ * The returned map preserves the sorted order from lowest to highest amount.
*
*
* @return a new {@link HashMap} containing the donations sorted by amount.
@@ -149,12 +169,12 @@ public HashMap sortByAmount() {
Map.Entry::getKey,
Map.Entry::getValue,
(e1, e2) -> e1,
- LinkedHashMap::new
- ));
+ LinkedHashMap::new));
}
/**
* Returns all donations associated with a specific organization.
+ *
* @param orgNumber the organization ID to filter by
* @return a map containing all donations that belong to the given organization
* @throws IllegalArgumentException if the orgNumber is not positive
@@ -165,17 +185,17 @@ public HashMap filterByOrganization(int orgNumber) {
}
return content.entrySet()
.stream()
- .filter(entry -> entry.getValue().organizationId() == orgNumber)
+ .filter(entry -> entry.getValue().organizationId() == orgNumber)
.collect(Collectors.toMap(
Map.Entry::getKey,
Map.Entry::getValue,
(e1, e2) -> e1,
- LinkedHashMap::new
- ));
+ LinkedHashMap::new));
}
/**
* Returns all donations made by a specific user.
+ *
* @param userId the user ID to filter by
* @return a map containing all donations that belong to the given user
* @throws IllegalArgumentException if the userId is not positive
@@ -190,7 +210,6 @@ public HashMap filterByUser(int userId) {
Map.Entry::getKey,
Map.Entry::getValue,
(e1, e2) -> e1,
- LinkedHashMap::new
- ));
+ LinkedHashMap::new));
}
}
diff --git a/src/main/java/edu/group5/app/model/user/UserRepository.java b/src/main/java/edu/group5/app/model/user/UserRepository.java
index 692126f..193f433 100644
--- a/src/main/java/edu/group5/app/model/user/UserRepository.java
+++ b/src/main/java/edu/group5/app/model/user/UserRepository.java
@@ -6,11 +6,13 @@
import edu.group5.app.model.DBRepository;
-public class UserRepository extends DBRepository{
+public class UserRepository extends DBRepository {
public final static String ROLE_CUSTOMER = "Customer";
+
/**
* Constructs UserRepository using Hashmap,
* and extends the content from DBRepository.
+ *
* @param content the underlying map used to store users,
* where the key represents the user ID
*/
@@ -20,7 +22,7 @@ public UserRepository(List rows) {
throw new IllegalArgumentException("The list of rows cannot be null");
}
for (Object[] row : rows) {
- if (row == null || row.length != 6 ) {
+ if (row == null || row.length != 6) {
throw new IllegalArgumentException("Each row must contain exactly 6 elements");
}
int userId = (int) row[0];
@@ -38,28 +40,46 @@ public UserRepository(List rows) {
}
this.content.put(userId, user);
}
- super.updateContentLock();
+ this.updateContentLock();
}
+ @Override
+ protected void updateContentLock() {
+ synchronized (contentLock) {
+ this.contentLock.clear();
+ this.contentLock.putAll(this.content);
+ }
+ }
@Override
public List export() {
- return content.entrySet().stream()
- .sorted(Map.Entry.comparingByKey())
- .map(entry -> { User user = entry.getValue();
- return new Object[]{user.getUserId(), user.getRole(),
- user.getFirstName(), user.getLastName(),
- user.getEmail(), user.getPasswordHash()};})
+ Map output = new HashMap<>(this.content);
+ for (int i : contentLock.keySet()) {
+ output.remove(i);
+ }
+ this.updateContentLock();
+ return output.entrySet().stream()
+ .sorted(Map.Entry.comparingByKey())
+ .map(entry -> {
+ User user = entry.getValue();
+ return new Object[] { user.getUserId(), user.getRole(),
+ user.getFirstName(), user.getLastName(),
+ user.getEmail(), user.getPasswordHash() };
+ })
.toList();
+
}
public HashMap getUsers() {
return new HashMap<>(content);
}
+
/**
* Retrieves a user by their unique identifier.
+ *
* @param userId the unique identifier of the user to retrieve
- * @return the user with the specified ID, or {@code null} if no such user exists
+ * @return the user with the specified ID, or {@code null} if no such user
+ * exists
* @throws IllegalArgumentException if the userId is not positive
*/
public User getUserById(int userId) {
@@ -72,12 +92,13 @@ public User getUserById(int userId) {
/**
* Generates the next user ID based on repository size.
* Uses size+1 and then moves forward if that ID is already taken.
+ *
* @return the next available user ID
* @throws IllegalStateException if no available user ID can be found
*/
- public int getNextUserId() {
+ public int getNextUserId() {
if (content.isEmpty()) {
- return 1;
+ return 1;
}
int maxKey = content.keySet().stream().max(Integer::compareTo).orElseThrow(
() -> new IllegalStateException("No keys found"));
@@ -88,21 +109,21 @@ public int getNextUserId() {
/**
* Adds a new user to the repository
*
- * The user is stored using its {@code userId} as the key.
- * If a user with the same ID already exists, the user
- * will not be added.
+ * The user is stored using its {@code userId} as the key.
+ * If a user with the same ID already exists, the user
+ * will not be added.
*
*
* @param user the user to add
* @return {@code true} if the user was successfully added, and
- * {@code false} if a user with the same ID already exists
+ * {@code false} if a user with the same ID already exists
*/
@Override
public boolean addContent(User user) {
if (user == null) {
throw new IllegalArgumentException("User cannot be null");
}
- if (content.containsKey(user.getUserId())){
+ if (content.containsKey(user.getUserId())) {
return false;
}
this.content.put(user.getUserId(), user);
@@ -111,8 +132,10 @@ public boolean addContent(User user) {
/**
* Finds a user by their email address.
+ *
* @param email the email address of the user to find
- * @return the user with the specified email address, or {@code null} if no such user exists
+ * @return the user with the specified email address, or {@code null} if no such
+ * user exists
*/
public User findUserByEmail(String email) {
if (email == null || email.trim().isEmpty()) {
@@ -122,5 +145,5 @@ public User findUserByEmail(String email) {
.filter(user -> user.getEmail().equals(email))
.findFirst()
.orElse(null);
- }
+ }
}
diff --git a/src/test/java/edu/group5/app/model/donation/DonationRepositoryTest.java b/src/test/java/edu/group5/app/model/donation/DonationRepositoryTest.java
index bdf0110..ce81b2a 100644
--- a/src/test/java/edu/group5/app/model/donation/DonationRepositoryTest.java
+++ b/src/test/java/edu/group5/app/model/donation/DonationRepositoryTest.java
@@ -263,4 +263,13 @@ void filterByUserIdThrowsIfNegative() {
() -> repo.filterByUser(0));
assertEquals("User ID must be positive", ex.getMessage());
}
+
+ @Test
+ void exportExportsOnlyNewInformation() {
+ repo.addContent(donation1);
+ repo.addContent(donation2);
+ assertEquals(2, repo.export().size());
+ repo.addContent(donation3);
+ assertEquals(1, repo.export().size());
+ }
}
\ No newline at end of file
diff --git a/src/test/java/edu/group5/app/model/user/UserRepositoryTest.java b/src/test/java/edu/group5/app/model/user/UserRepositoryTest.java
index 0700828..a4afbc8 100644
--- a/src/test/java/edu/group5/app/model/user/UserRepositoryTest.java
+++ b/src/test/java/edu/group5/app/model/user/UserRepositoryTest.java
@@ -12,6 +12,7 @@ public class UserRepositoryTest {
private UserRepository repo;
private List rows;
+private User additionalUser;
@BeforeEach
void setUp() {
@@ -19,6 +20,7 @@ void setUp() {
rows.add(new Object[]{1, "Customer", "John", "Cena", "john@example.com", "hashedpass"});
rows.add(new Object[]{2, "Customer", "Jane", "Doe", "jane@example.com", "hashedpass"});
repo = new UserRepository(rows);
+ this.additionalUser = new Customer(3, "John", "Doe", "john@example.com", "hashedpass");
}
@Test
@@ -145,4 +147,11 @@ void exportContainsAllUsers() {
assertEquals(2, exported.get(1)[0]);
assertEquals("Customer", exported.get(0)[1]);
}
+
+ @Test
+ void exportExportsOnlyNewInformation() {
+ assertEquals(0, repo.export().size());
+ repo.addContent(this.additionalUser);
+ assertEquals(1, repo.export().size());
+ }
}
\ No newline at end of file
From 8676d9bfdc2ba66d90f2d40f598da984cd6557f3 Mon Sep 17 00:00:00 2001
From: Fredrik Marjoni
Date: Fri, 20 Mar 2026 18:14:05 +0100
Subject: [PATCH 4/4] fix[DBWrapper]: Fix exporting of Donations to
successfully export when closing the application
---
.../java/edu/group5/app/control/wrapper/DbWrapper.java | 10 ++++++++--
.../app/control/wrapper/DbWrapperDonationsTest.java | 8 ++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/edu/group5/app/control/wrapper/DbWrapper.java b/src/main/java/edu/group5/app/control/wrapper/DbWrapper.java
index babb929..7e3adc0 100644
--- a/src/main/java/edu/group5/app/control/wrapper/DbWrapper.java
+++ b/src/main/java/edu/group5/app/control/wrapper/DbWrapper.java
@@ -95,10 +95,13 @@ public List importUsers() {
public int exportUsers(List data) {
this.importUsers();
-
+
if (data == null) {
throw new IllegalArgumentException("data can't be null");
}
+ if (data.isEmpty()) {
+ return 0;
+ }
if (data.get(0).length != 6) {
throw new IllegalArgumentException("data's arrays must have a length of 6");
}
@@ -184,10 +187,13 @@ private List importDonations(int user_id, boolean all) {
public int exportDonations(List data) {
this.fetchAllDonations();
-
+
if (data == null) {
throw new IllegalArgumentException("data can't be null");
}
+ if (data.isEmpty()) {
+ return 0;
+ }
if (data.get(0).length != 6) {
throw new IllegalArgumentException("data's arrays must have a length of 6");
}
diff --git a/src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java b/src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java
index f31d57c..8c401c4 100644
--- a/src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java
+++ b/src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java
@@ -196,4 +196,12 @@ public void addingDonationListWithNullInRowThrowsExpectedException() {
assertTrue(this.db.disconnect());
assertEquals("One or more rows in data contains null values", exception.getMessage());
}
+
+ @Test
+ public void dataIsEmptyAfterExportingAndImportingEmptyList() {
+ assertTrue(this.db.importDonations((int) this.users.get(0)[0]).size() == 0);
+ assertEquals(0, this.db.exportDonations(new ArrayList()));
+ assertTrue(this.db.importDonations((int) this.users.get(0)[0]).size() == 0);
+ assertTrue(this.db.disconnect());
+ }
}