From 6c44e692107f48307cb0bd905dd444e9a54c8eb0 Mon Sep 17 00:00:00 2001
From: AdrianBalunan <adrianbalunan63@gmail.com>
Date: Tue, 14 Apr 2026 00:59:09 +0200
Subject: [PATCH] Fix: DonationRegistryTest is now valid

---
 .../main/java/ntnu/systemutvikling/team6/models/Donation.java | 4 ++++
 .../team6/models/registry/DonationRegistry.java               | 4 ++--
 .../systemutvikling/team6/models/DonationRegistryTest.java    | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Donation.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Donation.java
index 443891b..c058688 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Donation.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Donation.java
@@ -75,6 +75,10 @@ public UUID getCharityId() {
     return charity.getUUID();
   }
 
+  public UUID getDonationID() {
+    return donationID;
+  }
+
   public double getAmount() {
     return amount;
   }
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/DonationRegistry.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/DonationRegistry.java
index d66ee97..d132a71 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/DonationRegistry.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/DonationRegistry.java
@@ -19,7 +19,7 @@ public Optional<Donation> findDonationById(UUID donationId) {
       throw new IllegalArgumentException("DonationId can not be null.");
     }
     return donations.stream()
-        .filter(donations -> donationId.equals(donations.getCharityId()))
+        .filter(donations -> donationId.equals(donations.getDonationID()))
         .findFirst();
   }
 
@@ -34,6 +34,6 @@ public boolean removeDonation(UUID donationId) {
     if (donationId == null) {
       throw new IllegalArgumentException("DonationId can not be null.");
     }
-    return donations.removeIf(donation -> donationId.equals(donation.getCharityId()));
+    return donations.removeIf(donation -> donationId.equals(donation.getDonationID()));
   }
 }
diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationRegistryTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationRegistryTest.java
index 5ac9e10..77189b2 100644
--- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationRegistryTest.java
+++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationRegistryTest.java
@@ -65,7 +65,7 @@ void getAllDonations_shouldReturnUnmodifiableList() {
   void findDonationById_shouldReturnDonationIfFound() {
     registry.addDonation(donation);
 
-    Optional<Donation> result = registry.findDonationById(donation.getCharityId());
+    Optional<Donation> result = registry.findDonationById(donation.getDonationID());
 
     assertTrue(result.isPresent());
     assertEquals(donation, result.get());
@@ -87,7 +87,7 @@ void findDonationById_nullId_shouldThrowException() {
   void removeDonation_shouldRemoveDonation() {
     registry.addDonation(donation);
 
-    boolean removed = registry.removeDonation(donation.getCharityId());
+    boolean removed = registry.removeDonation(donation.getDonationID());
 
     assertTrue(removed);
     assertTrue(registry.getAllDonations().isEmpty());