From 1e1f17530673eb0a35823794650ade41c0470af1 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Thu, 9 Jan 2025 21:15:09 +0100 Subject: [PATCH] Sorry Leo :lipstick::lipstick: --- Infrastructure/.DS_Store | Bin 0 -> 6148 bytes README.md | 8 ++++++++ Server/Dto/Response/ResponseUserDto.cs | 11 ++++++++++- Server/FirstTest.db | Bin 0 -> 36864 bytes Server/Mappers/UserProfile.cs | 5 ++++- Shared/EHealthProblem.cs | 7 +++++++ Shared/ESleepLevel.cs | 10 ++++++++++ Shared/ESport.cs | 8 ++++++++ Shared/ESportLevel.cs | 9 +++++++++ 9 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 Infrastructure/.DS_Store create mode 100644 Server/FirstTest.db create mode 100644 Shared/EHealthProblem.cs create mode 100644 Shared/ESleepLevel.cs create mode 100644 Shared/ESport.cs create mode 100644 Shared/ESportLevel.cs diff --git a/Infrastructure/.DS_Store b/Infrastructure/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..884a5d945d8997636da7b9f4a5e52b692edba9fc GIT binary patch literal 6148 zcmeHKO>fgM7=GObmTrJ5jR`JDk+@c)Od2rlQo8Q2143GW9RQVN%|=*=t0tkKs#34O zf8Z~0fHoq%Vlc-ZjF{Kr+&lNA1 z_9>+to}41e=KaNu-}#5*Y-qkBU&3J$XL-B*Rn+Rvg^Mfhio51M_g~7fp9gu7b%W7U zu04`634fM@@JSqv`^~F+GR=cHjYf(P42{b%)z<8~x_B$z<#9 zcFVi7Gi`a3ovn7uySLq*P8;sV&0D*N{j=nCD&H$PNZ_NVj72Ql2UHehc;k=KM5d?c zW8MZGK&BHKDd}@yLC27+Kq;b4lrtKlEa_E6z>i>;m*ol~9fC82Z>D6I;Jwo^D%@{N zxQ{UoUaW^0%@JaZ=xiCc#v?C3ca35p-*#LNMaLJW<E{bm{!1(`XHRe_J<>qyGb=WzkpF*wtR R7MT4JP%_xeD)3ho_yKUu=(7L- literal 0 HcmV?d00001 diff --git a/README.md b/README.md index e3370fb..30b28f6 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,14 @@ Ce repot représente le rendu en API et Entity Framework, dans le cadre de notre ## Prérequis +Il faut update la base de données avec les commandes suivantes dans le dossier Infrastructure (la commande pour faire une nouvelle migration n'est pas obligatoire mais est utile en cas de modification importante des entités) : +``` +dotnet ef migrations add Initialize --context OptifitDbContext +dotnet ef database update --context OptifitDbContext + +``` + + ## Premiers Pas diff --git a/Server/Dto/Response/ResponseUserDto.cs b/Server/Dto/Response/ResponseUserDto.cs index 49a5695..3924555 100644 --- a/Server/Dto/Response/ResponseUserDto.cs +++ b/Server/Dto/Response/ResponseUserDto.cs @@ -1,3 +1,5 @@ +using Shared; + namespace Server.Dto.Response; public class ResponseUserDto @@ -11,5 +13,12 @@ public class ResponseUserDto public string? Logo { get; set; } public int NbSessionPerWeek { get; set; } public string? EGoal { get; set; } - public string? ESleepLevel { get; set; } + public ESleepLevel ESleepLevel { get; set; } + + public EHealthProblem EHealthProblem { get; set; } + + public ESport ESport { get; set; } + + public ESportLevel ESportLevel { get; set; } + } \ No newline at end of file diff --git a/Server/FirstTest.db b/Server/FirstTest.db new file mode 100644 index 0000000000000000000000000000000000000000..da709d8489f8efdb11ecad581762941235d27008 GIT binary patch literal 36864 zcmeI)&2QRf90zc}WW0Dvy_*%OQ#_<8MH-PE0*1rXvBqmq38B2S>!Gp?JSJ8FGu!F1 z-B$I`zhn2Q=UsN`X@9_^U3S`Sf5Ftlvz_^WUnU{EXYTwV z{<8V_&d(ozF1#1s3Gc3`haw0-00Izz00eHYfbbu8Anok1Zz{go9TH+0J{e7njz?T? z=|$>6Q?Imjxn23XrpuY7vW$FBkm-`C_A_!@|F$jHk7?@EYVw2QdaK>6RO@Xy(|9y% zHzPNi)uT%Dnfyq9_QkAbWk51A-AaF`H^bWJW%@(M9L^i2jn1bRd=y{1 zMZ=oZ$V)=o2={QInbyQ{{VR&%s~(!(NyGHK?;ZDY;OED9NbJE0ZJgTGE{9cf2F^UH zbFTARb#p{DmLTUP-4^jY+Zi{A`;?Fu7Y=*5iQ~$tf3oO~MYur$HG66Ii96rPqPRuQ z;ydDLR5U`Ce!A=)?XZkJ?vpd`yCMBNYnZ3L6TCK-Mv9>>US?AX=}RfDS}+0)HF!wB z&L)$RB(ZPQV3Y=#!Rpee4Dv7<*LpO*s`E){dz*dzA{ZDzJVX=q`n;nR

aa;k)7V$lpbrc~|K`XZ%!2a{ZO?by zA0jik<-UpBChVuM$;CVu^R^Sy&T8k;iLrm$^PkXnztvt6vQ;i2J=fwWBKKmbk=fJl z_S5h4%qC5o_!}esMORoL009U<00Izz00bZa0SG_<0uZ=?0-ticChaME1w~cLN_oGq zrx`8MbH@GBuCl9s#`5hJUTQIi_KzgkM4(Y|;_r<3H(gFZn<{9 literal 0 HcmV?d00001 diff --git a/Server/Mappers/UserProfile.cs b/Server/Mappers/UserProfile.cs index fefb0f6..8953b21 100644 --- a/Server/Mappers/UserProfile.cs +++ b/Server/Mappers/UserProfile.cs @@ -19,7 +19,10 @@ public class UserProfile : Profile .ForMember(dest => dest.Logo, opt => opt.MapFrom(src => src.Logo)) .ForMember(dest => dest.NbSessionPerWeek, opt => opt.MapFrom(src => src.NbSessionPerWeek)) .ForMember(dest => dest.EGoal, opt => opt.MapFrom(src => src.EGoal)) - .ForMember(dest => dest.ESleepLevel, opt => opt.MapFrom(src => src.ESleepLevel)); + .ForMember(dest => dest.ESleepLevel, opt => opt.MapFrom(src => src.ESleepLevel)) + .ForMember(dest => dest.EHealthProblem, opt => opt.MapFrom(src => src.EHealthProblem)) + .ForMember(dest => dest.ESportLevel, opt => opt.MapFrom(src => src.ESportLevel)) + .ForMember(dest => dest.ESport, opt => opt.MapFrom(src => src.ESport)); _ = CreateMap() .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.Name)); diff --git a/Shared/EHealthProblem.cs b/Shared/EHealthProblem.cs new file mode 100644 index 0000000..2bc76f9 --- /dev/null +++ b/Shared/EHealthProblem.cs @@ -0,0 +1,7 @@ +namespace Shared; + +public enum EHealthProblem +{ + ARTHROSE, + MIGRAINE +} \ No newline at end of file diff --git a/Shared/ESleepLevel.cs b/Shared/ESleepLevel.cs new file mode 100644 index 0000000..9728c68 --- /dev/null +++ b/Shared/ESleepLevel.cs @@ -0,0 +1,10 @@ +namespace Shared; + +public enum ESleepLevel +{ + EXCELLENT, + GOOD, + BAD, + VERY_BAD, + TERRIBLE +} diff --git a/Shared/ESport.cs b/Shared/ESport.cs new file mode 100644 index 0000000..c4e6567 --- /dev/null +++ b/Shared/ESport.cs @@ -0,0 +1,8 @@ +namespace Shared; + +public enum ESport +{ + FOOTBALL, + BASKETBALL, + TENNIS +} \ No newline at end of file diff --git a/Shared/ESportLevel.cs b/Shared/ESportLevel.cs new file mode 100644 index 0000000..aa1b4f6 --- /dev/null +++ b/Shared/ESportLevel.cs @@ -0,0 +1,9 @@ +namespace Shared; + +public enum ESportLevel +{ + NOT_SPORTY, + BEGINNER, + SPORTY, + VERY_SPORTY +}