From 95563c21c8cdf863343ab2bd843945cf8e8cf709 Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Thu, 19 Feb 2026 11:34:07 +0100 Subject: [PATCH] Donation class, deleted Abstract implemention as its unnecessary, anonymity can be done on the presentation layer --- .../team6/models/AnonymousDonation.java | 4 - .../sytemutvikling/team6/models/Donation.java | 75 ++++++++++++++++++ .../team6/models/PublicDonation.java | 5 -- .../team6/models/AnonymousDonation.class | Bin 539 -> 0 bytes .../team6/models/Donation.class | Bin 315 -> 1459 bytes .../team6/models/PublicDonation.class | Bin 530 -> 0 bytes 6 files changed, 75 insertions(+), 9 deletions(-) delete mode 100644 helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/AnonymousDonation.java delete mode 100644 helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/PublicDonation.java delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/AnonymousDonation.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/PublicDonation.class diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/AnonymousDonation.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/AnonymousDonation.java deleted file mode 100644 index 6f991e9..0000000 --- a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/AnonymousDonation.java +++ /dev/null @@ -1,4 +0,0 @@ -package ntnu.sytemutvikling.team6.models; - -public class AnonymousDonation extends Donation { -} diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Donation.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Donation.java index 1f457bd..78569b2 100644 --- a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Donation.java +++ b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Donation.java @@ -1,4 +1,79 @@ package ntnu.sytemutvikling.team6.models; +import java.time.LocalDateTime; +import java.util.UUID; + public class Donation { + /* UUID for uniquely identifying each donation */ + private UUID charityId; + + /* Ammount of money donated */ + private double amount; + + /* Date and time of the donation */ + private LocalDateTime date; + + /* The charity that received the donation */ + private Charity charity; + + /* The user/donor that made the donation */ + private User donor; + + /** + * Is the donation made anonymously? + * This can be null if the donation was made anonymously. + * + */ + private boolean isAnonymous; + + /** + * Constructor for creating a new donation. + * The charityId is generated automatically using UUID. + * If the donation is made anonymously, the isAnonymous parameter is set to true. + * @param amount + * @param date + * @param charity + * @param donor + */ + public Donation(double amount, LocalDateTime date, Charity charity, User donor) { + this.charityId = UUID.randomUUID(); + this.amount = amount; + this.date = date; + this.charity = charity; + this.donor = donor; + + + // ASSUMES that this is the way to get the anonymous setting from the user's settings. + if (donor.getSettings().getAnonymous() == false) { + this.isAnonymous = true; + } else { + this.isAnonymous = false; + + } + } + + /* Getters for the donation's attributes */ + public boolean isAnonymous() { + return isAnonymous; + } + + public UUID getCharityId() { + return charityId; + } + + public double getAmount() { + return amount; + } + + public LocalDateTime getDate() { + return date; + } + + public Charity getCharity() { + return charity; + } + + public User getDonor() { + return donor; + } } diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/PublicDonation.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/PublicDonation.java deleted file mode 100644 index 7da3000..0000000 --- a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/PublicDonation.java +++ /dev/null @@ -1,5 +0,0 @@ -package ntnu.sytemutvikling.team6.models; - -public class PublicDonation extends Donation { - -} diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/AnonymousDonation.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/AnonymousDonation.class deleted file mode 100644 index b00998e2e3f97d647cc16a2f2a1135db892768a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 539 zcmb7BO-lnY5Phj@w_U5P_4~Ho>cs^q9;^uB2MVhms)EOK8*J)sQj%<;zf4fjyFW^t zRjUV29`c5nyqUZ=d3%3)0dRs1A0>tzOOLUXS-3R`y#c`q0(xS z>D(S`#huj3hsV$u@-dH6PVB4RP$Z6_yf2k>2MjZ1~i28k08S1~>6JxZgV2ba%iy$S}J`SC^B+dCiE$5 uQ94L29Kz{QdUBpu;7618-%ql78cR`tSu3iu#6Roz&ag|7^@!?jgOZA diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Donation.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Donation.class index 17aeae8da0e0328d150d31ab701f3434f89291ce..14086277da5617627b9c8b6c6cb76aa36f7a82c3 100644 GIT binary patch literal 1459 zcma)*TTj$L6vzLwu)Az20xPJ9m*R~rAoYTHK}`sY3CXGtuq5(UwgX#iXGl9G+3#ec z4<;s>=(``vc&2+Jo0|1y&P?b0&Tanv{pb5n0NZ$0M2^80N+eF)Qanu5ng22H#j&Hf z8?HN{^mq_ERViHMOHsrq!_sorBC_ixO^_}Vl zL%|JYBFK+b8Ad%1fz}rzI zqcL1&IH-$=$1*tMp4E`ysUM^-Vx30vFyP?}%P8$NxfOENl%93W)h<_x9x|@jmLFS* z@c5B02tJaLrN~pYPPwJC8wO@DXJQ&x8D=Z(uG8n;RS`wl(A7=W2!5A@hdkPIDIr5S zeYJghcYW@B992!9Cb>Mk@2;fi6-FxdK?w{CCMGe(U{dv+0ct^&EB2tIwD(;Tc@#){ zboF?v@D8XPb`nefa2>NgR=_n6PjKgFY(|Oxs zwErhYDgqtgiHQkZpfYx45;gc6Ur&0XJF8VK3@nh}2>reV7nRgqc> zmRg!C*&>nCDARh8PHPlJ)5Z_Xd?;V~hAY2P-+5XKgKyz>27Kqs0Q@QwzK6vgoa<$-d>()|GvOsH_uzinD}$N0 iGvQU5MSE)Jdwwto?_|P{@Hhir8-(9x!s}^sPyYh^S3T(f delta 141 zcmdnYy_-qk)W2Q(7#J8_83foFm>3x}Cq7i1Xs95^W|NthSz^b?z^tJe#>l|poS%}) z#lXzK$-}_Pz&6>CDQ@y2W)&|621XzRiU3J=pfUPjJ_7@*)^-MtjX(h=1}-28l4bzv X<_3~HU^Xj|<^}Q?8Tf!C69Yd07FH3C diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/PublicDonation.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/PublicDonation.class deleted file mode 100644 index 7ce578656650a575bfa647a33243c3ba7b00f1be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 530 zcmb7BO-lnY5PhlDt?O!QwSL^zn_gT5@nFS^Rut9`uogUK*PyApNlCJW{xU&9@BS!p zR;|UOhrD4XZzk_e-anpS0d%nLp~4U;r;5mqoX86|l#iKI_mLAk--~j6Co&sd6-g%3 zW39N8T6w54H2QqVql^>vGU)IJ|(k`{sW2wYNktf1*IgMv%#yaI$j~iL$KgFthkd|R5{^v&84F0t)Oe#)fIeh8w z!nR9IB<@V5T3KnGQ0`O;!%g}y^03NK8(U=v&ZV`ayG!0IHbCp7zXC-@9%l$W%66&B sDEcp`-8TIv1aFj8P$w)op!)`4@Xf*^nqRdg!U~qrq6n