diff --git a/src/HeartTrack.sln b/src/HeartTrack.sln index f9c60dd..31d8733 100644 --- a/src/HeartTrack.sln +++ b/src/HeartTrack.sln @@ -23,8 +23,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Shared\Shared.csp EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestsAPI", "TestsAPI", "{30FC2BE9-7397-445A-84AD-043CE70F4281}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientTests", "Tests\TestsAPI\ClientTests\ClientTests.csproj", "{9E4D3AC5-E6CA-4753-BD96-BF5EE793931A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model", "Model\Model.csproj", "{30AB7FAA-6072-40B6-A15E-9188B59144F9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTestApi", "Tests\TestsAPI\UnitTestApi\UnitTestApi.csproj", "{E515C8B6-6282-4D8B-8523-7B3A13E4AF58}" @@ -87,10 +85,6 @@ Global {F80C60E1-1E06-46C2-96DE-42B1C7DE65BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {F80C60E1-1E06-46C2-96DE-42B1C7DE65BC}.Release|Any CPU.ActiveCfg = Release|Any CPU {F80C60E1-1E06-46C2-96DE-42B1C7DE65BC}.Release|Any CPU.Build.0 = Release|Any CPU - {9E4D3AC5-E6CA-4753-BD96-BF5EE793931A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E4D3AC5-E6CA-4753-BD96-BF5EE793931A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E4D3AC5-E6CA-4753-BD96-BF5EE793931A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E4D3AC5-E6CA-4753-BD96-BF5EE793931A}.Release|Any CPU.Build.0 = Release|Any CPU {30AB7FAA-6072-40B6-A15E-9188B59144F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {30AB7FAA-6072-40B6-A15E-9188B59144F9}.Debug|Any CPU.Build.0 = Debug|Any CPU {30AB7FAA-6072-40B6-A15E-9188B59144F9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -127,6 +121,12 @@ Global {508D380F-145C-437E-A7DF-7A17C526B2F3}.Debug|Any CPU.Build.0 = Debug|Any CPU {508D380F-145C-437E-A7DF-7A17C526B2F3}.Release|Any CPU.ActiveCfg = Release|Any CPU {508D380F-145C-437E-A7DF-7A17C526B2F3}.Release|Any CPU.Build.0 = Release|Any CPU + {1B15D383-1DFA-47E8-86EC-AC631B15FBEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1B15D383-1DFA-47E8-86EC-AC631B15FBEB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {707B1AC4-F896-4270-BC2F-1A589F48979D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {707B1AC4-F896-4270-BC2F-1A589F48979D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D0EE112F-3151-4C28-A6EC-B1CEC7883FAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D0EE112F-3151-4C28-A6EC-B1CEC7883FAE}.Debug|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -135,11 +135,11 @@ Global {477D2129-A6C9-4FF8-8BE9-5E9E8E5282F8} = {2B227C67-3BEC-4A83-BDA0-F3918FBC0D18} {2D166FAD-4934-474B-96A8-6C0635156EC2} = {2B227C67-3BEC-4A83-BDA0-F3918FBC0D18} {30FC2BE9-7397-445A-84AD-043CE70F4281} = {2B227C67-3BEC-4A83-BDA0-F3918FBC0D18} - {9E4D3AC5-E6CA-4753-BD96-BF5EE793931A} = {30FC2BE9-7397-445A-84AD-043CE70F4281} {E515C8B6-6282-4D8B-8523-7B3A13E4AF58} = {30FC2BE9-7397-445A-84AD-043CE70F4281} {31FA8E5E-D642-4C43-A2B2-02B9832B2CEC} = {2B227C67-3BEC-4A83-BDA0-F3918FBC0D18} {73EA27F2-9F0C-443F-A5EE-2960C983A422} = {2B227C67-3BEC-4A83-BDA0-F3918FBC0D18} {508D380F-145C-437E-A7DF-7A17C526B2F3} = {2B227C67-3BEC-4A83-BDA0-F3918FBC0D18} + {D0EE112F-3151-4C28-A6EC-B1CEC7883FAE} = {30FC2BE9-7397-445A-84AD-043CE70F4281} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0F3487F4-66CA-4034-AC66-1BC899C9B523} diff --git a/src/Tests/ConsoleTestEFMapper/Program.cs b/src/Tests/ConsoleTestEFMapper/Program.cs index 5079527..c1fb1ff 100644 --- a/src/Tests/ConsoleTestEFMapper/Program.cs +++ b/src/Tests/ConsoleTestEFMapper/Program.cs @@ -10,19 +10,17 @@ using static Model2Entities.DbDataManager; namespace ConsoleTestEFMapper; - /* + static class Program { + static async Task Main(string[] args) { // Instanciation de DbDataManager et ActivityRepository - var dataManager = new DbDataManager(new TrainingStubbedContext()); - var logger = new Logger(new LoggerFactory()); - - // Test de la méthode GetActivities - await ActivitiesTestAsync(dataManager, logger); + Console.WriteLine(""); } + /* static async Task ActivitiesTestAsync(DbDataManager dataManager, ILogger logger) { var activityRepository = new ActivityRepository(dataManager, logger); @@ -114,5 +112,5 @@ namespace ConsoleTestEFMapper; Console.WriteLine($"Total number of activities: {itemCount}"); } static void UsersTest() - {} - }*/ + {}*/ + } diff --git a/src/Tests/TestsAPI/ClientTests/ClientTests.csproj b/src/Tests/TestsAPI/ClientTests/ClientTests.csproj deleted file mode 100644 index 206b89a..0000000 --- a/src/Tests/TestsAPI/ClientTests/ClientTests.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - Exe - net8.0 - enable - enable - - - diff --git a/src/Tests/TestsAPI/ClientTests/HttpClientManager.cs b/src/Tests/TestsAPI/ClientTests/HttpClientManager.cs deleted file mode 100644 index 2e8e593..0000000 --- a/src/Tests/TestsAPI/ClientTests/HttpClientManager.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace ClientTests; - -public class HttpClientManager -{ - protected readonly HttpClient _httpClient; - - public HttpClientManager(HttpClient httpClient) - { - _httpClient = httpClient; - _httpClient.BaseAddress = new Uri("https://localhost:7252"); - } -} diff --git a/src/Tests/TestsAPI/ClientTests/Program.cs b/src/Tests/TestsAPI/ClientTests/Program.cs deleted file mode 100644 index 83fa4f4..0000000 --- a/src/Tests/TestsAPI/ClientTests/Program.cs +++ /dev/null @@ -1,2 +0,0 @@ -// See https://aka.ms/new-console-template for more information -Console.WriteLine("Hello, World!"); diff --git a/src/Tests/WebAPIConsoleTests/ActivityServiceAPI.cs b/src/Tests/WebAPIConsoleTests/ActivityServiceAPI.cs index 976808a..159805d 100644 --- a/src/Tests/WebAPIConsoleTests/ActivityServiceAPI.cs +++ b/src/Tests/WebAPIConsoleTests/ActivityServiceAPI.cs @@ -1,21 +1,22 @@ -/*! +/*/*! * \file BookDataServiceAPI.cs * \author HeartTeam * \brief Fichier contenant la classe BookDataServiceAPI. - */ + #1# using System.Diagnostics; using Dto; using Model.Repository; using Shared; using APIMappers; +using Dto.Tiny; using Model; namespace WebAPIConsoleTests; /*! * \brief Implémentation de l'interface IActivityRepository pour récupérer des activités via un service HTTP. - */ + #1# public class ActivityServiceAPI : IActivityRepository { private HttpRequest myRequest = new HttpRequest(); @@ -23,7 +24,7 @@ public class ActivityServiceAPI : IActivityRepository /*! * \brief Constructeur de la classe ActivityServiceAPI. * Initialise l'adresse de base du client HTTP. - */ + #1# public ActivityServiceAPI() { myRequest.HttpClient.BaseAddress = new Uri("http://localhost:5030/api/v1/Activity/"); @@ -32,7 +33,7 @@ public class ActivityServiceAPI : IActivityRepository /*! * \brief Récupère toutes les Activités de manière asynchrone. * \return Une tâche représentant l'opération asynchrone qui retourne une liste d'Activity. - */ + #1# public async Task?> GetActivities(int index, int count, ActivityOrderCriteria criteria, bool descending = false) { var activityDtos = await myRequest.GetAllAsync(); @@ -44,7 +45,7 @@ public class ActivityServiceAPI : IActivityRepository * \param index L'index de départ pour la pagination. * \param count Le nombre d'éléments à récupérer. * \return Une tâche représentant l'opération asynchrone qui retourne une liste d'Activity. - */ + #1# public async Task> GetBooksAsync(ActivityOrderCriteria criteria, bool descending, int index, int count) { var activityDtos = await myRequest.GetAsync(criteria, descending, index, count); @@ -55,7 +56,12 @@ public class ActivityServiceAPI : IActivityRepository * \brief Récupère une activité par son identifiant de manière asynchrone. * \param id L'identifiant du livre à récupérer. * \return Une tâche représentant l'opération asynchrone qui retourne une liste d'Activity. - */ + #1# + async Task?> IActivityRepository.GetActivities(int index, int count, ActivityOrderCriteria criteria, bool descending) + { + throw new NotImplementedException(); + } + public async Task GetActivityByIdAsync(int id) { var activityDtos = await myRequest.GetByIdAsync(id); @@ -66,18 +72,28 @@ public class ActivityServiceAPI : IActivityRepository * \brief Ajoute une activité de manière asynchrone. * \param activity L'Activity à ajouter. * \return Une tâche représentant l'opération asynchrone qui retourne l'activité ajouté (Activity). - */ + #1# public async Task AddActivity(Model.Activity activity) { return (await myRequest.PostAsync(activity.ToDto())).ToModel(); } + public async Task AddActivity(NewActivityDto activity) + { + throw new NotImplementedException(); + } + + public async Task UpdateActivity(int id, ActivityTinyDto activity) + { + throw new NotImplementedException(); + } + /*! * \brief Met à jour une activité de manière asynchrone. * \param id L'identifiant de l'activité à mettre à jour. * \param activity Les nouvelles données de l'activité à mettre à jour. * \return Une tâche représentant l'opération asynchrone qui retourne l'activité mis à jour (Activity). - */ + #1# public async Task UpdateActivity(int id, Model.Activity activity) { var activityDto = activity.ToDto(); @@ -89,7 +105,7 @@ public class ActivityServiceAPI : IActivityRepository * \brief Supprime une activité de manière asynchrone. * \param id L'identifiant de l'activité à supprimer. * \return Une tâche représentant l'opération asynchrone. - */ + #1# public async Task DeleteActivity(int id) { await myRequest.DeleteAsync(id); @@ -110,4 +126,4 @@ public class ActivityServiceAPI : IActivityRepository { return myRequest.GetNbActivitiesByUser(userId); } -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/src/Tests/WebAPIConsoleTests/Program.cs b/src/Tests/WebAPIConsoleTests/Program.cs index 8db0f5f..a7f9075 100644 --- a/src/Tests/WebAPIConsoleTests/Program.cs +++ b/src/Tests/WebAPIConsoleTests/Program.cs @@ -4,8 +4,8 @@ using Model; using Model.Repository; using Shared; using WebAPIConsoleTests; - - +Console.WriteLine(""); +/* IActivityRepository myConsoleTest = new ActivityServiceAPI(); // defini un delais d'attente du déploiement de l'API @@ -63,4 +63,4 @@ foreach (var activity3 in res) // Affiche le nombre d'activités par utilisateur Console.WriteLine("Affichage du nombre d'activités par utilisateur : "); nb = await myConsoleTest.GetNbActivitiesByUser(1); -Console.WriteLine(nb); \ No newline at end of file +Console.WriteLine(nb);*/ \ No newline at end of file