diff --git a/src/APIMappers/UserMappeur.cs b/src/APIMappers/UserMappeur.cs index 96d1375..48a8cda 100644 --- a/src/APIMappers/UserMappeur.cs +++ b/src/APIMappers/UserMappeur.cs @@ -25,11 +25,8 @@ public static class UserMappeur DateOfBirth = user.DateOfBirth, IsCoach = user.Role is Coach }); - // ), (activity, entity) => activity.Id = entity.IdActivity); } - // ochestrateur => api gateway - // corégraphie => microservice TCP public static User ToModel(this UserDto userDto) diff --git a/src/Dto/ActivityDto.cs b/src/Dto/ActivityDto.cs index b2a0a91..fcb108c 100644 --- a/src/Dto/ActivityDto.cs +++ b/src/Dto/ActivityDto.cs @@ -3,7 +3,7 @@ namespace Dto; public class ActivityDto { public int Id { get; set; } - public string Type { get; set; } + public string? Type { get; set; } public DateTime Date { get; set; } public DateTime StartTime { get; set; } public DateTime EndTime { get; set; } diff --git a/src/Dto/ActivityFitFileDto.cs b/src/Dto/ActivityFitFileDto.cs index eb8fec0..f68fbd1 100644 --- a/src/Dto/ActivityFitFileDto.cs +++ b/src/Dto/ActivityFitFileDto.cs @@ -2,6 +2,13 @@ namespace Dto; public class ActivityFitFileDto { + public ActivityFitFileDto(string activityName, string activityType, int effortFeel) + { + ActivityName = activityName; + ActivityType = activityType; + EffortFeel = effortFeel; + } + public string ActivityName { get; set; } public string ActivityType { get; set; } public int EffortFeel { get; set; } diff --git a/src/Entities/ActivityEntity.cs b/src/Entities/ActivityEntity.cs index ab26369..5dc7761 100644 --- a/src/Entities/ActivityEntity.cs +++ b/src/Entities/ActivityEntity.cs @@ -29,7 +29,7 @@ namespace Entities /// [Required] [MaxLength(100)] - public string Type { get; set; } = null!; + public string? Type { get; set; } = null!; /// /// Gets or sets the date of the activity. diff --git a/src/HeartTrackAPI/AppBootstrap.cs b/src/HeartTrackAPI/AppBootstrap.cs index 2faf1bf..927750c 100644 --- a/src/HeartTrackAPI/AppBootstrap.cs +++ b/src/HeartTrackAPI/AppBootstrap.cs @@ -67,6 +67,12 @@ public class AppBootstrap(IConfiguration configuration) if (string.IsNullOrWhiteSpace(connectionString)) { services.AddDbContext(options => options.UseInMemoryDatabase("AuthDb")); + Console.WriteLine("InMemoryDatabase"); + Console.WriteLine("InMemoryDatabase"); + Console.WriteLine("InMemoryDatabase"); + Console.WriteLine("InMemoryDatabase"); + Console.WriteLine("InMemoryDatabase"); + //options => options.UseSqlite(connectionString) //services.AddDbContext(); services.AddDbContext(options => diff --git a/src/Model/Activity.cs b/src/Model/Activity.cs index 11457c1..cef25b7 100644 --- a/src/Model/Activity.cs +++ b/src/Model/Activity.cs @@ -4,7 +4,7 @@ namespace Model; public class Activity { public int Id { get; set; } - public string Type { get; set; } + public string? Type { get; set; } public DateTime Date { get; set; } public DateTime StartTime { get; set; } public DateTime EndTime { get; set; } @@ -33,7 +33,7 @@ public class Activity public bool HasAutoPause { get; set; } public HashSet Users { get; private set; } = new HashSet(); - public Activity(int idActivity ,string type, DateTime date, DateTime startTime, DateTime endTime, + public Activity(int idActivity ,string? type, DateTime date, DateTime startTime, DateTime endTime, int effort, float variability, float variance, float standardDeviation, float average, int maximum, int minimum, float averageTemperature, bool hasAutoPause) {