From ca03b496dbfdd38e20b7f303639d4c3d15a75f48 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Mon, 16 Feb 2026 00:14:33 +0000 Subject: [PATCH] cleanup --- Directory.Packages.props | 4 +- .../Business}/HyperLinkController.cs | 50 +++++------------- src/Org/Coiffure-Avatars/Paul Schneider.png | Bin 5924 -> 0 bytes src/Org/Coiffure-Avatars/Paul Schneider.s.png | Bin 2213 -> 0 bytes .../Coiffure-Avatars/Paul Schneider.xs.png | Bin 841 -> 0 bytes .../DevicesController.cs | 0 .../AdministrationController.cs | 17 +++--- .../Administration/DatabaseController.cs | 2 +- .../Models/Musical/MusicalPreference.cs | 6 ++- src/Server/Models/Payment/PaypalPayment.cs | 1 + src/cli/cli.csproj | 2 +- test/yavscTests/Mandatory/BatchTests.cs | 3 -- test/yavscTests/NonRegression/Database.cs | 3 -- test/yavscTests/NonRegression/EMailling.cs | 4 -- .../Settings/DbConnectionSettings.cs | 7 --- test/yavscTests/Settings/Testing.cs | 23 -------- test/yavscTests/WebServerFixture.cs | 12 ----- test/yavscTests/yavscTests.csproj | 8 +-- yavsc.sln | 9 ++++ 19 files changed, 45 insertions(+), 106 deletions(-) rename src/{Org/Controllers/Communicating => Api/Controllers/Business}/HyperLinkController.cs (67%) delete mode 100644 src/Org/Coiffure-Avatars/Paul Schneider.png delete mode 100644 src/Org/Coiffure-Avatars/Paul Schneider.s.png delete mode 100644 src/Org/Coiffure-Avatars/Paul Schneider.xs.png rename src/Org/Controllers/{Communicating => Accounting}/DevicesController.cs (100%) delete mode 100644 test/yavscTests/Settings/DbConnectionSettings.cs delete mode 100644 test/yavscTests/Settings/Testing.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index 3f0f6d4f..076da407 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -37,8 +37,8 @@ - + @@ -59,4 +59,4 @@ - + \ No newline at end of file diff --git a/src/Org/Controllers/Communicating/HyperLinkController.cs b/src/Api/Controllers/Business/HyperLinkController.cs similarity index 67% rename from src/Org/Controllers/Communicating/HyperLinkController.cs rename to src/Api/Controllers/Business/HyperLinkController.cs index af9678a3..18da5f1d 100644 --- a/src/Org/Controllers/Communicating/HyperLinkController.cs +++ b/src/Api/Controllers/Business/HyperLinkController.cs @@ -13,19 +13,19 @@ namespace Yavsc.Controllers public HyperLinkController(ApplicationDbContext context) { - _context = context; + _context = context; } // GET: HyperLink public async Task Index() { - return View(await _context.HyperLink.ToListAsync()); + return Ok(await _context.HyperLink.ToListAsync()); } // GET: HyperLink/Details/5 public async Task Details(string href, string method) { - if (href == null || method ==null) + if (href == null || method == null) { return NotFound(); } @@ -36,14 +36,9 @@ namespace Yavsc.Controllers return NotFound(); } - return View(hyperLink); + return Ok(hyperLink); } - // GET: HyperLink/Create - public IActionResult Create() - { - return View(); - } // POST: HyperLink/Create [HttpPost] @@ -54,15 +49,15 @@ namespace Yavsc.Controllers { _context.HyperLink.Add(hyperLink); await _context.SaveChangesAsync(); - return RedirectToAction("Index"); + return Ok(hyperLink); } - return View(hyperLink); + return BadRequest(ModelState); } // GET: HyperLink/Edit/5 public async Task Edit(string href, string method) { - if (href == null || method ==null) + if (href == null || method == null) { return NotFound(); } @@ -72,7 +67,7 @@ namespace Yavsc.Controllers { return NotFound(); } - return View(hyperLink); + return Ok(hyperLink); } // POST: HyperLink/Edit/5 @@ -84,36 +79,17 @@ namespace Yavsc.Controllers { _context.Update(hyperLink); await _context.SaveChangesAsync(); - return RedirectToAction("Index"); + return Ok(hyperLink); } - return View(hyperLink); - } - - // GET: HyperLink/Delete/5 - [ActionName("Delete")] - public async Task Delete(string href, string method) - { - if (href == null || method ==null) - { - return NotFound(); - } - - HyperLink hyperLink = await _context.HyperLink.SingleAsync(m => m.HRef == href && m.Method == method); - - if (hyperLink == null) - { - return NotFound(); - } - - return View(hyperLink); + return BadRequest(ModelState); } // POST: HyperLink/Delete/5 - [HttpPost, ActionName("Delete")] + [HttpDelete, ActionName("Delete")] [ValidateAntiForgeryToken] public async Task DeleteConfirmed(string HRef, string Method) { - if (HRef == null || Method ==null) + if (HRef == null || Method == null) { return NotFound(); } @@ -122,7 +98,7 @@ namespace Yavsc.Controllers _context.HyperLink.Remove(hyperLink); await _context.SaveChangesAsync(); - return RedirectToAction("Index"); + return Ok(); } } } diff --git a/src/Org/Coiffure-Avatars/Paul Schneider.png b/src/Org/Coiffure-Avatars/Paul Schneider.png deleted file mode 100644 index 90acca7a7126e9e97ba80ac9446921946c50d18e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5924 zcmV+<7u)EGP)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBU|qDe$SRCt{2oq2Q|#hu4LRoye1LnDnw_ib6eB%iWugJldh7;KCI zb2>mUYe={PNtOi`LP*%nK1j0UWpnJp%O-gtBoH73NFECqg8jhUj-A-X_`-)Q`L<-; znxnh+kCALymSoM0dPd0edC#)cUDH+5^{wMq$FBs5!#;Zj4_x&F9!bqcbYIkg_n+ha zr*34v5hT#Z=Y-VI(+in<-ksb&{Yoy%DkIINBMb`@D*+Q|ti!+YHCDgyb$)DwSY?I? z2}#!3%enu`?{jxrE_T)HvmMPCzrTxrUHddYvM`BJp(QYGBdd(^apy9}?Zef5(FF1* zQ0($CcI(@`ZW;u;ZVAnf%k86T&dvPWvY+tql*Lqga&QQV=>5`%n(pVj($Gt*D4+FZ zE>Fv2QvC+nD;KhG>3{IgzG7TG(;S{$>Tw>KeFNub6yT!AXX1)LxV@wlPo<)K4wqD% z&p8DXN$)K}qZ9L!=lJBA+qeyANJLUkM?wYA(Zv2>Cn@=rOi#}xO~`PDD!`SB%o@#< zogcEtlTH4NWjuKK_qe&Rl00d*zQmsnrJ$_|>2JkZT!mBgdXuIf{`L}^p1p$yi~wsB zlgiVRPyqlO-a)2_@0A`lwF?Zwm4 zOqRD0-xx)$px*Z&;5bS`KBhYdPf}JQMNK@TBUUkznNX_jqFTx8vA0{2q13)XD_^;Z&%Kz(%*reQ4HyM!>ipt9YTPR;r{{j6l6gq z`QB0{t$Tq@z}|!=un&gC>-CmUwcs8eo^d7fQ*%ghdJ&E^NRX93q(~bgcQm=_MU3C{ zDl37OM5n1I!$AP~b8qFo^S;7mu1s7A#IWn^#fa3AMdQiSoRn-^#fynfPfrpqfa+ze zSa>hDd5iHPMnakI8)-)?s-(2}FwVNavpUh~=_Zi^5Tk3jddWjPR8mE;8o`+lfI#R@ zQZmaZ+rNeV4SU#}=p;en1R!iqDrPR@>($GcBkc)FMVt`=Qqyq@jqGi!SRV>-FwtpB zhyZL3GG;8}ro|7k+?~l6z{ndqqz&mS#1{$@*t3=oO{32#@3@f&0cZu2n0@g>{7bYl(jeh?~9ZIVxpL!XWx_lHQ zG%azC&z@Pz?73fMsVjXL&Fm!rX9o5um$0z3ngt}VGagp~qg)w z0;pWXttFH2B}@OwC;^$H7&U4Ri&E0?#XJ6Z3BYyUoh(hZ{e9!kK%cUR^F3K)$2;!0 z2*6dstjtl2Kht~u{UIbGYYdh4R5FS4BzRl|u;4b9=Z-qF?f!vKfUgK|s*kILAU&RO z$3p5x3D2s|Dcli7kaS;AN;M~DF2xr|9kjlBIA zKxea{aThe~5C|Q7Wr~b4g*_F^EoBviWA%cAp9)%!hL>`A3l(`&z@4d37R9dsso_J! zZph2(nB7^=l=o{|oB2D>@n#2ykaWS+!*LR}=+Pm1T`runo4pA^6}a z*uPy7Y!6>|q(RYm!G#Y(;dEtLZIG6aT}UPZhb)TXBrFv`*-S<|QwLw2383L~!Ef(? zeH%;yy;jTBZGz^5f{VWe`4(kD?K|-2dtl!_MJRaky#reW!8(l{V1ix(`t_ ziLA*lbpV(U$ zegrhPD_ZvpQnMA_5-cfw0GborS)lhwatOuVT?Xr4R&0Gu(9$Ll7TZn^FCJ@SIDypy zaHt3bU;-6O6l15JXf+gYtjT26Zw-FFMDgmkB<+W->4gaa6$@bDJpz~GMEtEy@aelI z&p)Kty+&F-Ta)4@ZX+j_HUTP%-mEKAam&jltAC`i@&6PD>lK=S?0iA>wSpNpnYeSU zGsxU|iiM9T#$71c{HoySZjcgk#wx0=Qxr}&Ecf@~@Dev~2$l*!ob=z|P=G5(aoP6` zE_hJTR4Wh~c=8nPOcN7p?QsRzJTPIANyVaY;zieW!{WHR>FsdJN~|3Sis5aA1f+Ns zxn6brQC2#F?9G`nd1Y-A5YD%l3eA}~jBEzur$1{ufdap!&mW<5Hq#lexGWWb5ctKJ zS%_nzqnXxt#bxzuV4F$`AY$4Y0f|YdgQ06sNp%k{^}ZJjpqlqludJJK zPLkvVLs0`rsUZ;v6v{L)QQ>N|5IJx06Y|^cTr)hmp#(+{dw7IM02tk7qO_SIp(#TE zrU{`gOIRTk2=jP2O@%aFg#e5Y7@Zt1N>UQU4F4%~VQ4l&0A>(Ee!v7JP$(7ZDuF_? ziGb9?gN$Y>Ahd_($-b{#t5*d1({X8*qE7BtUQsrfm40_)?c{3L#UH~?QYpm zNkxyC%<#VxVfyI~C{X6fpX)Q2>e;5Ke#3>;cH&Pd;qVsK@aC)9YA}YO00hEU!qmC9 z^WC$qXHixOj_x+CY$jt~xEIfcKl4K^pqXaSRG~ySXM#aFVG(k8c&C+sBOMc@Vf741 zR08moF!Pd!`JY+WQJvyCxtwH{;#zn=Hyqf^TmH?4E)t#jUqBRKnkdjs2%a{4EJWNp zPcLBdMGx@goLi{2yH2en6;M(|Zg~yYm=02t*&ijQ>i%IVkqThcxnJYaIm@Z)%Z%wp z(_!ZI)R2igDS)U^U|2pY7>NK}QQ6C?KO4ht00ak@0s%ITBDx^t4?pW3ZVsu4V5fE(01uEa_cm~YW6c2MI z%;%!iT+*V-NUPUyk6?72wCNXfkJa(?F93n4zLt3v=Q38eM_Gaev z0Bl85IIH|DD(tT4AMQU&XTLLGNd`o9O><@xkbdz4tSCF1!W_=?vzk z7e(*e*EFHClNMzrdjV0=y~aU@QPapj?>6rAm2xo*t@n^V1yDSd@f8?e-(7C>fNHnX$KVmsDF0gd(S@dWTErvjp6fDFhiA>+K;Sw7)HZnHVaj3t_r z^2b|5{^TW`<4lWf22TNN|G+N$Q58%IAUc!+L_aE!kT;&3h4*p$*mL-*W{cjXOwat0 zX*m>^&SX-oy|$1a8uzkW1PP7g6TuUS(4e%6oW&1wx7){3qC9)>xBzS}(o3p2$5%pn ztlPL6Yw-u#SS_HvKM^Mx7}ZZ7peI6y@*47&|C&c_PAa2`=ePjuPP~Pc%<)7w?QM z8-S>Zz<3TxM9p=SFZ&sdI?Q(0u_me%`S9_ ztXaXLnp=3(?iyTkAOWOKx;LMRdW`<*1kkXXhPFmN0h*Gz9}AHeA0;3y2gm$7`O?J2 zd=pMTMj!#H+nHQ2k-}JKZjBH$9i%qU#xXeFk4fqv3Zh;|At9$6@A-GJqG&2Nz`%Zo zrI5(dnM`+O#J-Ei-+@`Xp3N->ISe2Ny@oi+DGb64><^*C=vm}l`dw}%=#FJtpzxNfYeN!H8*la@l>vXlTRj<6&F*kr^Gh zu0A!GZ~-Orzs@6`97?+{OP7x^GDfAf9wc;d8y}k?*7m$^hLSzNXi-FO2KI-vA*U{3 zer_4dga|J&m#ElQ|Dd3?f&GnjZ0&tZ#O(;=5r_q+Qz{^{7~7)naI?!79x9gUd3a(G zfEhw*0A~W_xPx<`zqN7hz*NMj{;m?#JP8HS=24GGT~S~O*_`G8mQ|l zj3z~LMNpJjy{lRP`4v=0FMt4{U4P@Vo$vFPegkPq0YpsKx6|LS_4Y^cN1-Bl4kTLU(}&Yr`c^HWaa z$4)8LeI8Ph2oXA+JKp87|NRn=9oS09s@6an5qKjPK*K(G`eq)16SIE(VY4M?1Ea+> z1t|4|^|c-^W@ zT58wvyQja(6(9VT5897lNJY%+Y%~SCK4y<>sO9ir+5uspw*8gbmmeIw?>cEC)``Y5 zmtMY=4sB!YAMauLpC01Bcdut(sDn`NFoQ(^&5eXs{gfxvEB})x>elfT5jZfGvU_u2QUsAQfOoZyJsRwA*7JW%#V`OzqW&0-r&hCZ}22=`GWhIm!3=I zm^qX>oTNIvIBX7d(?I!K@V6eLrFK0#{`Nd??tGu$1UqQ}(2WqmHNWQZ+_8Lr)C@-1 z-Dsu({uToD8>#*9cRauDkNn)<%8^LFgOoz_>*XTJz(m%~d*!Vk@(O~&l4@qTyyRpQ zljic`G=dmS`)N70j{^s`@Nq{Ywe+aPbrfd(I$nM4F;XWi;Ht_CDepK&=Z^RIbjx3P zvvw`7b+&{zdPIt_siYYgB~cw0rKqo6%S(}bLE6EpM`6s2(o0Lkw%jS^ECUwi>{jRPiIfhZUeoj^2_=Y~c}yarJ%?gOagf{h zL+DBgVWQA=q?AG`6A*-Sx61d9p(-^?IE`SJKzrqu05n_p7p1@q^=-QK4yU@pbu_BB zrrm5;0S+OMLZYNYnIb%TChOP8ZDA+y)?%pu)~z$&`o{*|MHnZ&!0z#3(?HIHoVP-)j#KZLb9VPggB|z5ho2Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBU)BS}O-RCt`#ntO0m)fvEl-`U+{6Y}JhL`)EZ5JEv9q)sVLl|dl2 zGn9u_TCK#^TBW6(QW!0Q8I5r)cBVcG9i}Qsk@!HET40>9mEl>+t5}prkeQUHPzcYw zcJDp?W3z!Q`?~k;!uB_l?A&wD_nq&2=X~dR1!tr$(X^UCOA}Y>Dycm4CHnyo%B$aI zam6(5a(fZ0iq9XXX>Bd9Zu%pC_}xj4b}J+u;KE7H*9>7`OA}`t+TLNNL+0(~T=59< z0gmqB=nEq$yRU|&Rdbo@&OkZQZTjJCBdxtk@dEg+V9p=Jg!9Mw#Hrmu96P|1LH@#1 zob%=co)2%Lb-);Gw0RgbH139eBf&7xHDBYAuMV<20h&8;)ItEh7MkiRxkF5};e+hn z393ARK;H^D{}mkAfZY9aenJ9lz7}^Pl!)LtycNms3k8D`p|LADg@M2Fag52xVdK&t zG8Sl0gl?Bp1s*TOHDB;q!5~~2xrs0-I=9|IiQ(s#!<+a^BJ??Sz_b6RA-|ZML>Ln< zgU2$maTkrJ5AiRjx*WyRgt@FND5JMiBdnr<$5yh$0Yvck4l>ox+mE z@JUqJm9^}E;nSF^?Ut4#dX!KI_QJrj18y767&`?e6L$uxyo!l-WUVWth(ZlTu%)gcA0aAEk7rpQw$zrj9MF+T{ZSVW?sZwAXxU?26pv7$(fHr*qq5+gUupBbl zK>~(qafu;BtJm#}u3pMpz53DTqgvkGwn)|dzSV4Wr^nyOVFxzz`jU0Hj5GhpPI3di)BXPPk zS~d}v0ftjk04SOLDXW8(2T*R*gy)!PN&AgP8`f%1cn8R1tN1Xd<1+GEZX2NoqU_DL zHv+B2xdVC)VC<+VRD{diErSe6Km;TUjdtt+_4q34Bh}F5aek4KOtNx~QC4NTIG~`6 zF(t$387Z?iFm(cMl#|8XGu5QZAMl(NnJx~Pv5fj?0q$$YXUno1gw{~~CiAlkxIbQ* zE)FQIq$pbE6UXH&=FPnfiG~0w4Hh<15A=;krn54We@nd?qjO(A!>LpbfzGij9ks~d zh;qd~y6<$r=!aq-DxTQJcKhZfAGu~ZsT69#K2E#SqFmhzJaIV4UJjJszR_l=*+;&AU2kbmo7N@D5$Y#o~&8Fxd7+&ok2_-Vl) zeifRohE#EvCp&VC1l6vs;dM#b2{1^MRk{ma*w4#uZ`WnM>d}{PDp!oD%?D^UqmUGy z1!LkD`YK89sm}t z>)xNdhz<}9E1tO8`T#10LqLE-8}uP<#6L}mfC_sa5A6DYeJA$uao0k0N)LiN-;F<6SRfCXupK-{a-U9G+ntLfIo>e^a;@25>`XJ|G+4|)c4y!{O z*%zv0*^ha?=|5qIJCwNn~Ifh#TGkhENG4{nl_E0CtIxnUIn4hI3qCHQKq;;LE!y(st>gBr*^g0F7JpB=cp5#YAbkEm nS^UCbdp)b(oX#{0BG>Uh)j4G@b;6 diff --git a/src/Org/Coiffure-Avatars/Paul Schneider.xs.png b/src/Org/Coiffure-Avatars/Paul Schneider.xs.png deleted file mode 100644 index 1400a3a0754bf242b8464f088a83d9bf9db02abd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 841 zcmV-P1GfB$P)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBU!$4Nv%R9J<@mQ6@hQ5c4wb8a&_mg7%`S!M}VV9}yYk}axDR1hvI zXc1IISr8~;R!}O03k63IY+M!*SZ<6W`hlQDwKB++AQ6r+g5ivc?t(Ym!+<2^+En0H_z{8D>i$R~rs+q=EZc0bF{@o7IK`oavy& ztZw*v+!0jzEt;9kmcck8rsDr0c-v-do%kkrepNGLaI734My-1kAKk_uLq`pK>5mvr zbH@Qr7(Kf#6M*hHz~pP}3Pfv0jvObsM$cNb%I2CJ#k&?cSt)MWw(R9(%P=qd&eDG6 z8F#G;2~IKJu#r4-070%>XC5FF09#6XcAEc1pm7uHQ`MIDKyNS_4q&%196%2n*OmdK z-P+JtsR()1$GDNICIC9TEI2o_jIc06B*%&A$+8m7jtlb3Rmu}l0>p*`j1S|nDjWbk z`t#?n-I)lG)M~tFrOQ%)m=mf`F&zhRu9ruN{*m|eSehRLpn$&cUnE(3f!a7CE0dQ( z^@M8;TzsJPh& zX9z1r(5m1i>0$I#_k~2n0W=g)YIQh3Xb!LIDCbkvWMGm7fXA0{0aO11Kt)g^A9zwP zkOMb)rvXwyQz@0kJ)wnr!24Nv+77CURJAo}NHCeqngFP{qv$^X2&5r^VN?3BMxN5_ zh`Meur~nm-9;wm>dI$tkT`>?145L(o`QjHHHENjB Role(string id) { var role = await _roleManager.FindByIdAsync(id); @@ -39,7 +41,7 @@ namespace Yavsc.Controllers Id = id, Name = role.Name, Users = (await this._userManager.GetUsersInRoleAsync(role.Name)) - .Select(u => new UserInfo (id, u.UserName, u.Email, u.Avatar)).ToArray() + .Select(u => new UserInfo(id, u.UserName, u.Email, u.Avatar)).ToArray() }; return View(roleUserCollection); } @@ -62,17 +64,16 @@ namespace Yavsc.Controllers if (!resultCreate.Succeeded) { AddErrors(resultCreate); - return false; } } + if (ModelState.ErrorCount > 0) return false; return true; - } + /// - /// Gives the (new if was not existing) administrator role - /// to current authenticated user, when no existing - /// administrator was found. - /// When nothing is to do, it returns a 404. + /// Gives the new, when not existing, administrator role + /// to current authenticated user. + /// If nothing is to do, it returns a 404. /// /// [Produces("application/json")] @@ -110,7 +111,6 @@ namespace Yavsc.Controllers } [Authorize("AdministratorOnly")] - [Produces("application/json")] public async Task Index() { var adminCount = await _userManager.GetUsersInRoleAsync( @@ -197,6 +197,7 @@ namespace Yavsc.Controllers ViewBag.UserId = new SelectList(_dbContext.Users, "Id", "UserName"); return View(model); } + private void AddErrors(IdentityResult result) { foreach (var error in result.Errors) diff --git a/src/Org/Controllers/Administration/DatabaseController.cs b/src/Org/Controllers/Administration/DatabaseController.cs index f85e44f4..7301fb87 100644 --- a/src/Org/Controllers/Administration/DatabaseController.cs +++ b/src/Org/Controllers/Administration/DatabaseController.cs @@ -7,7 +7,7 @@ using Yavsc.Models; namespace Yavsc.Controllers { - [Authorize()] + [Authorize("AdministratorOnly")] public class DatabaseController : Controller { private readonly ILogger logger; diff --git a/src/Server/Models/Musical/MusicalPreference.cs b/src/Server/Models/Musical/MusicalPreference.cs index 4bcbf8c8..35d787ef 100644 --- a/src/Server/Models/Musical/MusicalPreference.cs +++ b/src/Server/Models/Musical/MusicalPreference.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; using Yavsc.Attributes.Validation; namespace Yavsc.Models.Musical @@ -17,7 +18,10 @@ namespace Yavsc.Models.Musical public int Rate { get; set; } [YaRequired] - public long TendencyId {get; set; } + public long TendencyId { get; set; } + + [ForeignKey("TendencyId")] + public virtual MusicalTendency MusicalTendency { get; set; } } } diff --git a/src/Server/Models/Payment/PaypalPayment.cs b/src/Server/Models/Payment/PaypalPayment.cs index 60c6b2e0..e8e41d6c 100644 --- a/src/Server/Models/Payment/PaypalPayment.cs +++ b/src/Server/Models/Payment/PaypalPayment.cs @@ -15,6 +15,7 @@ namespace Yavsc.Models.Payment { [YaRequired] public string ExecutorId { get; set; } + [ForeignKey("ExecutorId")] public virtual ApplicationUser Executor { get; set; } diff --git a/src/cli/cli.csproj b/src/cli/cli.csproj index c136b874..8def68b3 100644 --- a/src/cli/cli.csproj +++ b/src/cli/cli.csproj @@ -18,4 +18,4 @@ - + \ No newline at end of file diff --git a/test/yavscTests/Mandatory/BatchTests.cs b/test/yavscTests/Mandatory/BatchTests.cs index c39cb154..493b6cdf 100644 --- a/test/yavscTests/Mandatory/BatchTests.cs +++ b/test/yavscTests/Mandatory/BatchTests.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.DependencyInjection; using Yavsc.Models; using Xunit.Abstractions; using Yavsc.Server.Models.IT.SourceCode; -using yavscTests.Settings; using Microsoft.EntityFrameworkCore; using isnd.tests; @@ -14,13 +13,11 @@ namespace yavscTests public class BaseTestContext: IClassFixture, IDisposable { public readonly WebServerFixture _serverFixture; - private readonly TestingSetup _testingOptions; private readonly ITestOutputHelper _output; public BaseTestContext(ITestOutputHelper output, WebServerFixture fixture) { this._serverFixture = fixture; - _testingOptions = fixture.TestingSetup; this._output = output; } diff --git a/test/yavscTests/NonRegression/Database.cs b/test/yavscTests/NonRegression/Database.cs index 12157e09..02d60b26 100644 --- a/test/yavscTests/NonRegression/Database.cs +++ b/test/yavscTests/NonRegression/Database.cs @@ -1,6 +1,4 @@ -using System; using isnd.tests; -using Xunit; using Xunit.Abstractions; namespace yavscTests.Mandatory @@ -18,7 +16,6 @@ namespace yavscTests.Mandatory this.output = output; _serverFixture = serverFixture; - output.WriteLine($"Testing connection string is {_serverFixture?.TestingSetup?.ConnectionStrings.DefaultConnection}"); } /// diff --git a/test/yavscTests/NonRegression/EMailling.cs b/test/yavscTests/NonRegression/EMailling.cs index 5f7450b6..eab947eb 100644 --- a/test/yavscTests/NonRegression/EMailling.cs +++ b/test/yavscTests/NonRegression/EMailling.cs @@ -1,12 +1,8 @@ using isnd.tests; -using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit; using Xunit.Abstractions; -using Yavsc.Abstract.Manage; using Yavsc.Interface; -using Yavsc.Models; namespace yavscTests { diff --git a/test/yavscTests/Settings/DbConnectionSettings.cs b/test/yavscTests/Settings/DbConnectionSettings.cs deleted file mode 100644 index ad2e43c0..00000000 --- a/test/yavscTests/Settings/DbConnectionSettings.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace yavscTests.Settings -{ - public class DbConnectionSettings - { - public string? DefaultConnection { get; set; } - } -} diff --git a/test/yavscTests/Settings/Testing.cs b/test/yavscTests/Settings/Testing.cs deleted file mode 100644 index 96fe3516..00000000 --- a/test/yavscTests/Settings/Testing.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace yavscTests.Settings -{ - public class PasswordCreds - { - public string UserName { get; set; } - public string Password { get; set; } - } - public class TestingSetup - { - public DbConnectionSettings ConnectionStrings { get; set; } - - public PasswordCreds ValidCreds - { - get; set; - } - public PasswordCreds InvalidCreds - { - get; set; - } - public string YavscWebPath {get; set; } - } -} - diff --git a/test/yavscTests/WebServerFixture.cs b/test/yavscTests/WebServerFixture.cs index cafb7de7..133fc8b1 100644 --- a/test/yavscTests/WebServerFixture.cs +++ b/test/yavscTests/WebServerFixture.cs @@ -1,7 +1,4 @@ -using System.Net; -using Microsoft.AspNetCore; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Identity; @@ -9,15 +6,10 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Xunit; using Yavsc; using Yavsc.Models; -using Yavsc.Services; -using yavscTests.Settings; using Yavsc.Extensions; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.Mvc.ModelBinding.Binders; -using Yavsc.Models.Auth; using Serilog; using Serilog.Events; using Serilog.Sinks.SystemConsole.Themes; @@ -46,7 +38,6 @@ namespace isnd.tests public ApplicationUser TestingUser { get; private set; } public bool DbCreated { get; internal set; } public SiteSettings SiteSettings { get => siteSettings; set => siteSettings = value; } - public TestingSetup? TestingSetup { get; internal set; } public string TestClientSecret { get; private set; } = "TestClientSecret"; public WebServerFixture() @@ -118,10 +109,7 @@ namespace isnd.tests Addresses.Add(address); } SiteSettings = app.Services.GetRequiredService>().Value; - - - } public void EnsureUser(string testingUserName, string password) diff --git a/test/yavscTests/yavscTests.csproj b/test/yavscTests/yavscTests.csproj index dfe5352a..81de4b76 100644 --- a/test/yavscTests/yavscTests.csproj +++ b/test/yavscTests/yavscTests.csproj @@ -24,11 +24,11 @@ - - - + + + - \ No newline at end of file + diff --git a/yavsc.sln b/yavsc.sln index 900b138d..8579fc75 100644 --- a/yavsc.sln +++ b/yavsc.sln @@ -17,6 +17,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api", "src\Api\Api.csproj", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cli", "src\cli\cli.csproj", "{27DA6CEC-4266-4F78-BB32-8388F9A401D0}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{76A7FBA6-B7EC-4864-85C0-1F470794BA0F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "yavscTests", "test\yavscTests\yavscTests.csproj", "{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -50,6 +54,10 @@ Global {27DA6CEC-4266-4F78-BB32-8388F9A401D0}.Debug|Any CPU.Build.0 = Debug|Any CPU {27DA6CEC-4266-4F78-BB32-8388F9A401D0}.Release|Any CPU.ActiveCfg = Release|Any CPU {27DA6CEC-4266-4F78-BB32-8388F9A401D0}.Release|Any CPU.Build.0 = Release|Any CPU + {CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {8AD551DA-AFB7-4C2A-BB33-9418E38659BC} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2} @@ -58,5 +66,6 @@ Global {1F594222-C5CB-4D4A-94A1-C5AEB4990B59} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2} {95DAD2B5-4324-4E89-A337-5703E45CFBE8} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2} {27DA6CEC-4266-4F78-BB32-8388F9A401D0} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2} + {CDCF676A-2037-472E-8C8B-67C5E4FDFEA1} = {76A7FBA6-B7EC-4864-85C0-1F470794BA0F} EndGlobalSection EndGlobal