From 0dce7f51dc1b4a250e888337eef338fa584dce68 Mon Sep 17 00:00:00 2001 From: Prince Date: Thu, 11 Jun 2026 16:50:41 +0200 Subject: [PATCH] adding citywallet support --- data/jobrunr.mv.db | Bin 831488 -> 581632 bytes .../domain/controllers/AccountController.java | 5 ++--- .../domain/dtos/erp/VelocityAccountDto.java | 4 ++++ .../domain/dtos/erp/VelocityStatementDto.java | 3 +++ .../services/VelocityAccountService.java | 4 ++-- .../resources/liquibase-diff-changeLog.xml | 12 +++++++++++- 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/data/jobrunr.mv.db b/data/jobrunr.mv.db index fa54cde5c0d48dd99714ae78c39920b15d8d98f5..fdd131251cbbe1170bf9af534b2b3ccfa8f96e47 100644 GIT binary patch delta 40802 zcmeHQ37izgxv!pkcW0KH-9?VQ6p!7d&*`2;WDyY&g#|niQJCqOQIy-oBPcuI6;IGX z+8ATtnQ&-AAZS{_1FvX|2PnblGm3e?0LBxaF^C86`>ML9dv=#)2^uwT_osYST|HgZ z)z$r7|L?2J4l%R2s``|Au_iHnmVU8KCrtZMs$SrEzDB=r-pq^Z1u=D7^)WqD$(r=^ zRFi&TYHqzE3MoNP#Mj5ybm?RL{1AS&A>MUW7f&i_6wc<3Xi&wPxwB?9)ys*5488Jv zG$u=k)Qw?txv~qBQEPd~YR&Z2%z9a_nH|3% zbxFONu9-gV(o`d@M5US;@yqMwq?+LA;nT6E$pR0@XVX7?bWH z(h&+UfZPC6_V7fusI-(l%qU%nk|ev9qF>O{l7!=wpg(6xLIuYuh@x0COV{Vkj?dJu zs8=;X-;^6*O3l7oSvdh`1Lj49esS(_lB@}`Mi8?H5Yur4iFDF60EJiMe9gR>^Dapx z>AN8datg;&nsSdPrPA?8N>VeXKExftrHt8^aYq~bE4c0&ylwRT$#oQ`ciQ5mlahMe z-I1ypTou==Bo%kvH*|{kt;Pi7t$AEYAv`?xA&F)8RQ4Hf-77AEw(m7*-)o${_d3j~ zvnCY0H}?=^Nj9FC%k>dM&fKVsi=D;Bw;jC;z4IL31iqiZeUhZx(~J= zhpRjK;9EQoRa0d5WZ*{;ANnCOyx*=Pf9e&mNaI~=Tu+_#)>7}_#&CFm$W)rgTFh< zy#qMeSU#ZW&k-3u*7b^1CyI(B8tZrZ_3XMc0w>5yJ+IZpL|)XyNtHE~m!#&x$81!x zvc6J`$5lZ~inT&4Ce_O6IA5C(6GE+)jH!G=PlzI{-P;R?<8_K$*D)6Q{qfwvSe-1X zLe${i;z~kF9q{v*q8U%rdP)O|5EWxFL)h(kI}F2vk;Llwm?D_Bt@KRghW$D7ld|Re z6y&OpKC`B5%bo)J3lDrBSFGS(?kSZ-O@$;fG?Kw zDTlY2Nf(0sCfU+O>XpNjE^goUNZGo-bB=WJ`7wh%-7V>2$Aj0t9P}@LeqXk%LTG-t zZOLMJPO`ABg>r(}2G?5c*4_%sg!1<0xv)%59#cbxG*k9%t`yNI$H>=_$K983JZ_lp3p=Sw* z39g0DWUXjYqP*PGDX+Aa&Ax4UWu5bU^W>Gvp>9D%7Fsgqj!7y*^JTX-B^6|*lGYY) z?m36?=6H_dB6ngnB_{C5n^`R?%Wd#x)}|$O4S6%G#T1?LbgQPvdF0KkmXIa=8|2OG zqB;mTcu|WJSiIS)S-jbee(?nNyC8{6j7_vZMtbv?$X*BmmRo@ViB`2E~7 zfKP*rJgYI78 zwqnR?a$2BFgw+&a8?6;X)}|(Psu;4Grsy&?hx( zwCTdTDZRXSGNtn$VC~K4u=YjUS^IUzvi2Jmu=bm`vi2oMvi9ce73_p%FR~NvDrYDB ztcjhl{5jVCi@vOV)hyP2-&3r8Z3$~%e=%!+;4#+zP$gcl0f2`^7(C%m$bo@p46Ng_G3RewAHS+Zqdc|htD2p^=V7oUNdyZ7pv*V zdy)uFE-fB~^~S@;JC#VodV@zRi4re}N@e8ZK>o+O{nKkItq)9Py}04Fw3iEkg-(Kp z4$t=SqDrtURvhi$h6^ns!{U>`w8u-5GRau+8aK>r@NxsW?DVH1eOBIZf7y@!)(hFp zU7u_$yYu0mSloQ?rZS`3$y|lRE%5gDv9HjFXN2k3=EIv`pzoT$;51tQh>T%$MAy>N zlF~}!okzUKdH)_b+UVxzZt^VTvMZiGR}QT553nxu(dXbLgKyrR<)xJV@5z6r^wSUS zWEVE>Duus_vh1*3BaC~V^ll3l^oZOS7*MgH@%JAEvzIiT%r#@1C&N(!T|g~6^d-L( z*%K_cy4m~5OZ2jz54n}mAG2|O{t6t2Z$F)n2YR0m~mNV3cXg%hIv|>#k>J3w*KNM72UGMwp&9uvXZ?Gx)qAX17U!45{ z?K;#{%k&nvBZsxU_fRY;kH~Wrg|WO0JfhNC$yZ0AWMGHAUC} z@JV6svd+b0+7T z?#s@-YG8A7$3Br6aFTXJ&{*i4*Y29eySRVwi4ne<-3G@Ee+7rlai88!sppsDDfOP! zo!&;_%rn?+Y`yBT;Pcwj;_3>Lo%3414bvBl^1=$)dURi0AxIW-#+)lW{iB53H1wk` ziq%2jrY-b>!N3xF!J?~yLWjXGSVy5n-Pwx%@Y?X%-d#hA%{hHJp6k7kJ8i_6ac7P= zbHqum7bknm)jy99iFTvTV3_4_fX#M<>*}b2pb5TL(W`q0G(p+X1l>wurzUu~u3ncW z2t4sJZXk8H*0(m%GNC>X;~;Cvq}$g?^+QyfN>Z{*U4{x8JS>F}yt;?4aq{`tik!yj zQp?ozN=G3?9ke2Q%c?%dw7#(e*q%|b9h`Ej{ZL`|A-TKZ+cG;2RC{E*9l562Qp|qf zs-I<^w^To?rU29iHBUBuN|gE%?V2uApI|d>JeW^VBqZ2C$Z=0FDs^LY>G?o2#JA^q zN|C{m;AY|<{xYM+U4(?7_~s}^KkEuKLqd~BGTKy3Mv~BG68gi7Z~*An%Lw>}Na66C z7@c_rA&~}BH1&^+!uJmUioP07DSol=558FI=Y$GwFAojOX+nAWi~}#y;vkNuc$exF zYg2W~!Ao+g(}AG`uC8KCbxP7@h|qzY>U3_t>a?-JtvW65RGkh@b;9XuOLgi#*YkX* z>eQ(^eY;?S!&9BABJYL%Mb$}aUv(;SsZPeYQ@s~707!#JNCtu<_?D224uBbrg-d)C zk`c+fPEIR}a&C?6nw{X~xQ{{}9gQq7uWgMCUSaTp#u{`VbI$*}7UFR?p3uu3M( zIYgB#+P7mW8FXK8!ddLjnMx-4zCS9NHnxK*8QezU+Met-s7f~YryWztj^EL?N(L7! zdaAJ|DS-tAx4?nT$XS^3clBsS*Y;$}-*Qk2Q5l3UEdGUu zT+JwaA@L8skn86R4N@i0*6H#zGe-%GC(=5f5_3x6Q~)sL`Ol)ve}>?weE%6k`?N-E zC*8)BcplPI0?0OKfhSW3+Qb%GV8*Ql-rK1K9-JiP+jx*ySjA9{a5w3u5G&i;DX_+Eq5Tg|FFInlv#Wu(ES(OS|N8+dXp@- zsHZt)3iluv@^-28cUP)Nw(E-C=7$x&1s-Fa&h>6~y&lv(_}gpBwydmly(xIq!gsk} z8a!;p(zxFrJZ!z&@G6n&>WUuJ#RwyeJiVQcv`dvMD&%ZJ{PW8f_3S`Y$idZFN6C#H zl4kq=D#)}`v;8;5$sU$wtL2B^wyoK^VuAlHak8Zcijy_AUc~k4(K7gQ(7ImC)5?^m zoRZBvk3YBwkMC5;z73RS@VKHZMClH2h=Rv8a8egWjWfE*p?b5m94rW!8RW%iJMNv+L_+lC;+yb+Tk;3^pciTb15UT3dxphnDW&i*w zmB!=^Oy@p7U+3Ng!v@gm7zSGXWv9-4XgW7epG)U92I+;>(-5^K1AfJf+_%XTT0Y|5jhG4o>%pBMI_S#>)YPx z=BW>RyK!hX5T!a*jq-|>IN;;!{8wx!-`T|VS^k$t%0B+37Zn9}@sBTBAl{-;ZCe50 z+Y?xJT5BsniDd=wz83;GJ%V@_aYp=c@43p@(5{a8jN#J3YO2Rqx?#MNf=31hRJIG_ zg}!oVUNzk@*D>@~a0f;6R#G(YN~M3Oyz*Z~^Dd&$UTY?iD^F2Ib{E+j*Rh8d8 zuy>IK0G>qhFkI!%j59fsS4wmYR?~LdTLHU;fk6QwlZ@9NJP|(P%wWKqjz)#ngN46oDURa2Q({eCWSK@fE)NZ zGb4NgzIrex0K=o^gGk9}MuAb`U*rKVqrhqK4>*mT05Z=|us*)93pFm-wgQ)NL3bG! zqA|#p#wV#mpDQ$0>?&Ai_FL?)3VRxFF`xUQ;ErO?$ZB&+VIdUeJ#Nl^$Pb0&cJr2j zc;u(k%zOTXM{dZNn@++b5A`u$c#_K&H($Hr@hTS8N(hT;C4@z_62hWd31LyKgs`Yq zLReHQAuOtu5Ej)+2#abZghjOy!lGIUVL`2gu%K2#SWqh=5Y*ZXY@HAm)k+A9Y9)k4 zwGzUjS_xrMt%R_sRzg@*DP;9J@n&;>^y>E{)Kc0hy z7k8N4#~c*CoNxADj7L7X-5eD0K;f^$%+r2VxF_Q2`II?yW8vu$PmnineHIJ#aq}EG#<8?EeTB9x%)qf55`3r_D#UW8n?OysZg;{$j%1u@DRUUo{6U#=3_0E0xD^Y79x)5v#zN(L=EV20aONblVwx8UBX2Ng zUy6kv?KL028VfU2v-mbFOii2T-Qyh{DT<7}{ZAwNdC2@LN%re2k22r5-`h80EFb6b z6u8g#*%wIQ@}YZVV1Ny zB`QG-CU>m=Xk+T@o}t;tE(iwegs2SpCbE|&t}KK+YCNkm?=M6Lvtw#hRHBC93zvDL zykH1B3;X(Gs-m$JYZJ^#Q@QeCUox#qX!Oq`m z`oF_78nrfnv>O;|j(*tNwaox$%l_d4LAZ)G2%p_D=GUi$#|FHwpFP2B92>qf5PWvu8PGNg ztt+N{R`~P)gjGLr$C(|$RqWYz7QNEc3vxgCLOb^`5g2=~pUe;# zFbEoe4U`686T$+pfnoqQ4DyR*x6(n{R+^Rp*uDJZi@hhFXZ$lB-s}B*#QDZ=KJf1K zetpUm;{zRz?7w8Hu{#<5EXbYx)f@3c18RKrV1fZP2w`#Bgs?bmpfpaK5E`cqqujr( zH=9Z@=lH!F-r1p>%Rlk1^9KGlAz4*Qz{)ewyy`RWbzbkzTT^D=nc;O_@83U9n=j7^ zuk}J;_wMWk-y38{?*SKD$PNH6(7G_ad+EU=q!G_dQcYwsa}1j znYRRdn?2r=CoVD@3!oJ2bKS+&r9?oZjwywG%RRw1>QS``X#lD|=g3oi@jDuoA zB81yXUY$7zGI)8szEwjPhPmS-=MSGfZ`kzdv-Efq(X* z^fY$7_Qbe;@da~d&6}A#byi{m&CNO`o2jTC5;?L%7l>$WT%jDVaQ?{>O|AOKEjN~J z`E7q>@=rn$W&7U-*UaL5#CN!Zu3Z|s(9;j{(DG`Xpa_y8 zPpZ7i|IyCH55EUVf63ya^X3>^N_{t%h>(q_YyMWtK`qG8;2 zHtQn~cDA4SJx6po>N0b{jo}hcaIaW?xdJA@Zyt|>6JM!*as@}z^$@P$6i8J8H&yue z@dF0>FrMX}G*P!B@Xea|6r)cZ9FzjK&&Ym;S}rRh`|HoL^OpDK);4<8)6n>4~O2D({J= zU_z>go_HliBEduyUAlx$NYSohUpG7RJutW@Pk8Ps;&a8-h&dA`Brx4m<11@UI=dQB z(0H3!>(PnbGHJc#*v{p%lK}zIDq+2rP9|Lm+ypJ17OncQCY;LbTh|53l9J2$4Fkfc zcbd)KD8Dm&Oo{5sP!6ZE-05=E=<{D8L2@$Y%Pem(_bjwz(o^6B&`AV8;Go(0=3o^|)jo^t?N@5Ap@TYt# z9amUj1=eyIw`m(>qlWMa2w`V62%ew;8LXB_LFOZ?P2dH{^iQ*T!X=!H+tcw>fwwbm zTeVnP!HnCi7L|Do^JrT&%rWY!ITwX}1nk7wI7~j5IGfgJ;_PA`@3=2aLj&>8;23R! z@CT@e^ge`mHj|=?J0Yb8SVs1~0;ZM*5?L{fQOKu7>+haVX^*M*P+I!ho0Rsw>TXKQ zt0q%g^#|w&em`&~Yd@|hYj3XG$W9QavJ;|yc0%lacEXTxti9o%to@|BS^Fs`vi8xt zS^L;qS^ETuwV(AmYoFB2+Rs0dwa1@l?Wx(cy_rnw%}$uUX)7HenoV$|Xf{ELW)q}n zHbIJJ6QpQ1L5gM*q-Zulie?j}Xf{ELW)q}nHbIJJ6QpQ1A;IPbw42ZaXg0wHG@Bqr zvk6i(n;=EA2~sqhAVsqYQZ$<&MY9P~G@Bqrvk6i(n;^wpU`Wwyf)vdrq!|jB3=9uo zGBBiQHbIJJ6QpQ1L5gM*q-Zul3T6|a8S>%rBN>GRMzjvHKcyi1BSi!>r6a(a2I!xU zeu--bCqW5VQcJw3+jL-UzP{u=Kgl1I=*$pTl|K&0L_N`9`oV0#i>m zpuv#~Ortm^%H*+*OrBC;@{|ITM+!_H7(@eC&;aiyQs9?JfnNdzb}{2>MuBb6`mSPB zz1Xz7rXQaFcRKy>{J+!bzwttt&Tn)2Vg1142%lWMe$J;MFbyA_lv(JOJDm+2%LRMI zKrR&1F&%BgV`=*Sq+%2{_>RyVKB&;xJOn1@@xeTVSyEvLGfg+nYw(?YDtxA?Y}G)B z{E96~_+6reXIa-J9D!YQa(n2wMG5Dq+$mM$1Vj+AK&t3vEIH9vcp*GROK@p#dmuI0 zhNLAYA;6Ns2y@aFWAH7u2SVuzg_|*K*BC?rcpUi?PjFj9?Ylr8$vyjS(t1#snXAMY;0o zvpJuf&fC*xMMJhJr{<u%Mwv-3^DMn1#VQFJp8wv!ZlCg-r7q}W3NP*clY zgLn%(YOj@es;v)#kd_l}!B|$=+R>nI=jNe;HxG#tT_fdHC-pJh7hBd6?qy`Gy(=7S zaPMR!fm&cMUAAM0Gb{?3PNYQF_Bet)j1v;>{eqwu9EKDX-Q$QS;&DFpyWARqpRlnA ze0In6190CU+)&HjsDy2v7KhzW@Gmd1m>?%(G52g}nv@+^)w4O_4uys5<0wFic1?zw ze$g3#y={=jHerzkdkZkd^)|tfs5TXs-HS99i{?+14ts13p!>bW({!crBJbMwNl?-P z-P5Wp;ojN^Ds;8-nl9pM?O!g^+vOn}slLV;Y0{o5!RT7e4QK$h!dXa=T_yjS*=eKV zX}XjIO?LAZNV!TsJ6is1v9wXJqmz5Kc-P}f*<;AA7+#*;e?9E-WIrv*+NmR+ri-M- z(}Jg?BpqTt>>}d*?OK;Lp@K#FPH1v1wQg) zpzcZB`aOQdf`ZW%A^wemw-)YjJx#M z@FV8)Plp~Z^2C;#`)B#~7J6b4v-!V6=LS7hhWX}SL(4tQ)nh_=+1=p+V8dbA-MvR% zR?x4MIfCm=tGwa^RBkOvY zqtC@7D_5J73lKl_rzgxSF2^HJpJjHv9t-*3@C!UL;BIs5csx=pnbV)Z zBSTI#ubPENq<74_-ohi5mz%-|SZG{qqnD1d(Mylo=%sBodg)>ty|l7jD=pxSm>pUgUdmYLrHqAM%2?>7jD=pxSm>pUg7jD=pxSm>pUgUdmYLrHqAM%2?>7jD=pxw3CuQ#vb<} z<>ZIuaUk@PY@?S(+vugg+UTV#Z1mC+8@)8#MlU^KqnAV*y`Fvr8atLl#O26Xrq_jv(Zb{HhSp}8@=><8@;63=%uMPdTFbTUh>%JrAut|(ywjw zQePXrG}cBhJ!Yeq-nG$76K(X;O*VRIpN(EpZ1hsnK`*^_AoNn;hmKy-I?+p=nP$Gv znP&d&=%x7xk?kyPL)5_3G%!7fPxCMGCZKId`4tnY67U-pC9rV)hLq{)#E%Xv} z-QK1SFtoPNOZT@zFTKw;{y|lLt^pepr^wM?L{2fg&?Lq#u{ z7J4aTp_eiidI_j|mkAhUOZ3uTbLgdUEzwIi=g>=ExX??teUH#f{cQA7ru}UxVE2fY z=%xNS^wLu~^wKr0&`YCQqnErLL@#aqL7|uK{}#|o$94d{G-Zy3UTSQOUi!*HFJ&zB zQpQ3r0j20Aplxgk0_dgQIrLJMgI*eXNa&?%2fbAJt)iDcw$Mu%3%!(SgTC34=5oH+wG^9opi znKt}sZaXuzuDE?W484?RadA7_TBDZ~%jDe}y>wu&t+W3npn`aXp_lUdRBZGTgZQCo2NX3$HNrMHl_Y~iL1mQ3FI$+@ob;5SU1=tM6y zO@k-}0a8F}=}z=gCwhslgiiEQe6|Dq>O?Pr#`Hr2dQc2hNAMa5y2v3fJJCz6@QI!1 zB`{ZfPat_eEc6l+^#l~ga_A-1k>=&3mQEy-G!~%|V-cn#HEM+uEz~Q+vI{xzy8Rut zQYz=~R3+$XDK89Avmz82iW4BFxbMu!P$6Iwuk8xiO00m{XuT-b$*^HVj0ViUe*K+R zz-%|2qbBF(ZXpj1n9VhjW!>)dst`j9)we01fKeO#!9*&J_%nqnHwz>DcJ`Fl_T?Ri}CB0Ac$6SZu zl6Y9`Jv&ejhdVYp{6%H&XpjcS{th&u!4Mn^)brSqzJ0CW*Z>KHyVi${Zi~aW_jE_S z3M}|l#Nb!eN8?zH53}KNPg12}ut*_j^)YYRKMKr#cZC1QO;H7pilEWz{rzW>a&o!7ZaZQHHVuzODovo!3e z2D(CWvG#8?YB%Q_wWBx|l(mu=l55rUB#$AvRxQobjjP%3qETklw%ZgMyvu5W0IA?| zzY|3EJF88MYKOMrbvOf35};SZn+bUlzM+sXoqP=C2>kyKh%y9RC3gfID{dfMIUFm_ z5bmgJ-~iMmFQf2b!8&|cfWk{J4=0dWjlKOy;q6~P=d&=TILmPYmm;sZSVt-@CQ`|i ImE!FG0A#EU=>Px# delta 43196 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 z %W=X9j5p0k#ro>NO# %W=hV{Gb7~ptIdAIq8mY_)SI?EitLJ)))N|G{ z)N^X->N&L<)N?W>P@`*5&l}Y92KAi%4jR;RlJ7D23YUhT+Kbeno^vYZTa5Had*HMV&B^#==B)|*%hdrTb}TX(m8w56jRQP3iT9Lo$eXFmQyMG>r4UO z_)sa#y<@_8r^mT)Ud@H`YQffj-?<&F!uiOSzY%Tcs_#ygI;go*q!23P!_z6`Hx*8| z**bC;!sa=W4_yeSOod#{wk?!Id+q2hZ-vLx-K7L&uZ+=M2RFaQqq{PyBo^IOoUtT> zMRyrp!kP@I&?O3@a88-J!Yh>prONZLIP8gM{#I1AshPfc;`ee}RtTXD{Qpds9yWoO zMfhaxBYQJ5?s|V;xq9Kt&hz})Lo(Aa^kBJKYM^!EJR6!*XSKx~%bJe)YnL)U4R$ins!@ z9DmM85rJ2eRUYuOptcII%9+m$>e}!sIe|KFe-`T;o&nA(_4Y`e4m}etZE#zSI-~v# z1-w8GS+9C<8*9~Np0hBxf3JDYPEntSkFklyV_t5a)9d0&zg6NyvY9V7sHbmhFLdF->fY3gAC*%u2uqZr1 zOvtYk93`+nze;eFEr1=+mhD0ZwgGDqBCJJ#g5Y$sFdepNU^}ak+NeOBw4v%I3{faI zZapbC5R+pmQ1R9uGOOK0;Q8Oo&ue**H}mrbTu~z{iGTazcp>9y9@1^OFT-%`I~$?9 zl@g2j6~oWl=~=p6Ew85A6=0g%)zkI8U5z>I?Ft;a3(27ir^%383KF2Rbf50ft>g~f zzzf`=+q0GK(CyD1y5-l9Ll<6{7aPn57=P1pPd|L>nZ3i~=M@v{|lj7?c7OlRQ zVe5)(8J2#~nqm8e;2eYF%ezp2=QpXp`z-2rx2AsYOROIpx?|{o3-alJ%8hiuC0DZp zgg!q|fB#3Qe{etQANnQrk61(f*PKuN*L_I+p*yHQ){Xkd>~5Xn(4E5_y8Tt|(7olK zxfekOa1qCy%s#WaN@O9bihNq>40_Rbil9YUd#HQL?1pJx1k;NKQoj1wO6Ts zQwjBNnL_&poPYFJ$1MR@EiZ~L|Vc?Tt1st%w8uFA7-_ECef4Q>=j@J8!Uq*RK4{Yd* zc}nkPh)wRhr612r8g*}=e`?{|`Pu-Mmjokyv;guS06*>mgc;D{c}YvN2Gz(*TJi-tU#)pb8!krYtC^SN6-I9Yc&;ojg zhhB%&BWNFPf&1Ymc^OLxD#2$1dhEYHGL)wvz33RmQ;;@y9?nyc9-49mrXY0?;i5kD z)d-ezghSn&OGCau7x(ZQS5nT=+OAho&e4Nyucn-%M>|}D zIY-C5!tQm-NS0)T13j^a4fw@fs~P@dAy@^l|I4XO*$HZuk(g~?*XCNDWc0-6*YPBy zr|!O{ zWy#nY2Ii7igd17<5WLlIR;*xe?N|;Z$iQ1;1u$U$vD@h_AJ5%IKM0mSwEdUkc>2(e ze~!oWp^rsK40^TKgw({KXJ30^qFyVQEXdc6O=1=#jC}kh`azuRonk@msF?gOT9C)S zpF$R7!muE}{$?t(AmMZ;Umn5U;J4*(q&$dm*_RJZ6VCh~#*kq_Dq(XoVs4rVLrNm1 zKZ%i^Q7rE=4H#K>E1oWr5?N)o^`6J88=<|o+Qi0X8=Z9I-xi-K$Tv2b#g^6#h z6;oXF5E5#6;5p}*_(n(S+5q*1>(tqFAmT8VL58l@^~Wb zx#S7ngu#9K3*(*;JpJ2fc|Bg1_(n&1ePr?LEvm>1&mzG;UOa-gcx5-eMU~z37FBkO zCv-7_J(isf>Iy|;UVIcewIX3}&<(V>Dm7zH*9OE&&<3``B?ScI6cLP5fhEkncNHbf zJqsB-;1% z(cDBta}yEGO++*|5z*X41ap&ImuPR|4zxEB(cVNvdlM1uO+>Ue5z*d61bdSqSkr`H zRpEZLsu0ntLPVARs}Ohb zON~|)w$Z9WM5_uBttw1_JCFkpoA`+C4KU}%Ey^>Rvl`}$$%2L`usohi?PBV+gDc5m+4@3HXAY5I7mOfs+9W!pTh+ k69Rd{KOj#Vro{3v(Z>|UOc@RKnKD`w5`BU^(MQbwf4nb>!~g&Q diff --git a/src/main/java/zw/qantra/tm/domain/controllers/AccountController.java b/src/main/java/zw/qantra/tm/domain/controllers/AccountController.java index e1a3591..dcf1887 100644 --- a/src/main/java/zw/qantra/tm/domain/controllers/AccountController.java +++ b/src/main/java/zw/qantra/tm/domain/controllers/AccountController.java @@ -16,14 +16,13 @@ import java.util.List; public class AccountController { private final VelocityAccountService velocityAccountService; - private static final List SUPPORTED_CURRENCIES = List.of("USD", "ZWG"); @GetMapping("/phone/{currencyPhoneConcat}") @PreAuthorize("hasRole('ACCOUNT_READ')") - public ResponseEntity getAccountByPhone( + public ResponseEntity getAccountByPhone( @PathVariable String currencyPhoneConcat) { try { - VelocityAccountDto account = velocityAccountService.getAccountByPhone(currencyPhoneConcat); + Object account = velocityAccountService.getAccountByPhone(currencyPhoneConcat); return ResponseEntity.ok(account); } catch (Exception e) { return ResponseEntity.badRequest().build(); diff --git a/src/main/java/zw/qantra/tm/domain/dtos/erp/VelocityAccountDto.java b/src/main/java/zw/qantra/tm/domain/dtos/erp/VelocityAccountDto.java index 3157680..4712749 100644 --- a/src/main/java/zw/qantra/tm/domain/dtos/erp/VelocityAccountDto.java +++ b/src/main/java/zw/qantra/tm/domain/dtos/erp/VelocityAccountDto.java @@ -1,5 +1,7 @@ package zw.qantra.tm.domain.dtos.erp; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; @@ -14,6 +16,8 @@ import java.sql.Timestamp; @Builder @AllArgsConstructor @NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +@JsonInclude(JsonInclude.Include.NON_NULL) public class VelocityAccountDto { private String name; private String description; diff --git a/src/main/java/zw/qantra/tm/domain/dtos/erp/VelocityStatementDto.java b/src/main/java/zw/qantra/tm/domain/dtos/erp/VelocityStatementDto.java index 63364d7..74f132a 100644 --- a/src/main/java/zw/qantra/tm/domain/dtos/erp/VelocityStatementDto.java +++ b/src/main/java/zw/qantra/tm/domain/dtos/erp/VelocityStatementDto.java @@ -1,6 +1,7 @@ package zw.qantra.tm.domain.dtos.erp; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,6 +15,8 @@ import java.util.List; @Builder @AllArgsConstructor @NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +@JsonInclude(JsonInclude.Include.NON_NULL) public class VelocityStatementDto { private BigDecimal startBalance; private BigDecimal endBalance; diff --git a/src/main/java/zw/qantra/tm/domain/services/VelocityAccountService.java b/src/main/java/zw/qantra/tm/domain/services/VelocityAccountService.java index 1db6290..26ffd1e 100644 --- a/src/main/java/zw/qantra/tm/domain/services/VelocityAccountService.java +++ b/src/main/java/zw/qantra/tm/domain/services/VelocityAccountService.java @@ -26,7 +26,7 @@ public class VelocityAccountService { * @param currencyPhoneConcat The concatenation of currency and phone (e.g. "USD+263771234567"). * @return VelocityAccountDto with account details. */ - public VelocityAccountDto getAccountByPhone(String currencyPhoneConcat) { + public Object getAccountByPhone(String currencyPhoneConcat) { try { LinkedHashMap responseMap = velocityPaymentService.makeRequest( HttpMethod.GET, @@ -37,7 +37,7 @@ public class VelocityAccountService { log.error("Error fetching account"); throw new IllegalStateException("Error fetching account"); } - return Utils.deepCopy(responseMap, VelocityAccountDto.class); + return responseMap; } catch (Exception e) { log.error("Error fetching account by phone {}: {}", currencyPhoneConcat, e.getMessage(), e); throw new IllegalStateException("Error fetching account: " + e.getMessage(), e); diff --git a/src/main/resources/liquibase-diff-changeLog.xml b/src/main/resources/liquibase-diff-changeLog.xml index c9f61e7..6c626da 100644 --- a/src/main/resources/liquibase-diff-changeLog.xml +++ b/src/main/resources/liquibase-diff-changeLog.xml @@ -1,8 +1,18 @@ - + + + + + + + + + + +