From b2c1072d99dbdfd1f744a11ab9c4a377f0b658b0 Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Thu, 5 Mar 2026 11:51:12 +0100 Subject: [PATCH] Merge: Clean up before merge --- .../sytemutvikling/team6/models/Charity.java | 2 +- .../team6/models/DonationTest.java | 6 +- .../sytemutvikling/team6/models/Charity.class | Bin 1676 -> 0 bytes .../team6/models/CharityRegistry.class | Bin 2899 -> 0 bytes .../team6/models/Donation.class | Bin 1787 -> 0 bytes .../team6/models/DonationRegistry.class | Bin 2924 -> 0 bytes .../team6/models/Feedback.class | Bin 1537 -> 0 bytes .../sytemutvikling/team6/models/Inbox.class | Bin 2879 -> 0 bytes .../team6/models/Language.class | Bin 1040 -> 0 bytes .../sytemutvikling/team6/models/Message.class | Bin 1549 -> 0 bytes .../sytemutvikling/team6/models/Role.class | Bin 1075 -> 0 bytes .../team6/models/Settings.class | Bin 1589 -> 0 bytes .../sytemutvikling/team6/models/User.class | Bin 1787 -> 0 bytes .../team6/models/UserRegistry.class | Bin 327 -> 0 bytes .../team6/service/CharityService.class | Bin 335 -> 0 bytes .../team6/service/DonationService.class | Bin 338 -> 0 bytes .../team6/service/FeedbackService.class | Bin 338 -> 0 bytes .../target/classes/tempClassDiagram.puml | 307 ------------------ 18 files changed, 4 insertions(+), 311 deletions(-) delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Charity.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/CharityRegistry.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Donation.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/DonationRegistry.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Feedback.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Inbox.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Language.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Message.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Role.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Settings.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/User.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/UserRegistry.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/service/CharityService.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/service/DonationService.class delete mode 100644 helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/service/FeedbackService.class delete mode 100644 helpmehelpapplication/target/classes/tempClassDiagram.puml diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Charity.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Charity.java index 4a389f4..84fb639 100644 --- a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Charity.java +++ b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Charity.java @@ -9,7 +9,7 @@ import java.util.UUID; import java.util.ArrayList; -abstract class Charity { +public class Charity { /* UUID for uniquely identifying each charity */ private UUID id; diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java index c96da2c..dca66b7 100644 --- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java +++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java @@ -1,4 +1,4 @@ -package ntnu.sytemutvikling.team6.models; +package ntnu.systemutvikling.team6.models; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -10,14 +10,14 @@ class DonationTest { private Settings settings; - private User User; + private User user; private Charity charity; // -- Setup -- @BeforeEach public void setup(){ charity = new Charity("name", "something somewhere somehow", "Meow"); - User = new User() + User = new User(); } diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Charity.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Charity.class deleted file mode 100644 index 7803742166af7bb43fbb61fd5ac98d603e1aa5ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1676 zcma)5YflqF6g|_H7TOhg_(nxVpk1MhiccOsiX=@4MtLOgiKSiZXuE5+Qxg7(Kf({1 z*l0BI2l%6mXNC%O*+jqWy>n;InYrhl{rT(L4*<_l${-<-_m$srn)}LYwA7w_TbF*# zQJ&kl>okI@S8qC{*KR1)eg-Llfj91+>(pJIdA|F`t0;kltg^mhHd;#7osEt1(wsob zcN?C-(7}#@tf`Rf+{;zHW+jyGlni`UzR^IY#_suJ^smR{9CTrwsg}i>D>tT9(e&wJ2E_cZ17Ri;Km%dbs z0uS=X8~L9~VUtpnsALvNoV75Fa{|eHVKa*hxR}8R`~O=z3zu-20)(z#4H{Zas+ccy zHDVO*gTNIFJxJ^9nuQE{b#~oC-$6EEA&Z=@EDjY@X)F;R6nz&Zu<`sMITk#Ra~<$3<<-Kb?Gz_}H0i9F z&kOqRWfw#GQ1XQs2JM|F!xkB~V;L6lsPl#r9iZKiv$sBDd}N0{jMD7T%C4a~b8z&~ QRyjPT6}4ra7~P)!25&JWQ2+n{ diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/CharityRegistry.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/CharityRegistry.class deleted file mode 100644 index 61b85038c64275096044f821b577e36bed01d1fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2899 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 Jp5RAJ{tr(1?_K}^ diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Feedback.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Feedback.class deleted file mode 100644 index 28853eca2459be072730105ee9d9b4a9cda23bf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1537 zcma)5+fEZv6kVq+3=G3XE+RL%32mpqs33~1AaY4asy-BW;BDHDIMA7zc8cLw`~hD~ z)Wo9k!4L4G)ODtvMA{}alg!!Y%vyWxz0aE8e}4V~u!lVbA%VE-xfP>)=~+(2yRgp- zwtH%Lmg%e;PBCv4%ErEB<+En)TtP%&;LN-*je<$g>+G48^90m4b-+QM-_t&z;@Jh` z=;&ZKDG;fYt&%`AeWTJ5fg~uoqT^UDQxDd%`EnVr#L{HGyy;m2W3_Ld?N~;-m@^Bz zJU--(kRH3d?H1ijr&uWqh!cU%lVS#Wgeyrj) z?kE@)=)2y%hB1tDLM7A97achd_7saZ&Zrv#lNvhEDWkg@6m-dGMngAL6?3?!U|wL< z&)(dzh6OCL6u0smA{V}*k~wY-ewdAtb@c9~K) zvIBTh#eF=PzZ2MYIJkoA##M-sCZ)p} zNwael?ToPgU#OX4rIfSwZP{>dpuQqafmu!`%-^~LA?YJVA?YH2rHA~L*Y2+zA=gea z`Z2)wE$%)OFZpZwcMR%3FjB>Yo~U9OidF{u)!VG{hEaz$*Mzm%6JH& zzodl~2nD)=Bq$*84CD3U4X%>Zp?|}~7X~4}8rdPJC6%-qpspmai7lSU&i^M*H04LxtQB=7jB-GAn2M)Cjv diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Inbox.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Inbox.class deleted file mode 100644 index 72613e7b9d3b93e13c31cabfb4cd0b77c2d6076c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2879 zcmb7FYf~Fl7=BKmY*>~{gT+EE(w5c)EP+aV0XehN@DtJ9fPQt=wm+l3@%Rll% zozWt6Mn5{^_?sNxv%4gllqv9KH~XIVJkRr9^Ur_Be*&1t&kAA;cTCsx($0Y^DxSNi z?-;sSPP>9v#?uw6C=4f^HS^ZKf@X%UZNA6T1}Bf@{I)2#4DpI^99|XnSc zTcn>J64+K2ZYY>8CX%U!c*$kz72}1HpyC>?D|n0HN-fe^%P^=Cx@9^V`tdf^!856H zddUw*=78a5vQf+_>N-ohSqvkXImi~NH=@_p*0OV%=(Xit$;u51?8&(tFBGhTLDF4o zxGaTP=Ek&L_A0`3=l2W3=a1tKLvJWMTO25G)3n@yycjS&!x&L<3rX1`Dau-?(r@4u z*QQR-q}JOojJpcnW$377Ri;hD2-4Jej%(96FkGvvUSLfV3>{_?G*M$3?%_VQrYmI5 zM_-$hl4trwOFy>;WZLjPK2R{u@McX&9gT(um>@+Z-Ef7?FcGCV1uS?x~A0QsLH0FpIJ+qJ!>t1w;Fa%L_Y8d^a2)l^0K1iQ(=!rYI~R z)gz8M(h+_)lvCDfLBl6lq&+|s4K)pxQYN*@poDrEhRz=06LN~f78Pqxga%qE(F_L@ zuo=fAhO42=D;<}hT{9+iey-sOR%k;8kl7N$jVRh_^&;VMgIDrJJ~+zoFzW7;pFfn; zri!Q7Q1AsUvGXok4V(Cq;Sy~!S?Bs4<_l2qHNI8wP2I4_6Ajw^B1P{2S)XpYiZ!0KUl0q9L5YoMr8JyP04iMpr?^Qg?CnU{^%l&wm(D zzW#1Fqfx!H+%Q&j+6bL35M5YQsijN}t5_ogEuss}(`FZTLk!wz+{bXp#-L?QQ`oZx zcO2m;IAFM4Teo#V)~8Ovj|}~^&;m+06yMAz@Q{HyQXP0tP=ryI?91D&`+Pe2Rq&{q$A(dNWe!VVaEecXFw zmALVt-*EX4^gXBFF-SbA1-Kr;iC1w3NcRcOO&_O1>@o6B4*!kzm$8mGBtL zGR(&@{8A+iBAg}CIU-$%5cXFI`x_$cQe{Jjg!d^OGP$io!!NM@0$)k&XqAGj1=Vg1 vq!R#j^LYURQFQ>6vAj=HK#|_EBs*j?VBwkn%Z7(Nd{1YxN%!#senRj6*qz`8 diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Language.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Language.class deleted file mode 100644 index de22840e2faa5672993a34756d66b15239b7fbe3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1040 zcmb7CT~pIQ6g}INrVS~SqE#q?Ej#E@$wDV3TzQEi1jIjrw%?E>YN zRm>nKcDGc>$TQ5Fj%T-`LD%-*@vduAjyddcx6OS=oa3MZ33F66{Nw~wXvE#frp-o8 zo5qKN72KC`kD-*(Hx8&3Djwh=LxKA~ANPh|#teGe#ZmXf?uGUJl(Fj&Iis$`l8!zy z?4)6dd2Ncv7FJhPJi=3k7iq3Nmj^*TCE$j9Vn&Pz^;)rpk>9glJK{Nu*YmU?^2np* z^gSL%KHa@c(Fts03ZdKe-A(GFM6;dQT@q~tO3R|D6v@(BfS8V1I_=O|eAORdow6#O zqj-je>`yvLr&zGgu=tIxGq_EwLVpmrNEDSgDsE`P60%JyDT>Pa+R8cZOn^B`Kmt6e{`&~YeLFHl|oN;g+BuGrX(gaWnXal)Zfj;N)S WnSOyMzrg;D%ivke`5d+Qul)ru81$b2 diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Message.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Message.class deleted file mode 100644 index 12c1cec780b114eaf18df46e8009a8bff591b4a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1549 zcma)5+fEZv6kUh5Oc@5j3L+p_Etg2r~Iqbn~V@{DriHDA(TkwWpv`UgsyXK1|=)##vQ8HtgKKY2mbw+ z5_%biP8Hd-ETgPj%U-!^Q&a2jipC)~T_=jW3XR6hzQ0ym18*qQcV@v;^Ly0vS;m5AaCBLxyfY&*f<9}th z`c5)kzPBL4&naky!qA>I9pgpSE*M@;F9aJVRwS=`ra0HZFn?oK7}V@__nTI$ZHMc{ zgDw5A9wSmV_$F<4l&n8KhR%~J&+oHDH^gX2J@V=kAc1}2nZ=fO+^SbJHcU~sQvb3t zLLLlKk0JUnBZvuY$%_ePeM`FfmQ?jE2|>1*7;U&g&vrWfA$FLot{$T!^$T+93vPWt z+jsQr#rlrX|1(Ws`V1Hs;5dQfXTTu=s$VfugQ})#NUP}@GU|8@6NFCHF#Cy;gfLIf zX-W?aP}(6XVVG8U6eAcz1}f%|!YX;spn$YBzDn8GXCiUne+L9tlGV>(gUezVN? zM7vGCCmIf6iTqwP|Dz;f2~0v~@CRCC`jG%nkgUs~krh!Q>Sw4Q$!YRS6Mt$tw-XnTzD5hUC?Ty?O diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Role.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Role.class deleted file mode 100644 index f19f0d329763812b4a709a4241f91f6d46660b20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1075 zcma)4U2hUm5IvU#mX9q(wA6n1-CEdINFQusAWaFuNL(Oc3kmVTTyU*hm&Gi*B>XF- z4{bCyKKrALbGMtqgC^|5-kCdd&YZb3zyEx{22evmMu=h8c5SaXp1Q`+b0_9!%e2pm zuEB>##o_3KVU3IJk!8pTGo;S>gcmJN2{qdrG9;U=cB7)b@94EQ!=APjRf$2VzNxh9 zr@a7}tTj80oo+?z)O3d2yQO(zK?KnlWZ`5L$cPH-zJeIyM5URw(e#FW!#U-B%V5Z8qXDI%rRA+aLY5uP;>cZ8%p3Yp2~Q_kX{fv9n)wOJi`t{oI4Jm4n|+5f_R~w zR{z`>xTX3(uBb%@*_YG$$WU5@1+S1_^2J4qIR(4OGrU~nsakwIE-e(lC7w4TR)%Ju z&_|v#FkYMD8RKHN3L=MW-8{3o>p67)YJp1N%1a77E}b0G+$7p>>10F96rhvF38Xj0 zFewtIGl3-KDdcs@7hmBASTD08T_SaXjPKkF`_5YACxxULGI}pO!2g-VT1lD zzgiqC#3?Fl`VkSO?F(ugQjX9htNYuR*qVc*lz;%F__mB~A(n(bz{3E3M2!e|c82xd zTS>j{m4%{)v~`6?2VW_2BjtvT-Aahlq@D*HD&>e;i40S(u=fk>|F{rTpK~7v{`ulB D2n_Uq diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Settings.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Settings.class deleted file mode 100644 index 9420861a9951a8429b08d5a232a8ced6cafaf647..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1589 zcmb7ET~8B16g|^jy8VWh0xDmnKy9~$s-Q6ezd{g+1s`fiAn{>aH_O6ym$XxqpTaNj z#RoMK5>52c#2+Qz*|uyYO{8hEGjn_IIrp49yTAW@`vG7b_Z9dUayGY{#l{KOYfXM^ z9$Kbt6uGX|9u#ZNTit3D%R1*2Y$%W!h7Po2t!QbK^r~{8S2;t_GL3z{Mac|ok0Bub zZE6M`^QHfym)glI1fKm-cSOXf78oION9hO3cQY}D8*~yV$u`O<@yQfRtLL~`_=V_q zjPE8U&oTW|9Y3RR;S6)?)Nt!i(Yj7QTYzD2V{G|PR`=(Cm6<4mvPh`Zt~LFBncK*Lr9dsVzgaEu}vjbVcdZ5?IUe`?g;&E maIH(hKpT%fRk+)uc<$4c;*Flg_j)pCt}?&uS-j*@EdK@YgDD;W diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/User.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/User.class deleted file mode 100644 index c0cc6c87cded03b76d2e92e8c97e2e1da84a487c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1787 zcmbVLZBNr+6g|(_)-kH!c#$FUDzcT0A}W|*@B@M&E@+s{L_c-VV6p2=+oAp`qlt}) zG5!F5l=0rD1+kQ{_@(#udG0yA_ny;VzrX(ku!#o>QUY_1?{swUqi?o4{;~Dewwy!V zH;vYc-fAD1wx{oTrmG+=FmPlX8@g>!!L#O(x$g_4tOGi)$%~F}+4|nz_Tx2yv}3eP zfkJpAA$8v+YP!pqEyJ<}a_zpD$jYQ?^BT{uu!|SuXl$O(Me-J2L zj@sr*f@B|Bj^(cld@9A;Ki~9!o^(G#w|$ozw5$!%C668qsTjbpKu@XM=!L*_6&YkX zE2>bC`)1p0Bq%?!LKY@mhO% zF^l};V4C*dL%*bg0t-l4ish4$#FLSvqgY_!WF*;SB+)45iD3ZO=vkn*AB5+siuMhI z+CqR4trB2Vs|Fa;is=C3S}_w~LMvtiOld_Wz|0q_PvI6lZG~t@dPQE@eDj)g$+o&obenPneik%Gk>X{=BB?G z@ZzRhJASVb!VX sS?N|*>RvL}c$}+2TrV%+VvjJ_{ba7OIM*xUdVK*GJCC_mq;*#R01lHzzW@LL diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/UserRegistry.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/UserRegistry.class deleted file mode 100644 index 970aced91dfd7f8c243d76c46fae27be61d4a66b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 327 zcmb7*`0ZcK;kr2*pu)Xq|z-=Ga=Cv_)sRHZvQnlSPH(ot?c5_}DAKWHK zN|>zlTB}CO;H+A49SFl~V@TpG*weOs}6)K$ZTqq3`Y zv(U~&|65GMi}3_i{tN1gP&{?**VfrqHCxAJ>pJsR82hRm>+)7LTz4jCHCyZ2xb5;6 zV}yk9Mt52jTHY?Q4d;%~zc<#n2SRUpu_A=C>V*^Za6CYSK4Fv^%k#F(xPI1I!GyE4 z%5|}l<(~hVpE?|JqmH7!!z}{2o%tdr8JZYR^D)`GKQ% ZX#_|l{WWCZL~^h{M^aCP2t&yLqaS1GQQrUn diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/service/DonationService.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/service/DonationService.class deleted file mode 100644 index 86d299609fbed9ef28c2c620209ae857df2bd9fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 338 zcmb7=u};G<5QhItlLkVe72*ZhfB_33v4B_#Oc4x4-JNiPD~Tf|P9z?S35kIR;Gq!b z!o0Uh7y&vSc68C64+xpCO+zwK*xoVvC(zwMB zr-%u&l^v|9tX{q=R$O|*_(GicOTy^ja7l>g%>!o`VRM26W5P5S$G3f5aC>iyiV3@U zQ`%~2TM7KzjQx{zgwy=rV&{Zx(e!P}HxjsY-vu`=S1ta5@AO(!t@){rBfOJ diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/service/FeedbackService.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/service/FeedbackService.class deleted file mode 100644 index 4b0e587b06036d7a35cd6fe07ab42099bb8a5b7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 338 zcmb7=u};G<5QhItlLkVeRmBUi0Rt97Vga#Kbc*Ou)ZKAU;5Koj#EHaXF(EPV06Y}p zT$tEc{_}TdTc7Up>-_`3Jtiq4!lm=BQ|*iAs`I_wmexHf&$_x+EjPV2tme$?LYwXK zhf~Ca$wv2Dm0B(@iVYi27~WcE{T*R&dbT3OvwF=L2G}1V!H_V{t>cHTD!6&nMahI| zUK?GmbYlbmHe>&6Tf$ZTZ?PLfwye9x@Z5&)kN=2Y1ZSK;3}pe3O2JGr6;e9}lJht0 by-FiOCK<+%2M3a)-8qqZC`34tj4=KNWkXVR diff --git a/helpmehelpapplication/target/classes/tempClassDiagram.puml b/helpmehelpapplication/target/classes/tempClassDiagram.puml deleted file mode 100644 index c32ad2a..0000000 --- a/helpmehelpapplication/target/classes/tempClassDiagram.puml +++ /dev/null @@ -1,307 +0,0 @@ -@startuml - - - -' ========================= - -' DOMAIN LAYER - -' ========================= - - - -package "Domain Layer" { - - - -class User { - - - idNext : static int - - - id : int - - - name : String - - - email : String - - - passwordHash : String - - - role : String - - - settings : Settings - - - inbox : Inbox - - - - + getUserId() : int - - + setUserId(id : int) - - + getUserName() : String - - + setUserName(name : String) - - + getUserEmail() : String - - + setUserEmail(email : String) - - + getUserPasswordHash() : String - - + setUserPasswordHash(passwordHash : String) - - + getUserRole() : String - - + setUserRole(role : String) - -} - - - -class Settings { - - - lightmode : boolean - - - language : String - - - anonymous : boolean - - - - + getSettings() : String - -} - - - -class Inbox { - - - messages : ArrayList - - - - + getMessages() : ArrayList - - + addMessage(message : Message) - - + removeMessage(message : Message) - -} - - - -class Message { - - - title : String - - - from : Charity - - - date : LocalDateTime - - - - + getTitle() : String - - + getFrom() : Charity - - + getDate() : LocalDateTime - -} - - - -class Charity { - - - idNext : static int - - - id : int - - - name : String - - - description : String - - - totalDonations : double - - - verified : boolean - - - category : String - - - - + getCharityId() : int - - + setCharityId(id : int) - - + getCharityName() : String - - + setCharityName(name : String) - - + getCharityDescription() : String - - + setCharityDescription(description : String) - - + getCharityTotalDonations() : double - - + setCharityTotalDonations(totalDonations : double) - -} - - - -abstract class Donation { - - - idNext : static int - - - id : int - - - amount : double - - - date : LocalDateTime - - - charity : Charity - - - user : User - - - - + getDonationId() : int - - + setDonationId(id : int) - - + getDonationAmount() : double - - + setDonationAmount(amount : double) - - + getDonationDate() : LocalDateTime - - + setDonationDate(date : LocalDateTime) - - + getDonorInfo() : String - -} - - - -class AnonymousDonation { - - - comment : String - -} - - - -class PublicDonation { - - - comment : String - -} - - - -class Feedback { - - - id : int - - - message : String - - - date : LocalDateTime - - - charityId : int - - - - + getId() : int - - + setId(id : int) - - + getMessage() : String - - + setMessage(message : String) - - + getDate() : LocalDateTime - - + setDate(date : LocalDateTime) - -} - - - -class UserRegistry { - - - users : List - - + addUser(user : User) - - + removeUser(user : User) - - + getUserById(id : int) : User - - + getAllUsers() : List - -} - - - -class CharityRegistry { - - - charities : List - - + addCharity(charity : Charity) - - + removeCharity(charity : Charity) - - + getCharityById(id : int) : Charity - - + getAllCharities() : List - -} - - - -class DonationRegistry { - - - donations : List - - + addDonation(donation : Donation) - - + removeDonation(donation : Donation) - - + getDonationById(id : int) : Donation - - + getAllDonations() : List - -} - - - -' Associations - -User "1" -- "0..*" Donation - -Charity "1" -- "0..*" Donation - - - -User "1" -- "0..*" Feedback - -Charity "1" -- "0..*" Feedback - - - -Donation <|-- AnonymousDonation - -Donation <|-- PublicDonation - - - -User "1" *-- "1" Settings - -User "1" *-- "1" Inbox - -Inbox "1" -- "0..*" Message - -Message "1" --> "1" Charity - - - -} \ No newline at end of file