diff --git a/Infrastructure/.DS_Store b/Infrastructure/.DS_Store new file mode 100644 index 0000000..884a5d9 Binary files /dev/null and b/Infrastructure/.DS_Store differ 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 0000000..da709d8 Binary files /dev/null and b/Server/FirstTest.db differ 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 +}