From eee6f596aca9ae2c5fdf0015a9665ee13c06cf70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Thu, 30 Jul 2020 18:29:41 +0200 Subject: [PATCH] Update about the relation column "User" for the images and begin to add a column in "Aircraft" --- Back/skydiveLogs-api.Business/JumpService.cs | 4 ++-- Back/skydiveLogs-api.Data/ImageRepository.cs | 10 +++++++++- .../Interface/IImageRepository.cs | 4 +++- .../Interface/IJumpRepository.cs | 2 +- Back/skydiveLogs-api.Data/JumpRepository.cs | 8 ++++---- Back/skydiveLogs-api.Data/LiteDbProvider.cs | 1 + Back/skydiveLogs-api.Model/Aircraft.cs | 2 ++ Back/skydiveLogs-api.Model/Jump.cs | 2 +- Back/skydiveLogs-api/Data/JumpsDb-log.db | Bin 16384 -> 0 bytes Back/skydiveLogs-api/Data/JumpsDb.db | Bin 237568 -> 237568 bytes .../DataContract/AircraftReq.cs | 2 ++ .../DataContract/AircraftResp.cs | 2 ++ 12 files changed, 27 insertions(+), 10 deletions(-) delete mode 100644 Back/skydiveLogs-api/Data/JumpsDb-log.db diff --git a/Back/skydiveLogs-api.Business/JumpService.cs b/Back/skydiveLogs-api.Business/JumpService.cs index 91322f2..01d8b82 100644 --- a/Back/skydiveLogs-api.Business/JumpService.cs +++ b/Back/skydiveLogs-api.Business/JumpService.cs @@ -39,7 +39,7 @@ namespace skydiveLogs_api.Business jump.JumpType = selectedJumpType; jump.DropZone = selectedDropZone; jump.Gear = selectedGear; - jump.UserId = connectedUser.Id; + jump.User = connectedUser; _jumpRepository.Add(jump); } @@ -51,7 +51,7 @@ namespace skydiveLogs_api.Business public IEnumerable GetAllJumps(User connectedUser) { - return _jumpRepository.GetAll(connectedUser.Id); + return _jumpRepository.GetAll(connectedUser); } public Jump GetJumpById(int id) diff --git a/Back/skydiveLogs-api.Data/ImageRepository.cs b/Back/skydiveLogs-api.Data/ImageRepository.cs index 903afd9..3c6fcee 100644 --- a/Back/skydiveLogs-api.Data/ImageRepository.cs +++ b/Back/skydiveLogs-api.Data/ImageRepository.cs @@ -19,7 +19,15 @@ namespace skydiveLogs_api.Data public IEnumerable GetAll() { - return _col.FindAll().ToList(); + throw new System.NotImplementedException(); + } + + public IEnumerable GetAll(User user) + { + return _col.Include(x => x.User) + .Query() + .Where(j => j.User == user) + .ToList(); } public Image GetById(int id) diff --git a/Back/skydiveLogs-api.Data/Interface/IImageRepository.cs b/Back/skydiveLogs-api.Data/Interface/IImageRepository.cs index 141bc2f..b0d275c 100644 --- a/Back/skydiveLogs-api.Data/Interface/IImageRepository.cs +++ b/Back/skydiveLogs-api.Data/Interface/IImageRepository.cs @@ -1,9 +1,11 @@ -using skydiveLogs_api.Model; +using System.Collections.Generic; +using skydiveLogs_api.Model; namespace skydiveLogs_api.Data.Interface { public interface IImageRepository : IRepository { + IEnumerable GetAll(User user); } } diff --git a/Back/skydiveLogs-api.Data/Interface/IJumpRepository.cs b/Back/skydiveLogs-api.Data/Interface/IJumpRepository.cs index 8ed49ab..e3ecd8e 100644 --- a/Back/skydiveLogs-api.Data/Interface/IJumpRepository.cs +++ b/Back/skydiveLogs-api.Data/Interface/IJumpRepository.cs @@ -5,7 +5,7 @@ namespace skydiveLogs_api.Data.Interface { public interface IJumpRepository : IRepository { - IEnumerable GetAll(int userId); + IEnumerable GetAll(User user); } } diff --git a/Back/skydiveLogs-api.Data/JumpRepository.cs b/Back/skydiveLogs-api.Data/JumpRepository.cs index c0c4447..1ae7c6e 100644 --- a/Back/skydiveLogs-api.Data/JumpRepository.cs +++ b/Back/skydiveLogs-api.Data/JumpRepository.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Linq; using LiteDB; @@ -17,14 +16,15 @@ namespace skydiveLogs_api.Data _col = _dataProvider.CollOfJump; } - public IEnumerable GetAll(int userId) + public IEnumerable GetAll(User user) { return _col.Include(x => x.Aircraft) .Include(x => x.DropZone) .Include(x => x.Gear) .Include(x => x.JumpType) - .FindAll() - .Where(j => j.UserId == userId) + .Include(x => x.User) + .Query() + .Where(j => j.User == user) .ToList(); } diff --git a/Back/skydiveLogs-api.Data/LiteDbProvider.cs b/Back/skydiveLogs-api.Data/LiteDbProvider.cs index 7ad3405..fd8d29b 100644 --- a/Back/skydiveLogs-api.Data/LiteDbProvider.cs +++ b/Back/skydiveLogs-api.Data/LiteDbProvider.cs @@ -14,6 +14,7 @@ namespace skydiveLogs_api.Data BsonMapper.Global.Entity().DbRef(x => x.Aircraft, "Aircraft"); BsonMapper.Global.Entity().DbRef(x => x.DropZone, "DropZone"); BsonMapper.Global.Entity().DbRef(x => x.Gear, "Gear"); + BsonMapper.Global.Entity().DbRef(x => x.User, "User"); BsonMapper.Global.Entity().DbRef(x => x.User, "User"); } diff --git a/Back/skydiveLogs-api.Model/Aircraft.cs b/Back/skydiveLogs-api.Model/Aircraft.cs index a1d8703..57760da 100644 --- a/Back/skydiveLogs-api.Model/Aircraft.cs +++ b/Back/skydiveLogs-api.Model/Aircraft.cs @@ -5,5 +5,7 @@ public int Id { get; set; } public string Name { get; set; } + + public string ImageData { get; set; } } } diff --git a/Back/skydiveLogs-api.Model/Jump.cs b/Back/skydiveLogs-api.Model/Jump.cs index 7641314..244fc27 100644 --- a/Back/skydiveLogs-api.Model/Jump.cs +++ b/Back/skydiveLogs-api.Model/Jump.cs @@ -14,7 +14,7 @@ namespace skydiveLogs_api.Model public Gear Gear { get; set; } - public int UserId { get; set; } + public User User { get; set; } public int ExitAltitude { get; set; } diff --git a/Back/skydiveLogs-api/Data/JumpsDb-log.db b/Back/skydiveLogs-api/Data/JumpsDb-log.db deleted file mode 100644 index e135b2044ef7980e275c78a2cd3ea57a57169742..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeI&xz6io8316P|1d&22m}QZ!w6{#s9eN$>^MOh3GcfTJMr3p_t-qDw_w9ZEwfD``{~EO&ev80=V7~Oe_br3Artc>3BjCf&S3=-@^a~SskH@zU zuidvVUXR~&y}e_<4|;EVTZ0?;=lp*QC;Q1T~OIG_j}yO{N?`2#zM~sl(O7couNc#>K~zfo&F1VSv$wgN!(%`TN{hY4J2()YpNc( zwwWlOZM_Pu;oQu#i-}kx*F;k3AkKY6h@535=;pJJ#-Y>zBuj;|(p?=ZO~XPMI+4kk z+(Vmz>u6zmWY=+OejBGsuNMoPbi|*|SNVMOQuCxojzT~lZG>=15YRz#<=VdAy>`JR zb>YxKjQ6xt7Za->AY@~AW3&(1aiUQyEJn4B=v&0_BIki%%y@hMTGuDiyHAh&kU}Qu z2T*%?D5Z$WI;=gX{MzT^0lS@M3~V zQT~#mR`ASBo?vYDa&CH~5e#+l%L7~l)TquALt8l+8zt8srrKC;3gPY1BoHAp!>m$J zXt*~Ms-f*R9vvZju$4#8_JW~zPY+$cCxr6U$Oc{AyhXi6*ARDM2^*t zalLj=!B<#1Rc7j%wqo=K+3z^YV$=bJB#%zfAgTkCO2~-gET?G5n>O$9fY1#tB}(&P z$fz)*Y8dd=HFs0ChH5$*Zd^D9KDn472s%n1Tn{jZFg?W&kLwWytJo53FSx|akW!odzQdZ9X@qhH63C7jKm_@7?N(Bg96fbMJ7>8bt8D(2|`U{ zZ>75%DVi%A$fYqApRUXUDlhUAY;8Iunc&_I9!L_W17&c%OMxhRP||@WlDsp70w%1M z^fDVFnZsQdkYkQ4Bg7l+lgJ<)FZ)8X_gp%N3`R6PD3)E~6A>FNA=AQaX&xV>d3K|K zLlMoHdEOv|CZOZCI6ZiVv*l!Af-4$Ph^k2le%~i2!D-6gniBa6(VZoZEhd3Gk~@*th-=gEvPLo34Mq+OCkCCFq)8i&fylLC=63O;8e~Wl_u!a4UDV=9?p92)C4myYo)gCz*R# zqk6?h@{pEOIeH#0L~^>W$TEYH^T|&6Gfa}W(ZuuQ^?|f61TQl07u$u!^<=DOaPu^% zPS0n)99(b2fnZ%7@*~$b1ZwIJ&aO^*h^RH)d^SkQMo@*K7e(npncf*x{!mnKLVVkZ z>Brso)Xc`+n)e0M9~l9vTXVpkY)rxLABnH!BudYvj)mHpCb_V=D-}xTk$4x>Lb1yl z&zE(%C5uu(+rgiLI>Uz)#69qIODgPE9TCowVq2=01fucLXQBFzWXnY{ot%zQh(<6^ zjBbmBx3YfH)ydgALw1E1H_(DkgygY<5IVIoi#wEy>Bl4)V~?a+%wszQ`_4;oiws-4 zMEhrL9Z_Li+S*;OYAhYA8F@@mBrg(c3^bY0U~1aox=<+t)Z21Cqv?`E37HafK+fe} zQ`;N0C$+erFSjIZVHiZsC=TzLneO+5*X|6Df(f$pvKDQW_5f7Kn$kSeWlq9A+W)-h(iA_)rZQnoI z8joD$=5F%zxsf7F#iK{MKpEb@iW=V4r;A54SY1W4?TGMw3`2F8Q=}h)*nxT~hvI>< zsv_kPw>v>$NYBgc39_%j@lcb-xJD|5J({*9dgY67^>pr%Y?Q@#(nA9{Pb8a9L4u-8CfKR5w)^f z@W^cvraxqQMx}6hPVqE{)FS9@Hh*1soa^X3shBmVIcq4WJO`Gz6NOhWpN7(L%5y&8 z)E&Ef*@*|LAr%(uTjgGF3(Fezck@ZUv9GjBNL;%07wX=KoCmfR0&c5F$<&|1aO!+&4GypV!Jp@2M(3n5|~&T zAWA{*z-Q zU;-Nnl41rCj7-cxuiugZI`0?L^bhvT>Kx1)xfmEOaxra}cVI5&k^-x@0xA`V&rD%p g1~Ryu^K)}k^Gdeocrkm3vN$kI^eSS0u- zPLn`kQ;?ukA~dq7O94?KMER4DFv3bjMd7ii5=Bfzz>p%`3}_-$bq*QQ{3wGc$WB+9H=~b zd2)<8pls_>wca{Cc803B%J9h<8lV2?^yrzHQlf@W&dBt{w@X$mgbLoJJ40-fpmL4pFYR3wKp>z=mQ) zS2YK$J1cry%z=J$;{%^qV^6>?wQ@`JB?#e)2Vs|bV6Bx9*#IFc4nSp_!#Y+1HbCEl z5ZeGDOVt$*!a9z~nu-Tu9eYB&;z3x)O5j(s3f~yl0YY5~5U^od2lxNkZNB%_|Ri~OZ&hQx$08HRUZqx>b{Vxjs#uR8<5jhqS*Y9P`5<6@BUWo2|8ANh$tn@_brPoE~15& z|CXZa47b5hEr#lweQfBR*|S46L9{mGZP^a;7KmklMZdjtl1z&_LRgXGZF%9w+dLY!AhSI4Bc@$O) z&tDdwUAdyK0jew|@(mik83i#K*C-WzjSv^AC7+UpQYYhT(eP}%xz>w{9OR|9gvNpI z@vQZT<|d6}&|@{4o)c)=tZ_Jatb}1Tfz_h1Wl~7GG^}Q@T1~IHO@_48W>eP*N`~I6 zn?WjQv!*9g+oW5-a=@}?CVeE)UWD2#rCT8`nw*>&m~`K!H-RUrtZ|7J8I%aEpmY-A za#?4MOS;;E{)FlU{>#L@b((rd-Xn%f{?Wq8CFKL;E~bY5ON@7?M9UB17E0a zP%_?Ly`M=^5O)^Ea6}6p-MR-nu~BO`qGi7k>eamv5(U;;q=O!Pz_6@2NYh?@5Udco zwdT+x8`lBp8;?HIi%_y43Mg5NNV@3L17L+QhNY7ThIR~$0<@Ks0y~1Ul%hOdE8m}6rZ$vV5E|R7ZuIs8wQ-I6O$S^${PSdBuNqU&e z5iUE!1N8S$hJF=F(sMZ`E-~>?=mgdA=Rbl;y20faT)q<=rqN)A_6O5c6C9x529k6= zkfA5|bArpsK$9dL5;`!UC-kR6eWe4Hq`FD}gQJBhtv)}h1z{~Lu2vc8vyVy#AKj$A1O6&=#4G^-D zr01WNP{JH=;1&a+axNwc<8M6S!qWjSy1oYiukXGG0da~u4urCXqYE!9*<=3ZQoP2v zj0i2PMB$ctjDy_S`tqL3?JS~?$GH^ysicRABV;wcEE`v-(e$0Ef*z?H!r2f{;3xeMiXmb{g~-r{G~ zNmr#dyQ;R$RsZHBhQD$W!_%C!@I_8qc$JeGe$B}Y&vP=v_c@uNbfQ9GQp3+4)`2TI z@0NoDm=1!N655UbjjxO2wS1kNAJ^PhfPOig)C2PCy<)%4Tg?vhewosLKwJBSVsusR=v1B^WIaZrWL=q zzEIcas&_ey{!PxJ{{v^yzrQ?-+ zyRf*ZTT+q04UX}=qn(BJl=ETr)hYF_*(V2w=B{@--CDISy!koZxcR9;r#YghIK}!} WR4ud*I_IPFX>}&C@b+mZGWZ|aV+juc diff --git a/Back/skydiveLogs-api/DataContract/AircraftReq.cs b/Back/skydiveLogs-api/DataContract/AircraftReq.cs index 118c467..cd68eed 100644 --- a/Back/skydiveLogs-api/DataContract/AircraftReq.cs +++ b/Back/skydiveLogs-api/DataContract/AircraftReq.cs @@ -5,5 +5,7 @@ public int Id { get; set; } public string Name { get; set; } + + public string ImageData { get; set; } } } diff --git a/Back/skydiveLogs-api/DataContract/AircraftResp.cs b/Back/skydiveLogs-api/DataContract/AircraftResp.cs index b5c6261..b4b135e 100644 --- a/Back/skydiveLogs-api/DataContract/AircraftResp.cs +++ b/Back/skydiveLogs-api/DataContract/AircraftResp.cs @@ -5,5 +5,7 @@ public int Id { get; set; } public string Name { get; set; } + + public string ImageData { get; set; } } }