Merge Conflict: Models are correct

cathrkri · Mar 3, 2026 · 17fb80c · 17fb80c
1 parent fd7687a
commit 17fb80c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Donation.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Donation.java
@@ -44,7 +44,7 @@ public Donation(double amount, LocalDateTime date, Charity charity, User donor)
 
 
         // ASSUMES that this is the way to get the anonymous setting from the user's settings.
-        if (donor.getSettings().getAnonymous() == false) {
+        if (donor.getSettings().isAnonymous() == false) {
             this.isAnonymous = true;
         } else {
             this.isAnonymous = false;

diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Feedback.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Feedback.java
@@ -35,7 +35,7 @@ public Feedback(User user, String comment) {
         this.date = LocalDateTime.now();
 
         // ASSUMES that this is the way to get the anonymous setting from the user's settings.
-        if (user.getSettings().getAnonymous() == false) {
+        if (user.getSettings().isAnonymous() == false) {
             this.isAnonymous = true;
         } else {
             this.isAnonymous = false;

diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Donation.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Donation.class
diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Feedback.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Feedback.class