From 17fb80cab726b117e929fcb3945218a134c75d18 Mon Sep 17 00:00:00 2001
From: AdrianBalunan <adrianbalunan63@gmail.com>
Date: Tue, 3 Mar 2026 13:14:49 +0100
Subject: [PATCH] Merge Conflict: Models are correct

---
 .../sytemutvikling/team6/models/Donation.java |   2 +-
 .../sytemutvikling/team6/models/Feedback.java |   2 +-
 .../team6/models/Donation.class               | Bin 1464 -> 1787 bytes
 .../team6/models/Feedback.class               | Bin 1256 -> 1537 bytes
 4 files changed, 2 insertions(+), 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
index 78569b2..16e44cb 100644
--- 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
index 891dce1..2a0657e 100644
--- 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
index 1fcbaeaed12951a1c0b56efbe9b3701e109d2047..78d4151279bc36ed5048bab5866c45dfc5189e08 100644
GIT binary patch
literal 1787
zcma)7+fEZv6kVscp=G!#Vg*D*Xggd65K+oSD+MJf`oQIZx1pWDKs#gFDG9&g5BOrD
zCKinket>WOkh;#a1uZotlg!@d%wBu1z0W%Bk6+)u16apP1wMg<?b>C%bmp3cvU_Ts
z<SqM9cTJ<PpckB+nJ?*S$2MHcu@wXax{r-hL(dxwdVO$gW?g}B_Q)t&?%8IJpEKU~
zvTNn_-QCUfl0e8PIAxo0A}tWe8LlZ1t%kW)!PGNO*2t&1y~7pbm0CIhEz^?QTD3G`
z!JK0|MS)mr&~C{r647pzQnq8CkzR@H_DOZwvMqO2z>cT?%dmC+I;qx?9+Si#=d#9G
zN8m@FiXPk&@W&H-5!}Wd1yO;{f2XQq0D}UNqG9Kpf}FEJZ#>aB`!EFVst6(^y?ZJY
zv`O#2iZCM5d!V8ns`SQHbf7bWI5Y(bfw7jOm)uoMV3LzOG~I2}btxTAa*9k^qU+&H
z5lmx7fqoq&)<G(|Fzd}|Uvhsa*WChL8Ot_bl?w-EamP5wQ)j)Nxb`Sdxvp&n+#`!L
zCt8!NE1zQN*mjNV$(HfPOQIkt(C;0}RShdx7Kpc;KuskADyLUl$SV})GF7`WQ~{4x
z;f}l@0t59!zFL(WBbSK;Ca-e}b)^cl$r{xgl(-JEc84O{PPv#hH!L~rj{3Z&<zz6z
zqw({XCIp|<AU&T{pl7K+&r*G!rS?3_bEH*>>_IQzH@N!AEE1j6zTl?z75x<qX|W21
zwW$h5v}mA$Q7sy*U@RIuN9-I^Z_%!CckUh9G(YVpqWzfXdzyL&#t}e_UYyku=!3@l
zG(o;PCNYCqKJ%EvA|CMp{UF~-EZ{M%^kf&p^JE{g$E3VR%ql(EOAt@!_rv#F!r6~s
z!J>jCg*6#Qt+Gh9J)Kr23u>P+_nwZ=V;b@{B?mCG7f@p$u!2GE$l3f29{Sh-UTF$m
z#nTJ0ubP;Zhd(rcQ%%9okh%b0(jIB7yxtW29BWO$qmAIrrr<RHv99(!)(GBe3f}OV
Gd+`VEXoR=`

literal 1464
zcma)*TTc@~6vzKlXiJyHLIoA^vUsBl$a+D%peBT3LQ?esN+K_2=?-*ocZcjwN&1~k
z^ufeL6MgqX8P9BQq*+s5=FIGz-?`0y|NQ;&3&0kh<&j~qLlriixTSc|RHx#TFTx{7
zaW`0V0_kx-b}BM-m5^Z`qYRVB?y2keE;+qFIOcW5P^dTDNT}AfN7vQlzNv)o)N0$6
zb%vZ9$Yw}>timwrxr#H)w%wEnxKovN*RRm$T{@9}z7vjNu{yN2&30<SvYrfO#IP_N
zs>M7aVqC-<p$uD8UQE^PQ>iaSDAa3)uw40Xg~Q`_iyH2kRATSZTsCRedCV{r`vcyJ
zA{mY0GQ-DO81Y#8r`)sZGB^=_@*>trBoBNZys(VIZi8C^R}JY|M_lz9E8CWct!C))
zLlF{vC?iXet7@HaYlkaE&m9{ErZH<`3Rf9s%I(&ZH{MYZIjrjvi&YBnt{EKgXxF8z
z45j4h_UQ5Tx$|*UH3W@wX?XKpUC~pFl<oZj80JkBG09+33!N!yRh7#2psuv{T@zX4
zNPxQGj>srdMc>&b@)#pE(VZ3-!(2B=it03R-$VfhgVE2;uuRaoMW~}ZG%*g7VNB<3
zE7Cqsj6?}Kz!MV_xIks>$YxaMZ-k!oM0ZvzS{;}tzY+R}bI9lk&@Q99O)T}0SgIni
z6fChcSF(8`r%<BxBAr$#il&X9nEp_@^c`1zC%$vE=Ew(daE(?o*&Dcy8+0Nm;ASU+
zLst7`7r(*!Oq&e)@bfcpwg=zB?G*UV*8%udDtr$MJvh_LT>dfuZ=}MDSn9$3vX=)l
jZ>7R3G>i7s&i4FZ5Z+FOAK`HdygCTKO@-Hz=AQloYllD>

diff --git a/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Feedback.class b/helpmehelpapplication/target/classes/ntnu/sytemutvikling/team6/models/Feedback.class
index d6674b242ad806194d74b1bf4885d845fc2579ab..28853eca2459be072730105ee9d9b4a9cda23bf8 100644
GIT binary patch
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%l<nHyra&szW*yDa@neeba40Im7}C&>VS#Wgeyrj)
z?kE@)=)2y%hB1tDLM7A97achd_7saZ&Zrv#lNvhEDWkg@6m-dGMngAL6?3?!U|wL<
z&)(dzh6OCL6u0<ZU?Rxhj7!R-F%3P?ROnbzkPujC>smA{V}*k~wY-ewdAtb@c9~K)
zvIBTh#eF<f@Sq*f1tbl<SoMc|B5Qvn_k9BWY1_44Rh+C<IyAEdx?#|_z_D4f<-UFx
z@!r}jGjVf~fye2c-i$}Hzck<ZNfe~6nZD*iqBw|vBz>=PzZ2MYIJkoA##M-sCZ)p}
zNwael?ToPgU#OX4rIfSwZP{>dpuQqafmu!`%-^~LA?YJVA?YH2rHA~L*Y2+zA=gea
z`Z2)wE$%)OFZpZwcMR%3FjB>Yo~U9<U#eo72eVZ~6IX~|!T5k4JyONmM|A07u3yOu
zW1Vl^SDHoyGc?&Ov(I4!^O(dUpC}TDVFhulGI~t>OidF{u)!VG{hEaz$*Mzm%6JH&
zzodl~2nD)=Bq$*84CD3U4X%>Zp?|}~7X~4}8rdPJC6%-qpspmai7lSU&i^M*H<H&|
plAp7gW^%NVywQ@pjTbG*Q;p<QOEUk47UZ>04LxtQB=7jB-GAn2M)Cjv

literal 1256
zcma)*+iwy<6vn@yTnb&JVyo7w-FhqAYS&wus6=CWNtzIS0Gikrv#>*%b}wXimW2Pw
z2OmsKG|_keDC3z03c*d<7tYMi_dDmCbA~^EfBXWlkLNk07z|H(kr@socO%&sXO8er
zOvx>G$8>$0JE3{Nx!tnbXE~%97Ei6dWjYp#KDJJITQU?nBf+6f=e1Z6N#U5y=HcEO
zhIAD2fMKI{VWlPs3COj5*X16iE)TQC<?1pZYbu{@NzSk`Jd?uZX3cL~&K`Yk(2gVv
zB7E=p-oW*vkbxaDWUImx@-0KPa!DWmmo|>5_%1aihieR_NhkJ$zz^oJ%<#GC1w8bf
zKDTwcMNc@E6uzhT0>9;O_qATgH@aMRx$OG3e!}Is&5EImP>(#DcZ5fD#}9N#QaR{x
zz0Rei%ZG&m%DADSgqsY@m1K*h8YTD;xh)<vEUK#7sQPnc1w!pdAJeics5x5~w`2SO
zsIf(|Jl?8tmn+85#AM)kFz6aG$kNjw`R;g_OJnWyIF<T=hCB*1cT%e%GOUiJ3DZ?X
zMZ*HLA)y`(J!2v+_r4VWSVIo;409FZSnW*>MO-1jbw3K){6MI#6~`CdR+Gj$>E`H<
zlR-*dj#ep^B#vZ1j$|s1l#F7Qh!Pg*_bTmP60P{cPn18Em%iir?^wGsQUZ@~i`E+H
zNrhG1rpRyycSjjais~%0`3-AdX_3MNelZ1S&f#_3OMvgs!aIrZLvl3qK3#cZ7Jiio
d8`w;Mw`SpLB3#6i1bF+)%$?sQ!cSw>vwu#-3}gTR