From da5b41e4044a4156b6b527acf8ca520783afb540 Mon Sep 17 00:00:00 2001 From: anperederi Date: Fri, 15 Mar 2024 09:02:11 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Add=20activity=20repository=20wi?= =?UTF-8?q?thout=20relationship=20and=20Add=20method?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Model2Entities/ActivityRepository.cs | 9 ++-- src/Model2Entities/DbDataManager.cs | 3 +- src/Model2Entities/Extension.cs | 12 +++-- src/Tests/ConsoleTestEFMapper/Program.cs | 43 +++++++++--------- .../ConsoleTestEFMapper/uca.HeartTrack.db-shm | Bin 32768 -> 0 bytes .../ConsoleTestEFMapper/uca.HeartTrack.db-wal | 0 6 files changed, 39 insertions(+), 28 deletions(-) delete mode 100644 src/Tests/ConsoleTestEFMapper/uca.HeartTrack.db-shm delete mode 100644 src/Tests/ConsoleTestEFMapper/uca.HeartTrack.db-wal diff --git a/src/Model2Entities/ActivityRepository.cs b/src/Model2Entities/ActivityRepository.cs index d9db52b..0d4ac1f 100644 --- a/src/Model2Entities/ActivityRepository.cs +++ b/src/Model2Entities/ActivityRepository.cs @@ -89,11 +89,14 @@ public partial class DbDataManager : IDataManager entity.AverageTemperature = activity.AverageTemperature; entity.HasAutoPause = activity.HasAutoPause; }); - if (updatedActivity != null) + if (updatedActivity != null) { _logger.LogInformation($"Updated activity with ID {id}"); - else + return await Task.FromResult(updatedActivity!.ToModel()); + } + else { _logger.LogError($"Failed to update activity with ID {id}"); - return await Task.FromResult(updatedActivity!.ToModel()); + return null; + } } catch (Exception ex) { diff --git a/src/Model2Entities/DbDataManager.cs b/src/Model2Entities/DbDataManager.cs index 6384b43..912305a 100644 --- a/src/Model2Entities/DbDataManager.cs +++ b/src/Model2Entities/DbDataManager.cs @@ -27,7 +27,8 @@ public partial class DbDataManager: IDataManager public DbDataManager(string dbPlatformPath) : this(new HeartTrackContext(dbPlatformPath)) { - Console.WriteLine($"Database created String: {DbContext.Database.EnsureCreated()}"); } + Console.WriteLine($"Database created String: {DbContext.Database.EnsureCreated()}"); + } public DbDataManager() diff --git a/src/Model2Entities/Extension.cs b/src/Model2Entities/Extension.cs index d1acce2..3cde249 100644 --- a/src/Model2Entities/Extension.cs +++ b/src/Model2Entities/Extension.cs @@ -14,7 +14,13 @@ public static class Extensions return await Task.FromResult(null); } var entry = context.Set().Add(item); - await context.SaveChangesAsync(); + try { + await context.SaveChangesAsync(); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message, ex.InnerException, ex.StackTrace); + } return await Task.FromResult(entry.Entity); } @@ -68,9 +74,9 @@ public static class Extensions // Enregistrer les modifications dans la base de données await context.SaveChangesAsync(); + return existingT; } - - return existingT; + return default(U); } diff --git a/src/Tests/ConsoleTestEFMapper/Program.cs b/src/Tests/ConsoleTestEFMapper/Program.cs index fcf59ac..ed539b6 100644 --- a/src/Tests/ConsoleTestEFMapper/Program.cs +++ b/src/Tests/ConsoleTestEFMapper/Program.cs @@ -30,7 +30,7 @@ namespace Model2Entities // Test de la méthode GetActivityByIdAsync Console.WriteLine("Testing GetActivityByIdAsync method..."); - var activityById = await activityRepository.GetActivityByIdAsync(2); + var activityById = await activityRepository.GetActivityByIdAsync(3); if (activityById != null) { Console.WriteLine($"Activity found: ID: {activityById.Id}, Name: {activityById.Type}, Date: {activityById.Date}, Start Time: {activityById.StartTime}, End Time: {activityById.EndTime}"); @@ -42,35 +42,35 @@ namespace Model2Entities Console.WriteLine(); // // Test de la méthode AddActivity - Console.WriteLine("Testing AddActivity method..."); - var newActivity = new Activity(10, "New Activity", new DateTime(2021, 10, 10), new DateTime(10, 10, 10, 10, 10, 10), new DateTime(10, 10, 10, 12, 12, 12), 5, 5, 5, 5, 5, 5, 5, 5, false); - var addedActivity = await activityRepository.AddActivity(newActivity); - if (addedActivity != null) - { - Console.WriteLine($"New activity added successfully: ID: {addedActivity.Id}, Name: {addedActivity.Type}, Date: {addedActivity.Date}, Start Time: {addedActivity.StartTime}, End Time: {addedActivity.EndTime}"); - } - else - { - Console.WriteLine("Failed to add new activity."); - } - Console.WriteLine(); - - // // Test de la méthode UpdateActivity - // Console.WriteLine("Testing UpdateActivity method..."); - // var updatedActivity = await activityRepository.UpdateActivity(6, new Activity { Id = 6, Name = "Updated Activity" }); - // if (updatedActivity != null) + // Console.WriteLine("Testing AddActivity method..."); + // var newActivity = new Activity(10, "New Activity", new DateTime(2021, 10, 10), new DateTime(10, 10, 10, 10, 10, 10), new DateTime(10, 10, 10, 12, 12, 12), 5, 5, 5, 5, 5, 5, 5, 5, false); + // var addedActivity = await activityRepository.AddActivity(newActivity); + // if (addedActivity != null) // { - // Console.WriteLine($"Activity updated successfully: ID: {updatedActivity.Id}, Name: {updatedActivity.Name}"); + // Console.WriteLine($"New activity added successfully: ID: {addedActivity.Id}, Name: {addedActivity.Type}, Date: {addedActivity.Date}, Start Time: {addedActivity.StartTime}, End Time: {addedActivity.EndTime}"); // } // else // { - // Console.WriteLine("Failed to update activity."); + // Console.WriteLine("Failed to add new activity."); // } // Console.WriteLine(); + // Test de la méthode UpdateActivity + Console.WriteLine("Testing UpdateActivity method..."); + var updatedActivity = await activityRepository.UpdateActivity(10, new Activity(10, "Updated Activity", new DateTime(2021, 10, 10), new DateTime(10, 10, 10, 10, 10, 10), new DateTime(10, 10, 10, 12, 12, 12), 5, 5, 5, 5, 5, 5, 5, 5, false)); + if (updatedActivity != null) + { + Console.WriteLine($"Activity updated successfully: ID: {updatedActivity.Id}, Name: {updatedActivity.Type}, Date: {updatedActivity.Date}, Start Time: {updatedActivity.StartTime}, End Time: {updatedActivity.EndTime}"); + } + else + { + Console.WriteLine("Failed to update activity."); + } + Console.WriteLine(); + // Test de la méthode DeleteActivity Console.WriteLine("Testing DeleteActivity method..."); - var isDeleted = await activityRepository.DeleteActivity(1); + var isDeleted = await activityRepository.DeleteActivity(2); if (isDeleted) { Console.WriteLine("Activity deleted successfully."); @@ -78,6 +78,7 @@ namespace Model2Entities { Console.WriteLine("Failed to delete activity."); } + Console.WriteLine(); // Test de la méthode GetNbItems Console.WriteLine("Testing GetNbItems method..."); diff --git a/src/Tests/ConsoleTestEFMapper/uca.HeartTrack.db-shm b/src/Tests/ConsoleTestEFMapper/uca.HeartTrack.db-shm deleted file mode 100644 index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeIuAr62r3