From 04001c2ae1ba010120faa1ea9fbedf9dee3fa5e4 Mon Sep 17 00:00:00 2001 From: Nestisse Date: Sat, 16 Mar 2024 15:09:44 +0100 Subject: [PATCH] Success fonctionne sur l'API --- .../API/Controllers/SuccessesController.cs | 99 +++++++++++++++---- .../API/Service/SuccessDataServiceAPI.cs | 10 +- .../Service/SuccessDataService.cs | 65 +++++++----- .../DbDataManager/Service/UserDataService.cs | 2 +- API_SQLuedo/Dto/BlackListDTO.cs | 5 +- API_SQLuedo/Dto/InquiryDTO.cs | 5 +- API_SQLuedo/Dto/LessonDTO.cs | 1 + API_SQLuedo/Dto/ParagraphDTO.cs | 1 + API_SQLuedo/Dto/SuccessDTO.cs | 1 + API_SQLuedo/Dto/UserDTO.cs | 39 ++++---- API_SQLuedo/Shared/Mapper/LessonMapper.cs | 1 + .../StubbedContextLib/StubbedContext.cs | 24 ++++- API_SQLuedo/TestAPI/UserUnitTest.cs | 4 +- API_SQLuedo/TestConsoleAPI/Program.cs | 2 +- API_SQLuedo/TestConsoleEf/Program.cs | 2 +- API_SQLuedo/TestEF/Dto/TestInquiryDTO.cs | 18 ++-- API_SQLuedo/TestEF/Dto/TestInquiryTableDTO.cs | 4 +- API_SQLuedo/TestEF/Dto/TestNotepadDTO.cs | 30 +++--- API_SQLuedo/TestEF/Dto/TestParagraphDTO.cs | 28 +++--- API_SQLuedo/TestEF/Dto/TestSolutionDTO.cs | 31 +++--- API_SQLuedo/TestEF/Dto/TestUserDTO.cs | 8 +- 21 files changed, 251 insertions(+), 129 deletions(-) diff --git a/API_SQLuedo/API/Controllers/SuccessesController.cs b/API_SQLuedo/API/Controllers/SuccessesController.cs index 939793d..adafc33 100644 --- a/API_SQLuedo/API/Controllers/SuccessesController.cs +++ b/API_SQLuedo/API/Controllers/SuccessesController.cs @@ -26,8 +26,15 @@ namespace API.Controllers [HttpGet("successes/{page:int}/{number:int}/{orderCriteria}")] [ProducesResponseType(typeof(SuccessDto), 200)] [ProducesResponseType(typeof(string), 204)] + [ProducesResponseType(typeof(string), 400)] public IActionResult GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria) { + if (page < 1 || number < 1) + { + _logger.LogError("[ERREUR] La page ou le nombre de succès est inférieur à 1."); + return BadRequest("La page ou le nombre de succès est inférieur à 1."); + } + var nbUser = _successDataService.GetSuccesses(page, number, orderCriteria).ToList().Count; if (nbUser == 0) { @@ -44,6 +51,12 @@ namespace API.Controllers [ProducesResponseType(typeof(string), 404)] public IActionResult GetSuccessByUserId(int id) { + if (id < 1) + { + _logger.LogError("[ERREUR] L'id de l'utilisateur est inférieur à 1."); + return BadRequest("L'id de l'utilisateur est inférieur à 1."); + } + try { _logger.LogInformation("[INFORMATION] Le succès avec l'id de l'utilisateur {id} a été trouvé.", id); @@ -52,7 +65,7 @@ namespace API.Controllers catch (ArgumentException) { _logger.LogError("[ERREUR] Aucun utilisateur trouvé avec l'id de l'utilisateur {id}.", id); - return NotFound(); + return NotFound("Aucun utilisateur trouvé avec l'id de l'utilisateur."); } } @@ -61,6 +74,12 @@ namespace API.Controllers [ProducesResponseType(typeof(string), 404)] public IActionResult GetSuccessByInquiryId(int id) { + if (id < 1) + { + _logger.LogError("[ERREUR] L'id de l'enquête doit être inférieur à 1."); + return BadRequest("L'id de l'enquête doit être inférieur à 1."); + } + try { _logger.LogInformation("[INFORMATION] Utilisateur avec l'id de l'enquête {inquiryId} a été trouvé.", @@ -70,7 +89,7 @@ namespace API.Controllers catch (ArgumentException) { _logger.LogError("[ERREUR] Aucun utilisateur trouvé avec l'id de l'enquête {inquiryId}.", id); - return NotFound(); + return NotFound("Aucune enquête trouvée avec l'id de l'enquête."); } } @@ -79,6 +98,12 @@ namespace API.Controllers [ProducesResponseType(typeof(string), 404)] public IActionResult DeleteSuccess(int idUser, int idInquiry) { + if (idUser < 1 || idInquiry < 1) + { + _logger.LogInformation("[INFORMATION] L'id de l'utilisateur ou de l'enquête doit être supérieur à 1."); + return BadRequest("L'id de l'utilisateur ou de l'enquête doit être supérieur à 1."); + } + var success = _successDataService.DeleteSuccess(idUser, idInquiry); if (success) { @@ -94,32 +119,51 @@ namespace API.Controllers [HttpPost] [ProducesResponseType(typeof(SuccessDto), 201)] + [ProducesResponseType(typeof(string), 409)] + [ProducesResponseType(typeof(string), 404)] [ProducesResponseType(typeof(string), 400)] public IActionResult CreateSuccess([FromBody] SuccessDto dto) { - /*if (dto.UserId == null || dto.InquiryId == null) + if (dto.UserId < 1 || dto.InquiryId < 1) { - return BadRequest(); - }*/ - _logger.LogInformation( - "[INFORMATION] Un succès a été créé : userId - {userId}, inquiryId - {inquiryId}, isFinished - {isFinished}", - dto.UserId, dto.InquiryId, dto.IsFinished); - return Created(nameof(GetSuccesses), - _successDataService.CreateSuccess(dto.UserId, dto.InquiryId, dto.IsFinished)); + _logger.LogError("[ERREUR] L'id de l'utilisateur ou de l'enquête doit être supérieur à 1."); + return BadRequest("L'id de l'utilisateur ou de l'enquête doit être supérieur à 1."); + } + + try + { + var s = _successDataService.CreateSuccess(dto.UserId, dto.InquiryId, dto.IsFinished); + _logger.LogInformation( + "[INFORMATION] Un succès a été créé : userId - {userId}, inquiryId - {inquiryId}, isFinished - {isFinished}", + dto.UserId, dto.InquiryId, dto.IsFinished); + return Created(nameof(GetSuccesses), s); + } + catch (Exception e) + { + return HandleError(e); + } } [HttpPut("success/{idUser:int}/{idInquiry:int}")] [ProducesResponseType(typeof(SuccessDto), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] - public IActionResult UpdateSuccess(int idUser, int idInquiry, [FromBody] SuccessDto SuccessDto) + public IActionResult UpdateSuccess(int idUser, int idInquiry, [FromBody] SuccessDto successDto) { - if (idUser != SuccessDto.UserId || idInquiry != SuccessDto.InquiryId) + if (idUser < 1 || idInquiry < 1) + { + _logger.LogError("[ERREUR] L'id de l'utilisateur ou de l'enquête doit être supérieur à 1."); + return BadRequest("L'id de l'utilisateur ou de l'enquête doit être supérieur à 1."); + } + + if (idUser != successDto.UserId || idInquiry != successDto.InquiryId) { _logger.LogError( - "[ERREUR] Problème ID - La mise à jour du succès avec l'id de l'utilisateur {id} a échouée.", idUser); + "[ERREUR] Problème ID - La mise à jour du succès avec l'id de l'utilisateur {id} a échouée.", + idUser); return BadRequest(); } + if (!ModelState.IsValid) { _logger.LogError( @@ -128,15 +172,36 @@ namespace API.Controllers return BadRequest(); } - if (SuccessDto != null) + try { + var s = _successDataService.UpdateSuccess(idUser, idInquiry, successDto); _logger.LogInformation( "[INFORMATION] La mise à jour du succès avec l'id de l'utilisateur {id} a été effectuée", idUser); - return Ok(_successDataService.UpdateSuccess(idUser,idInquiry, SuccessDto)); + return Ok(s); + } + catch (Exception e) + { + return HandleError(e); } + } - _logger.LogError("[ERREUR] Aucun succès trouvé avec l'id de l'utilisateur {id}.", idUser); - return NotFound(); + private IActionResult HandleError(Exception e) + { + switch (e.Message) + { + case { } msg when msg.Contains("userId"): + _logger.LogError("[ERREUR] Impossible de trouver l'utilisateur pour la manipulation du succès"); + return NotFound("Impossible de trouver l'utilisateur pour la manipulation du succès"); + case { } msg when msg.Contains("inquiryId"): + _logger.LogError("[ERREUR] Impossible de trouver l'enquête pour la manipulation du succès"); + return NotFound("Impossible de trouver l'enquête pour la manipulation du succès"); + case { } msg when msg.Contains("success"): + _logger.LogError("[ERREUR] Impossible de manipuler le succès car il n'existe pas"); + return Conflict("Impossible de manipuler le succès car il n'existe pas"); + default: + _logger.LogError("[ERREUR] Erreur inattendue, impossible de manipuler le succès"); + return BadRequest("Erreur inattendue, impossible de manipuler le succès"); + } } } } \ No newline at end of file diff --git a/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs b/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs index c1d57f9..ab53723 100644 --- a/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs @@ -14,14 +14,16 @@ public class SuccessDataServiceApi(ISuccessService sucessService) return successesEntities.Select(e => e.FromEntityToDto()).ToList(); } - public IEnumerable GetSuccessesByUserId(int id) => sucessService.GetSuccessesByUserId(id).Select(s => s.FromEntityToDto()); + public IEnumerable GetSuccessesByUserId(int id) => + sucessService.GetSuccessesByUserId(id).Select(s => s.FromEntityToDto()); - public IEnumerable GetSuccessesByInquiryId(int id) => sucessService.GetSuccessesByInquiryId(id).Select(s => s.FromEntityToDto()); + public IEnumerable GetSuccessesByInquiryId(int id) => + sucessService.GetSuccessesByInquiryId(id).Select(s => s.FromEntityToDto()); public bool DeleteSuccess(int idUser, int idInquiry) => sucessService.DeleteSuccess(idUser, idInquiry); - public SuccessDto UpdateSuccess(int idUser, int idInquiry, SuccessDto success) => - sucessService.UpdateSuccess(idUser, idInquiry, success.FromDtoToEntity()).FromEntityToDto(); + public SuccessDto UpdateSuccess(int userId, int inquiryId, SuccessDto success) => + sucessService.UpdateSuccess(userId, inquiryId, success.FromDtoToEntity()).FromEntityToDto(); public SuccessDto CreateSuccess(int userId, int inquiryId, bool isFinished) => sucessService.CreateSuccess(userId, inquiryId, isFinished).FromEntityToDto(); diff --git a/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs b/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs index a247a24..0654a2e 100644 --- a/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs @@ -42,23 +42,15 @@ public class SuccessDataService : ISuccessService public IEnumerable GetSuccessesByUserId(int id) { + UserIdIsValid(id); var successes = DbContext.Successes.Where(u => u.UserId == id); - if (successes == null) - { - throw new ArgumentException("Impossible de trouver le succès", nameof(id)); - } - return successes; } public IEnumerable GetSuccessesByInquiryId(int id) { + InquiryIdIsValid(id); var successes = DbContext.Successes.Where(u => u.InquiryId == id); - if (successes == null) - { - throw new ArgumentException("Impossible de trouver le succès", nameof(id)); - } - return successes; } @@ -69,6 +61,7 @@ public class SuccessDataService : ISuccessService { return false; } + DbContext.Successes.Remove(successEntity); DbContext.SaveChangesAsync(); return true; @@ -76,35 +69,61 @@ public class SuccessDataService : ISuccessService public SuccessEntity UpdateSuccess(int idUser, int idInquiry, SuccessEntity success) { - var updatingSuccess = DbContext.Successes.FirstOrDefault(u => u.UserId == idUser && u.InquiryId == idInquiry); - if (updatingSuccess == null) - { - throw new ArgumentException("Impossible de trouver le succès", nameof(idUser)); - } + AreValdIds(idUser, idInquiry); + + var updatingSuccess = + DbContext.Successes.FirstOrDefaultAsync(u => u.UserId == idUser && u.InquiryId == idInquiry); + if (updatingSuccess.Result == null) throw new ArgumentException("success", nameof(idUser)); + /*foreach (var pptt in typeof(SuccessEntity).GetProperties().Where(p => p.CanWrite && p.Name != nameof(SuccessEntity.UserId) && p.Name != nameof(SuccessEntity.InquiryId))) { pptt.SetValue(updatingSuccess, pptt.GetValue(success)); }*/ - updatingSuccess.IsFinished = success.IsFinished; + updatingSuccess.Result.IsFinished = success.IsFinished; DbContext.SaveChangesAsync(); - return updatingSuccess; + return updatingSuccess.Result; } public SuccessEntity CreateSuccess(int userId, int inquiryId, bool isFinished) { - var newSuccessEntity = new SuccessEntity() + AreValdIds(userId, inquiryId); + + var newSuccessEntity = new SuccessEntity { UserId = userId, InquiryId = inquiryId, IsFinished = isFinished, }; - var success = DbContext.Successes.Where(s => s.UserId == userId && s.InquiryId == inquiryId); - if (success == null) + + var success = DbContext.Successes.FirstOrDefaultAsync(s => s.UserId == userId && s.InquiryId == inquiryId); + if (success.Result != null) throw new ArgumentException("success", nameof(userId)); + DbContext.Successes.Add(newSuccessEntity); + DbContext.SaveChangesAsync(); + return newSuccessEntity; + } + + private void AreValdIds(int userId, int inquiryId) + { + UserIdIsValid(userId); + InquiryIdIsValid(inquiryId); + } + + private void UserIdIsValid(int userId) + { + var user = DbContext.Users.FirstOrDefaultAsync(u => u.Id == userId); + if (user.Result == null) { - DbContext.Successes.Add(newSuccessEntity); - DbContext.SaveChangesAsync(); + throw new ArgumentException("userId"); + } + } + + private void InquiryIdIsValid(int inquiryId) + { + var inquiry = DbContext.Inquiries.FirstOrDefaultAsync(u => u.Id == inquiryId); + if (inquiry.Result == null) + { + throw new ArgumentException("inquiryId"); } - return newSuccessEntity; } } \ No newline at end of file diff --git a/API_SQLuedo/DbDataManager/Service/UserDataService.cs b/API_SQLuedo/DbDataManager/Service/UserDataService.cs index 3579427..0162348 100644 --- a/API_SQLuedo/DbDataManager/Service/UserDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/UserDataService.cs @@ -92,7 +92,7 @@ public class UserDataService : IUserService } DbContext.SaveChangesAsync(); - return updatingUser; + return updatingUser; } public UserEntity CreateUser(string username, string password, string email, bool isAdmin) diff --git a/API_SQLuedo/Dto/BlackListDTO.cs b/API_SQLuedo/Dto/BlackListDTO.cs index 7b62f9d..a89bdca 100644 --- a/API_SQLuedo/Dto/BlackListDTO.cs +++ b/API_SQLuedo/Dto/BlackListDTO.cs @@ -5,7 +5,10 @@ public class BlackListDto public string Email { get; set; } public DateOnly ExpirationDate { get; set; } - public BlackListDto() {} + public BlackListDto() + { + } + public BlackListDto(string email, DateOnly expirationDate) { Email = email; diff --git a/API_SQLuedo/Dto/InquiryDTO.cs b/API_SQLuedo/Dto/InquiryDTO.cs index 1de1adf..4601252 100644 --- a/API_SQLuedo/Dto/InquiryDTO.cs +++ b/API_SQLuedo/Dto/InquiryDTO.cs @@ -10,7 +10,10 @@ public class InquiryDto : IEquatable public bool IsUser { get; set; } - public InquiryDto(){} + public InquiryDto() + { + } + public InquiryDto(int id, string title, string description, bool isUser) { Id = id; diff --git a/API_SQLuedo/Dto/LessonDTO.cs b/API_SQLuedo/Dto/LessonDTO.cs index 3a7dec5..f95aa86 100644 --- a/API_SQLuedo/Dto/LessonDTO.cs +++ b/API_SQLuedo/Dto/LessonDTO.cs @@ -51,6 +51,7 @@ public class LessonDto : IEquatable return this.Equals(right as LessonDto); } + public bool Equals(LessonDto other) { return (this.Id == other.Id); diff --git a/API_SQLuedo/Dto/ParagraphDTO.cs b/API_SQLuedo/Dto/ParagraphDTO.cs index 847ffa2..75ac6d8 100644 --- a/API_SQLuedo/Dto/ParagraphDTO.cs +++ b/API_SQLuedo/Dto/ParagraphDTO.cs @@ -59,6 +59,7 @@ public class ParagraphDto : ContentLessonDto, IEquatable return this.Equals(right as ParagraphDto); } + public bool Equals(ParagraphDto other) { return (this.Id == other.Id); diff --git a/API_SQLuedo/Dto/SuccessDTO.cs b/API_SQLuedo/Dto/SuccessDTO.cs index 3608e1e..7fd9a6a 100644 --- a/API_SQLuedo/Dto/SuccessDTO.cs +++ b/API_SQLuedo/Dto/SuccessDTO.cs @@ -41,6 +41,7 @@ public class SuccessDto : IEquatable return this.Equals(right as SuccessDto); } + public bool Equals(SuccessDto other) { return (this.UserId == other.UserId && this.InquiryId == other.InquiryId); diff --git a/API_SQLuedo/Dto/UserDTO.cs b/API_SQLuedo/Dto/UserDTO.cs index 09df9e4..0214520 100644 --- a/API_SQLuedo/Dto/UserDTO.cs +++ b/API_SQLuedo/Dto/UserDTO.cs @@ -8,26 +8,26 @@ public string Email { get; set; } public bool IsAdmin { get; set; } - public UserDto() - { - } + public UserDto() + { + } - public UserDto(int id, string username, string password, string email, bool isAdmin) - { - Id = id; - Username = username; - Password = password; - Email = email; - IsAdmin = isAdmin; - } + public UserDto(int id, string username, string password, string email, bool isAdmin) + { + Id = id; + Username = username; + Password = password; + Email = email; + IsAdmin = isAdmin; + } - public UserDto(string username, string password, string email, bool isAdmin) - { - Username = username; - Password = password; - Email = email; - IsAdmin = isAdmin; - } + public UserDto(string username, string password, string email, bool isAdmin) + { + Username = username; + Password = password; + Email = email; + IsAdmin = isAdmin; + } public override string ToString() { @@ -53,6 +53,7 @@ return this.Equals(right as UserDto); } + public bool Equals(UserDto other) { return (this.Id == other.Id); @@ -63,4 +64,4 @@ return Id; } } -} +} \ No newline at end of file diff --git a/API_SQLuedo/Shared/Mapper/LessonMapper.cs b/API_SQLuedo/Shared/Mapper/LessonMapper.cs index 7db70a4..2154023 100644 --- a/API_SQLuedo/Shared/Mapper/LessonMapper.cs +++ b/API_SQLuedo/Shared/Mapper/LessonMapper.cs @@ -26,6 +26,7 @@ public static class LessonMapper LastEdit = model.LastEdit }; } + public static LessonEntity FromDtoToEntity(this LessonDto dto) { return new LessonEntity diff --git a/API_SQLuedo/StubbedContextLib/StubbedContext.cs b/API_SQLuedo/StubbedContextLib/StubbedContext.cs index 919394a..db6995b 100644 --- a/API_SQLuedo/StubbedContextLib/StubbedContext.cs +++ b/API_SQLuedo/StubbedContextLib/StubbedContext.cs @@ -155,6 +155,28 @@ public class StubbedContext : UserDbContext Title = "L'enquête sur les parapluies", Description = "Il pleuvait", IsUser = false - }); + } + ); + + builder.Entity().HasData( + new SuccessEntity + { + UserId = 1, + InquiryId = 1, + IsFinished = true + }, + new SuccessEntity + { + UserId = 2, + InquiryId = 2, + IsFinished = false + }, + new SuccessEntity + { + UserId = 3, + InquiryId = 3, + IsFinished = true + } + ); } } \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/UserUnitTest.cs b/API_SQLuedo/TestAPI/UserUnitTest.cs index 90d5045..1dc5b4e 100644 --- a/API_SQLuedo/TestAPI/UserUnitTest.cs +++ b/API_SQLuedo/TestAPI/UserUnitTest.cs @@ -169,7 +169,7 @@ public class UserUnitTest Assert.IsNotType(nfObjectResult.Value); } } - + [Fact] public void CreateUserSuccess() { @@ -240,7 +240,7 @@ public class UserUnitTest Assert.Equal(400, bdObjectResult.StatusCode); } } - + private List GetUsersData() { List usersData = new List(4) diff --git a/API_SQLuedo/TestConsoleAPI/Program.cs b/API_SQLuedo/TestConsoleAPI/Program.cs index 1bea860..18bc7d4 100644 --- a/API_SQLuedo/TestConsoleAPI/Program.cs +++ b/API_SQLuedo/TestConsoleAPI/Program.cs @@ -608,7 +608,7 @@ using (var context = new UserDbContext(options)) var idUser = int.Parse(Console.ReadLine()); Console.WriteLine("Quel est l'identifiant de l'enquête lié au succès à supprimer ?"); var idInquiry = int.Parse(Console.ReadLine()); - var res = successController.DeleteSuccess(idUser,idInquiry); + var res = successController.DeleteSuccess(idUser, idInquiry); if (res.GetType() == typeof(OkObjectResult)) { Console.WriteLine("La suppression a été effectuée avec succès !"); diff --git a/API_SQLuedo/TestConsoleEf/Program.cs b/API_SQLuedo/TestConsoleEf/Program.cs index 42a14e8..57aa45b 100644 --- a/API_SQLuedo/TestConsoleEf/Program.cs +++ b/API_SQLuedo/TestConsoleEf/Program.cs @@ -166,7 +166,7 @@ using (var db = new StubbedContext(options)) // Affichage de la solution de l'enquete sur les orang outan Console.WriteLine("\nAffichage de la solution de l'enquete sur les orang outan"); - + var inquiryEntity = await inquiries.FirstOrDefaultAsync(i => i.Title == "L'enquête sur les orang outan"); var solution = await solutions.FirstOrDefaultAsync(s => s.OwnerId == inquiryEntity.Id); foreach (var pptt in typeof(SolutionEntity).GetProperties() diff --git a/API_SQLuedo/TestEF/Dto/TestInquiryDTO.cs b/API_SQLuedo/TestEF/Dto/TestInquiryDTO.cs index e25e9ee..dd4f003 100644 --- a/API_SQLuedo/TestEF/Dto/TestInquiryDTO.cs +++ b/API_SQLuedo/TestEF/Dto/TestInquiryDTO.cs @@ -8,7 +8,7 @@ public class TestInquiryDto private const string _title = "Title"; private const string _description = "_description"; private const bool _isUser = true; - + [Fact] public void TestConstructorWithId() { @@ -18,24 +18,24 @@ public class TestInquiryDto Assert.Equal(_description, inquiry.Description); Assert.True(inquiry.IsUser); } - + [Fact] public void TestConstructorWithoutId() { - InquiryDto inquiry = new InquiryDto(_title,_description,_isUser); + InquiryDto inquiry = new InquiryDto(_title, _description, _isUser); Assert.Equal(0, inquiry.Id); - Assert.Equal(_title,inquiry.Title); - Assert.Equal(_description,inquiry.Description); + Assert.Equal(_title, inquiry.Title); + Assert.Equal(_description, inquiry.Description); Assert.True(inquiry.IsUser); } - + [Fact] public void TestConstructorWithAllAttributes() { - InquiryDto inquiry = new InquiryDto(_id,_title,_description,_isUser); + InquiryDto inquiry = new InquiryDto(_id, _title, _description, _isUser); Assert.Equal(_id, inquiry.Id); - Assert.Equal(_title,inquiry.Title); - Assert.Equal(_description,inquiry.Description); + Assert.Equal(_title, inquiry.Title); + Assert.Equal(_description, inquiry.Description); Assert.True(inquiry.IsUser); } } \ No newline at end of file diff --git a/API_SQLuedo/TestEF/Dto/TestInquiryTableDTO.cs b/API_SQLuedo/TestEF/Dto/TestInquiryTableDTO.cs index 4718c3f..64b7289 100644 --- a/API_SQLuedo/TestEF/Dto/TestInquiryTableDTO.cs +++ b/API_SQLuedo/TestEF/Dto/TestInquiryTableDTO.cs @@ -7,7 +7,7 @@ public class TestInquiryTableDto private const int Id = 1; private const string Database = "database"; private const string Connection = "_connection"; - + [Fact] public void TestConstructorWithId() { @@ -16,7 +16,7 @@ public class TestInquiryTableDto Assert.Equal(Database, inquiry.DatabaseName); Assert.Equal(Connection, inquiry.ConnectionInfo); } - + [Fact] public void TestDefaultConstructor() { diff --git a/API_SQLuedo/TestEF/Dto/TestNotepadDTO.cs b/API_SQLuedo/TestEF/Dto/TestNotepadDTO.cs index 903f09a..ab7d714 100644 --- a/API_SQLuedo/TestEF/Dto/TestNotepadDTO.cs +++ b/API_SQLuedo/TestEF/Dto/TestNotepadDTO.cs @@ -13,29 +13,29 @@ public class TestNotepadDto public void TestDefaultConstructor() { NotepadDto notepad = new NotepadDto(); - Assert.Equal(0,notepad.Id); - Assert.Equal(0,notepad.UserId); - Assert.Equal(0,notepad.InquiryId); + Assert.Equal(0, notepad.Id); + Assert.Equal(0, notepad.UserId); + Assert.Equal(0, notepad.InquiryId); Assert.Null(notepad.Notes); } - + [Fact] public void TestConstructorWithoutId() { - NotepadDto notepad = new NotepadDto(UserId,InquiryId,Notes); - Assert.Equal(0,notepad.Id); - Assert.Equal(UserId,notepad.UserId); - Assert.Equal(InquiryId,notepad.InquiryId); - Assert.Equal(Notes,notepad.Notes); + NotepadDto notepad = new NotepadDto(UserId, InquiryId, Notes); + Assert.Equal(0, notepad.Id); + Assert.Equal(UserId, notepad.UserId); + Assert.Equal(InquiryId, notepad.InquiryId); + Assert.Equal(Notes, notepad.Notes); } - + [Fact] public void TestConstructorWithAllAttributes() { - NotepadDto notepad = new NotepadDto(Id,UserId,InquiryId,Notes); - Assert.Equal(Id,notepad.Id); - Assert.Equal(UserId,notepad.UserId); - Assert.Equal(InquiryId,notepad.InquiryId); - Assert.Equal(Notes,notepad.Notes); + NotepadDto notepad = new NotepadDto(Id, UserId, InquiryId, Notes); + Assert.Equal(Id, notepad.Id); + Assert.Equal(UserId, notepad.UserId); + Assert.Equal(InquiryId, notepad.InquiryId); + Assert.Equal(Notes, notepad.Notes); } } \ No newline at end of file diff --git a/API_SQLuedo/TestEF/Dto/TestParagraphDTO.cs b/API_SQLuedo/TestEF/Dto/TestParagraphDTO.cs index 5e92cc3..f90d293 100644 --- a/API_SQLuedo/TestEF/Dto/TestParagraphDTO.cs +++ b/API_SQLuedo/TestEF/Dto/TestParagraphDTO.cs @@ -22,29 +22,29 @@ public class TestParagraphDto Assert.Null(paragraph.Query); Assert.Null(paragraph.Comment); } - + [Fact] public void TestConstructorWithoutId() { - ParagraphDto paragraph = new ParagraphDto(Title,Content,Info,Query,Comment, 10); + ParagraphDto paragraph = new ParagraphDto(Title, Content, Info, Query, Comment, 10); Assert.Equal(0, paragraph.Id); - Assert.Equal(Title,paragraph.Title); - Assert.Equal(Info,paragraph.Info); - Assert.Equal(Content,paragraph.Content); - Assert.Equal(Query,paragraph.Query); - Assert.Equal(Comment,paragraph.Comment); + Assert.Equal(Title, paragraph.Title); + Assert.Equal(Info, paragraph.Info); + Assert.Equal(Content, paragraph.Content); + Assert.Equal(Query, paragraph.Query); + Assert.Equal(Comment, paragraph.Comment); } - + [Fact] public void TestConstructorWithAllAttributes() { - ParagraphDto paragraph = new ParagraphDto(Id,Title,Content,Info,Query,Comment,10); + ParagraphDto paragraph = new ParagraphDto(Id, Title, Content, Info, Query, Comment, 10); Assert.Equal(Id, paragraph.Id); - Assert.Equal(Title,paragraph.Title); - Assert.Equal(Info,paragraph.Info); - Assert.Equal(Content,paragraph.Content); - Assert.Equal(Query,paragraph.Query); - Assert.Equal(Comment,paragraph.Comment); + Assert.Equal(Title, paragraph.Title); + Assert.Equal(Info, paragraph.Info); + Assert.Equal(Content, paragraph.Content); + Assert.Equal(Query, paragraph.Query); + Assert.Equal(Comment, paragraph.Comment); Assert.Equal(10, paragraph.LessonId); } } \ No newline at end of file diff --git a/API_SQLuedo/TestEF/Dto/TestSolutionDTO.cs b/API_SQLuedo/TestEF/Dto/TestSolutionDTO.cs index d9d9423..28caea9 100644 --- a/API_SQLuedo/TestEF/Dto/TestSolutionDTO.cs +++ b/API_SQLuedo/TestEF/Dto/TestSolutionDTO.cs @@ -15,34 +15,37 @@ public class TestSolutionDto public void TestDefaultConstructor() { SolutionDto solution = new SolutionDto(); - Assert.Equal(0,solution.OwnerId); + Assert.Equal(0, solution.OwnerId); Assert.Null(solution.MurdererFirstName); Assert.Null(solution.MurdererLastName); Assert.Null(solution.MurderPlace); Assert.Null(solution.MurderWeapon); Assert.Null(solution.Explanation); } + [Fact] public void TestConstructorWithoutOwnerId() { - SolutionDto solution = new SolutionDto(MurdererFirstName,MurdererLastName,MurderPlace,MurderWeapon, Explaination); - Assert.Equal(0,solution.OwnerId); - Assert.Equal(MurdererFirstName,solution.MurdererFirstName); - Assert.Equal(MurdererLastName,solution.MurdererLastName); - Assert.Equal(MurderPlace,solution.MurderPlace); - Assert.Equal(MurderWeapon,solution.MurderWeapon); + SolutionDto solution = + new SolutionDto(MurdererFirstName, MurdererLastName, MurderPlace, MurderWeapon, Explaination); + Assert.Equal(0, solution.OwnerId); + Assert.Equal(MurdererFirstName, solution.MurdererFirstName); + Assert.Equal(MurdererLastName, solution.MurdererLastName); + Assert.Equal(MurderPlace, solution.MurderPlace); + Assert.Equal(MurderWeapon, solution.MurderWeapon); Assert.Equal(Explaination, solution.Explanation); } - + [Fact] public void TestConstructorWithAllAttributes() { - SolutionDto solution = new SolutionDto(InquiryId,MurdererFirstName,MurdererLastName,MurderPlace,MurderWeapon, Explaination); - Assert.Equal(InquiryId,solution.OwnerId); - Assert.Equal(MurdererFirstName,solution.MurdererFirstName); - Assert.Equal(MurdererLastName,solution.MurdererLastName); - Assert.Equal(MurderPlace,solution.MurderPlace); - Assert.Equal(MurderWeapon,solution.MurderWeapon); + SolutionDto solution = new SolutionDto(InquiryId, MurdererFirstName, MurdererLastName, MurderPlace, + MurderWeapon, Explaination); + Assert.Equal(InquiryId, solution.OwnerId); + Assert.Equal(MurdererFirstName, solution.MurdererFirstName); + Assert.Equal(MurdererLastName, solution.MurdererLastName); + Assert.Equal(MurderPlace, solution.MurderPlace); + Assert.Equal(MurderWeapon, solution.MurderWeapon); Assert.Equal(Explaination, solution.Explanation); } } \ No newline at end of file diff --git a/API_SQLuedo/TestEF/Dto/TestUserDTO.cs b/API_SQLuedo/TestEF/Dto/TestUserDTO.cs index faff408..97ad011 100644 --- a/API_SQLuedo/TestEF/Dto/TestUserDTO.cs +++ b/API_SQLuedo/TestEF/Dto/TestUserDTO.cs @@ -14,7 +14,7 @@ namespace TestEF.Dto public void TestDefaultConstructor() { UserDto user = new UserDto(); - Assert.Equal(0,user.Id); + Assert.Equal(0, user.Id); Assert.Null(user.Username); Assert.Null(user.Email); Assert.Null(user.Password); @@ -25,18 +25,18 @@ namespace TestEF.Dto public void TestConstructorWithoutId() { UserDto user = new UserDto(Username, Password, Email, IsAdmin); - Assert.Equal(0,user.Id); + Assert.Equal(0, user.Id); Assert.Equal(Username, user.Username); Assert.Equal(Email, user.Email); Assert.Equal(Password, user.Password); Assert.True(user.IsAdmin); } - + [Fact] public void TestConstructorWithoutAllAttributes() { UserDto user = new UserDto(Id, Username, Password, Email, IsAdmin); - Assert.Equal(Id,user.Id); + Assert.Equal(Id, user.Id); Assert.Equal(Username, user.Username); Assert.Equal(Email, user.Email); Assert.Equal(Password, user.Password);