diff --git a/notus/Biblioteque_de_Class/Database.cs b/notus/Biblioteque_de_Class/Database.cs index 840d946..61fc24d 100644 --- a/notus/Biblioteque_de_Class/Database.cs +++ b/notus/Biblioteque_de_Class/Database.cs @@ -37,10 +37,7 @@ namespace Biblioteque_de_Class { List searchedUsers = new List(); string search = name.ToLower(); - foreach (User user in UserList) - { - if (user.GetUsername().ToLower().Contains(search)) { searchedUsers.Add(user); } - } + searchedUsers.AddRange(UserList.Where(user => user.GetUsername().ToLower().Contains(search))); return searchedUsers; } @@ -74,10 +71,7 @@ namespace Biblioteque_de_Class /// /// comparer le mot de passe entré avec celui de l'utilisateur /// - public bool ComparePassword(User user, string password) - { - return user.GetPassword() == password; - } + public static bool ComparePassword(User user, string password) => user.GetPassword() == password; /// /// rechercher un mail dans la liste d'utilisateur diff --git a/notus/Notus_Console/Program.cs b/notus/Notus_Console/Program.cs index 3bc93c9..706b9ad 100644 --- a/notus/Notus_Console/Program.cs +++ b/notus/Notus_Console/Program.cs @@ -83,7 +83,7 @@ while (boucle == 0) Umail = u.GetEmail(); Upassword = u.GetPassword(); db.FindEmail(Umail); - db.ComparePassword(u,Upassword); + Database.ComparePassword(u,Upassword); UserListe = db.GetUserList(); if (UserListe.Contains(u)) { @@ -119,7 +119,7 @@ while (boucle == 0) Umail = u.GetEmail(); db.FindEmail(Umail); Upassword = u.GetPassword(); - db.ComparePassword(u,Upassword); + Database.ComparePassword(u,Upassword); UserListe = db.GetUserList(); if (UserListe.Contains(u)) { diff --git a/notus/Tests/Notus_UnitTest_Database/ComparePasswordTests.cs b/notus/Tests/Notus_UnitTest_Database/ComparePasswordTests.cs index 87960ce..a017f85 100644 --- a/notus/Tests/Notus_UnitTest_Database/ComparePasswordTests.cs +++ b/notus/Tests/Notus_UnitTest_Database/ComparePasswordTests.cs @@ -26,7 +26,7 @@ namespace Notus_UnitTest_Database { User user = database.GetUserList()[0]; string password = "password123"; - bool result = database.ComparePassword(user, password); + var result = Database.ComparePassword(user, password); Assert.That(result, Is.True); } @@ -35,7 +35,7 @@ namespace Notus_UnitTest_Database { User user = database.GetUserList()[0]; string password = "incorrectPassword"; - bool result = database.ComparePassword(user, password); + var result = Database.ComparePassword(user, password); Assert.That(result, Is.False); } }