diff --git a/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs b/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs index 3bc935b..3e7d3a8 100644 --- a/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs @@ -10,12 +10,12 @@ public class InquiryDataServiceApi(IInquiryService inquiryService { public InquiryDto UpdateInquiry(int id, InquiryDto inquiry) { - return inquiryService.UpdateInquiry(id, inquiry.FromDTOToEntity()).FromEntityToDTO(); + return inquiryService.UpdateInquiry(id, inquiry.FromDtoToEntity()).FromEntityToDto(); } public InquiryDto CreateInquiry(string title, string description, bool isUser) { - return inquiryService.CreateInquiry(title, description, isUser).FromEntityToDTO(); + return inquiryService.CreateInquiry(title, description, isUser).FromEntityToDto(); } public bool DeleteInquiry(int id) @@ -26,10 +26,10 @@ public class InquiryDataServiceApi(IInquiryService inquiryService public IEnumerable GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria) { var inquiries = inquiryService.GetInquiries(page, number, orderCriteria); - return inquiries.Select(i => i.FromEntityToDTO()).ToList(); + return inquiries.Select(i => i.FromEntityToDto()).ToList(); } - public InquiryDto GetInquiryById(int id) => inquiryService.GetInquiryById(id).FromEntityToDTO(); + public InquiryDto GetInquiryById(int id) => inquiryService.GetInquiryById(id).FromEntityToDto(); - public InquiryDto GetInquiryByTitle(string title) => inquiryService.GetInquiryByTitle(title).FromEntityToDTO(); + public InquiryDto GetInquiryByTitle(string title) => inquiryService.GetInquiryByTitle(title).FromEntityToDto(); } \ No newline at end of file diff --git a/API_SQLuedo/API/Service/LessonDataServiceAPI.cs b/API_SQLuedo/API/Service/LessonDataServiceAPI.cs index e4fa615..a93726b 100644 --- a/API_SQLuedo/API/Service/LessonDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/LessonDataServiceAPI.cs @@ -11,21 +11,21 @@ public class LessonDataServiceApi(ILessonService lessonService) : public IEnumerable GetLessons(int page, int number, LessonOrderCriteria orderCriteria) { var lessonsEntities = lessonService.GetLessons(page, number, orderCriteria); - return lessonsEntities.Select(e => e.FromEntityToDTO()).ToList(); + return lessonsEntities.Select(e => e.FromEntityToDto()).ToList(); } - public LessonDto GetLessonById(int id) => lessonService.GetLessonById(id).FromEntityToDTO(); + public LessonDto GetLessonById(int id) => lessonService.GetLessonById(id).FromEntityToDto(); - public LessonDto GetLessonByTitle(string title) => lessonService.GetLessonByTitle(title).FromEntityToDTO(); + public LessonDto GetLessonByTitle(string title) => lessonService.GetLessonByTitle(title).FromEntityToDto(); public bool DeleteLesson(int id) => lessonService.DeleteLesson(id); public LessonDto UpdateLesson(int id, LessonDto lesson) => - lessonService.UpdateLesson(id, lesson.FromDTOToEntity()).FromEntityToDTO(); + lessonService.UpdateLesson(id, lesson.FromDtoToEntity()).FromEntityToDto(); public LessonDto UpdateLesson(int id, LessonEntity lesson) => - lessonService.UpdateLesson(id, lesson).FromEntityToDTO(); + lessonService.UpdateLesson(id, lesson).FromEntityToDto(); - public LessonDto CreateLesson(string title, string lastPublisher, DateOnly? lastEdit) => - lessonService.CreateLesson(title, lastPublisher, lastEdit).FromEntityToDTO(); + public LessonDto CreateLesson(string title, string lastPublisher, DateOnly lastEdit) => + lessonService.CreateLesson(title, lastPublisher, lastEdit).FromEntityToDto(); } \ No newline at end of file diff --git a/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs b/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs index f51d68e..e8dd3ff 100644 --- a/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs @@ -12,20 +12,20 @@ public class ParagraphDataServiceApi(IParagraphService paragrap public IEnumerable GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria) { var paragraphsEntities = paragraphService.GetParagraphs(page, number, orderCriteria); - return paragraphsEntities.Select(e => e.FromEntityToDTO()).ToList(); + return paragraphsEntities.Select(e => e.FromEntityToDto()).ToList(); } - public ParagraphDto GetParagraphById(int id) => paragraphService.GetParagraphById(id).FromEntityToDTO(); + public ParagraphDto GetParagraphById(int id) => paragraphService.GetParagraphById(id).FromEntityToDto(); public ParagraphDto GetParagraphByTitle(string title) => - paragraphService.GetParagraphByTitle(title).FromEntityToDTO(); + paragraphService.GetParagraphByTitle(title).FromEntityToDto(); public bool DeleteParagraph(int id) => paragraphService.DeleteParagraph(id); public ParagraphDto UpdateParagraph(int id, ParagraphDto paragraph) => - paragraphService.UpdateParagraph(id, paragraph.FromDTOToEntity()).FromEntityToDTO(); + paragraphService.UpdateParagraph(id, paragraph.FromDtoToEntity()).FromEntityToDto(); public ParagraphDto CreateParagraph(string title, string content, string info, string query, string comment, int lessonId) => - paragraphService.CreateParagraph(title, content, info, query, comment, lessonId).FromEntityToDTO(); + paragraphService.CreateParagraph(title, content, info, query, comment, lessonId).FromEntityToDto(); } \ No newline at end of file diff --git a/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs b/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs index a467bc5..c1d57f9 100644 --- a/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs @@ -11,18 +11,18 @@ public class SuccessDataServiceApi(ISuccessService sucessService) public IEnumerable GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria) { var successesEntities = sucessService.GetSuccesses(page, number, orderCriteria); - return successesEntities.Select(e => e.FromEntityToDTO()).ToList(); + 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(); + sucessService.UpdateSuccess(idUser, idInquiry, success.FromDtoToEntity()).FromEntityToDto(); public SuccessDto CreateSuccess(int userId, int inquiryId, bool isFinished) => - sucessService.CreateSuccess(userId, inquiryId, isFinished).FromEntityToDTO(); + sucessService.CreateSuccess(userId, inquiryId, isFinished).FromEntityToDto(); } \ No newline at end of file diff --git a/API_SQLuedo/API/Service/UserDataServiceAPI.cs b/API_SQLuedo/API/Service/UserDataServiceAPI.cs index 04a58c4..72bca16 100644 --- a/API_SQLuedo/API/Service/UserDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/UserDataServiceAPI.cs @@ -11,18 +11,18 @@ public class UserDataServiceApi(IUserService userService) : IUserSer public IEnumerable GetUsers(int page, int number, UserOrderCriteria orderCriteria) { var usersEntities = userService.GetUsers(page, number, orderCriteria); - return usersEntities.Select(e => e.FromEntityToDTO()).ToList(); + return usersEntities.Select(e => e.FromEntityToDto()).ToList(); } - public UserDto GetUserById(int id) => userService.GetUserById(id).FromEntityToDTO(); + public UserDto GetUserById(int id) => userService.GetUserById(id).FromEntityToDto(); - public UserDto GetUserByUsername(string username) => userService.GetUserByUsername(username).FromEntityToDTO(); + public UserDto GetUserByUsername(string username) => userService.GetUserByUsername(username).FromEntityToDto(); public bool DeleteUser(int id) => userService.DeleteUser(id); public UserDto UpdateUser(int id, UserDto user) => - userService.UpdateUser(id, user.FromDTOToEntity()).FromEntityToDTO(); + userService.UpdateUser(id, user.FromDtoToEntity()).FromEntityToDto(); public UserDto CreateUser(string username, string password, string email, bool isAdmin) => - userService.CreateUser(username, password, email, isAdmin).FromEntityToDTO(); + userService.CreateUser(username, password, email, isAdmin).FromEntityToDto(); } \ No newline at end of file diff --git a/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs b/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs index f682367..b3b263a 100644 --- a/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs @@ -64,7 +64,12 @@ public class InquiryDataService : IInquiryService public InquiryEntity CreateInquiry(string title, string description, bool isUser) { - var newInquiryEntity = new InquiryEntity(title, description, isUser); + var newInquiryEntity = new InquiryEntity + { + Title = title, + Description = description, + IsUser = isUser + }; DbContext.Inquiries.Add(newInquiryEntity); DbContext.SaveChangesAsync(); return newInquiryEntity; diff --git a/API_SQLuedo/DbDataManager/Service/LessonDataService.cs b/API_SQLuedo/DbDataManager/Service/LessonDataService.cs index 024096b..7c15987 100644 --- a/API_SQLuedo/DbDataManager/Service/LessonDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/LessonDataService.cs @@ -93,7 +93,7 @@ public class LessonDataService : ILessonService return updatingLesson; } - public LessonEntity CreateLesson(string title, string lastPublisher, DateOnly? lastEdit) + public LessonEntity CreateLesson(string title, string lastPublisher, DateOnly lastEdit) { var newLessonEntity = new LessonEntity() { diff --git a/API_SQLuedo/Dto/BlackListDTO.cs b/API_SQLuedo/Dto/BlackListDTO.cs index 99951c0..7b62f9d 100644 --- a/API_SQLuedo/Dto/BlackListDTO.cs +++ b/API_SQLuedo/Dto/BlackListDTO.cs @@ -2,7 +2,7 @@ public class BlackListDto { - public string? Email { get; set; } + public string Email { get; set; } public DateOnly ExpirationDate { get; set; } public BlackListDto() {} diff --git a/API_SQLuedo/Dto/LessonDTO.cs b/API_SQLuedo/Dto/LessonDTO.cs index 00ac9a3..3a7dec5 100644 --- a/API_SQLuedo/Dto/LessonDTO.cs +++ b/API_SQLuedo/Dto/LessonDTO.cs @@ -3,16 +3,16 @@ public class LessonDto : IEquatable { public int Id { get; } - public string? Title { get; set; } - public string? LastPublisher { get; set; } - public DateOnly? LastEdit { get; set; } + public string Title { get; set; } + public string LastPublisher { get; set; } + public DateOnly LastEdit { get; set; } public ICollection Content { get; set; } = new List(); public LessonDto() { } - public LessonDto(int id, string title, string lastPublisher, DateOnly? lastEdit) + public LessonDto(int id, string title, string lastPublisher, DateOnly lastEdit) { Id = id; Title = title; @@ -20,7 +20,7 @@ public class LessonDto : IEquatable LastEdit = lastEdit; } - public LessonDto(string title, string lastPublisher, DateOnly? lastEdit) + public LessonDto(string title, string lastPublisher, DateOnly lastEdit) { Title = title; LastPublisher = lastPublisher; diff --git a/API_SQLuedo/EntityFramework/BlackListEntity.cs b/API_SQLuedo/EntityFramework/BlackListEntity.cs index 8a2ce16..34c39bb 100644 --- a/API_SQLuedo/EntityFramework/BlackListEntity.cs +++ b/API_SQLuedo/EntityFramework/BlackListEntity.cs @@ -8,14 +8,4 @@ public class BlackListEntity { [Key] public string Email { get; set; } public DateOnly ExpirationDate { get; set; } - - public BlackListEntity() - { - } - - public BlackListEntity(string email, DateOnly expirationDate) - { - Email = email; - ExpirationDate = expirationDate; - } } \ No newline at end of file diff --git a/API_SQLuedo/EntityFramework/ContentLessonEntity.cs b/API_SQLuedo/EntityFramework/ContentLessonEntity.cs index 63ae177..ff32042 100644 --- a/API_SQLuedo/EntityFramework/ContentLessonEntity.cs +++ b/API_SQLuedo/EntityFramework/ContentLessonEntity.cs @@ -7,32 +7,6 @@ public abstract class ContentLessonEntity public int Id { get; set; } public string ContentContent { get; set; } public string ContentTitle { get; set; } - [ForeignKey(nameof(Lesson))] public virtual int LessonId { get; set; } - public virtual LessonEntity Lesson { get; set; } = null!; - - protected ContentLessonEntity() - { - } - - protected ContentLessonEntity(int id, string contentContent, string contentTitle) - { - Id = id; - ContentContent = contentContent; - ContentTitle = contentTitle; - } - - - protected ContentLessonEntity(int id, int lessonId, string contentContent, string contentTitle) - { - Id = id; - LessonId = lessonId; - ContentContent = contentContent; - ContentTitle = contentTitle; - } - - protected ContentLessonEntity(string contentContent, string contentTitle) - { - ContentContent = contentContent; - ContentTitle = contentTitle; - } + [ForeignKey(nameof(Lesson))] public int LessonId { get; set; } + public LessonEntity Lesson { get; set; } = null!; } \ No newline at end of file diff --git a/API_SQLuedo/EntityFramework/InquiryEntity.cs b/API_SQLuedo/EntityFramework/InquiryEntity.cs index 5de9dd9..b44aaa8 100644 --- a/API_SQLuedo/EntityFramework/InquiryEntity.cs +++ b/API_SQLuedo/EntityFramework/InquiryEntity.cs @@ -5,33 +5,8 @@ namespace Entities; public class InquiryEntity { - [Key] public int Id { get; } + [Key] public int Id { get; set; } public string Title { get; set; } public string Description { get; set; } public bool IsUser { get; set; } - - public InquiryEntity() - { - } - - public InquiryEntity(int id) - { - Id = id; - } - - public InquiryEntity(string title, string description, bool isUser) - { - Id = 0; - Title = title; - Description = description; - IsUser = isUser; - } - - public InquiryEntity(int id, string title, string description, bool isUser) - { - Id = id; - Title = title; - Description = description; - IsUser = isUser; - } } \ No newline at end of file diff --git a/API_SQLuedo/EntityFramework/InquiryTableEntity.cs b/API_SQLuedo/EntityFramework/InquiryTableEntity.cs index 3fe43db..c8154e9 100644 --- a/API_SQLuedo/EntityFramework/InquiryTableEntity.cs +++ b/API_SQLuedo/EntityFramework/InquiryTableEntity.cs @@ -15,27 +15,4 @@ public class InquiryTableEntity public InquiryEntity Owner { get; set; } public string DatabaseName { get; set; } public string ConnectionInfo { get; set; } - - public InquiryTableEntity() - { - } - - public InquiryTableEntity(int inquiryId) - { - OwnerId = inquiryId; - } - - public InquiryTableEntity(int inquiryId, string databaseName, string connectionInfo) - { - OwnerId = inquiryId; - DatabaseName = databaseName; - ConnectionInfo = connectionInfo; - } - - public InquiryTableEntity(InquiryEntity owner, string databaseName, string connectionInfo) - { - Owner = owner; - DatabaseName = databaseName; - ConnectionInfo = connectionInfo; - } } \ No newline at end of file diff --git a/API_SQLuedo/EntityFramework/LessonEntity.cs b/API_SQLuedo/EntityFramework/LessonEntity.cs index 6bf5436..67caea2 100644 --- a/API_SQLuedo/EntityFramework/LessonEntity.cs +++ b/API_SQLuedo/EntityFramework/LessonEntity.cs @@ -6,27 +6,8 @@ namespace Entities; public class LessonEntity { public int Id { get; set; } - public string? Title { get; set; } - public string? LastPublisher { get; set; } - public DateOnly? LastEdit { get; set; } + public string Title { get; set; } + public string LastPublisher { get; set; } + public DateOnly LastEdit { get; set; } public ICollection Content { get; set; } = new List(); - - public LessonEntity() - { - } - - public LessonEntity(int id, string title, string lastPublisher, DateOnly? lastEdit) - { - Id = id; - Title = title; - LastPublisher = lastPublisher; - LastEdit = lastEdit; - } - - public LessonEntity(string title, string lastPublisher, DateOnly? lastEdit) - { - Title = title; - LastPublisher = lastPublisher; - LastEdit = lastEdit; - } } \ No newline at end of file diff --git a/API_SQLuedo/EntityFramework/NotepadEntity.cs b/API_SQLuedo/EntityFramework/NotepadEntity.cs index da47cd9..40c9e62 100644 --- a/API_SQLuedo/EntityFramework/NotepadEntity.cs +++ b/API_SQLuedo/EntityFramework/NotepadEntity.cs @@ -13,27 +13,4 @@ public class NotepadEntity [ForeignKey(nameof(Inquiry))] public int InquiryId { get; set; } public InquiryEntity Inquiry { get; set; } public string Notes { get; set; } - - public NotepadEntity() - { - } - - public NotepadEntity(int id, int userId, UserEntity user, int inquiryId, InquiryEntity inquiry, string notes) - { - Id = id; - UserId = userId; - User = user; - InquiryId = inquiryId; - Inquiry = inquiry; - Notes = notes; - } - - public NotepadEntity(int userId, UserEntity user, int inquiryId, InquiryEntity inquiry, string notes) - { - UserId = userId; - User = user; - InquiryId = inquiryId; - Inquiry = inquiry; - Notes = notes; - } } \ No newline at end of file diff --git a/API_SQLuedo/EntityFramework/ParagraphEntity.cs b/API_SQLuedo/EntityFramework/ParagraphEntity.cs index b7ab14e..6b4a8c2 100644 --- a/API_SQLuedo/EntityFramework/ParagraphEntity.cs +++ b/API_SQLuedo/EntityFramework/ParagraphEntity.cs @@ -14,28 +14,4 @@ public class ParagraphEntity : ContentLessonEntity public string Info { get; set; } public string Query { get; set; } public string Comment { get; set; } - - public ParagraphEntity() - { - } - - public ParagraphEntity(int id, string title, string content, string info, string query, - string comment, int idLesson) : base(id, idLesson, content, title) - { - Title = title; - Content = content; - Info = info; - Query = query; - Comment = comment; - } - - public ParagraphEntity(string title, string content, string info, string query, string comment) : base(content, - title) - { - Title = title; - Content = content; - Info = info; - Query = query; - Comment = comment; - } } \ No newline at end of file diff --git a/API_SQLuedo/EntityFramework/SolutionEntity.cs b/API_SQLuedo/EntityFramework/SolutionEntity.cs index 9f10225..2a933a5 100644 --- a/API_SQLuedo/EntityFramework/SolutionEntity.cs +++ b/API_SQLuedo/EntityFramework/SolutionEntity.cs @@ -13,52 +13,9 @@ public class SolutionEntity public int OwnerId { get; set; } public InquiryEntity? Owner { get; set; } - public string? MurdererFirstName { get; set; } - public string? MurdererLastName { get; set; } - public string? MurderPlace { get; set; } - public string? MurderWeapon { get; set; } - public string? Explaination { get; set; } - - public SolutionEntity() - { - } - - public SolutionEntity(int ownerId) - { - OwnerId = ownerId; - } - - public SolutionEntity(int ownerId, InquiryEntity? owner, string murdererFirstName, string murdererLastName, - string murderPlace, string murderWeapon, string explaination) - { - OwnerId = ownerId; - Owner = owner; - MurdererFirstName = murdererFirstName; - MurdererLastName = murdererLastName; - MurderPlace = murderPlace; - MurderWeapon = murderWeapon; - Explaination = explaination; - } - - public SolutionEntity(InquiryEntity? owner, string murdererFirstName, string murdererLastName, string murderPlace, - string murderWeapon, string explaination) - { - Owner = owner; - MurdererFirstName = murdererFirstName; - MurdererLastName = murdererLastName; - MurderPlace = murderPlace; - MurderWeapon = murderWeapon; - Explaination = explaination; - } - - public SolutionEntity(int ownerId, string murdererFirstName, string murdererLastName, string murderPlace, - string murderWeapon, string explanation) - { - OwnerId = ownerId; - MurdererFirstName = murdererFirstName; - MurdererLastName = murdererLastName; - MurderPlace = murderPlace; - MurderWeapon = murderWeapon; - Explaination = explanation; - } + public string MurdererFirstName { get; set; } + public string MurdererLastName { get; set; } + public string MurderPlace { get; set; } + public string MurderWeapon { get; set; } + public string Explaination { get; set; } } \ No newline at end of file diff --git a/API_SQLuedo/EntityFramework/SuccessEntity.cs b/API_SQLuedo/EntityFramework/SuccessEntity.cs index 4a69b11..7ee9258 100644 --- a/API_SQLuedo/EntityFramework/SuccessEntity.cs +++ b/API_SQLuedo/EntityFramework/SuccessEntity.cs @@ -11,31 +11,4 @@ public class SuccessEntity [ForeignKey(nameof(Inquiry))] public int InquiryId { get; set; } public InquiryEntity Inquiry { get; set; } public bool IsFinished { get; set; } - - public SuccessEntity() - { - } - - public SuccessEntity(int userId, UserEntity user, int inquiryId, InquiryEntity inquiry, bool isFinished) - { - UserId = userId; - User = user; - InquiryId = inquiryId; - Inquiry = inquiry; - IsFinished = isFinished; - } - - public SuccessEntity(int userId, int inquiryId, bool isFinished) - { - UserId = userId; - InquiryId = inquiryId; - IsFinished = isFinished; - } - - public SuccessEntity(UserEntity user, InquiryEntity inquiry, bool isFinished) - { - User = user; - Inquiry = inquiry; - IsFinished = isFinished; - } } \ No newline at end of file diff --git a/API_SQLuedo/EntityFramework/UserEntity.cs b/API_SQLuedo/EntityFramework/UserEntity.cs index 2d22110..aa2527f 100644 --- a/API_SQLuedo/EntityFramework/UserEntity.cs +++ b/API_SQLuedo/EntityFramework/UserEntity.cs @@ -10,30 +10,4 @@ public class UserEntity public string Password { get; set; } public string Email { get; set; } public bool IsAdmin { get; set; } - - public UserEntity() - { - } - - public UserEntity(int id) - { - Id = id; - } - - public UserEntity(int id, string username, string password, string email, bool isAdmin) - { - Id = id; - Username = username; - Password = password; - Email = email; - IsAdmin = isAdmin; - } - - public UserEntity(string username, string password, string email, bool isAdmin) - { - Username = username; - Password = password; - Email = email; - IsAdmin = isAdmin; - } } \ No newline at end of file diff --git a/API_SQLuedo/Model/Lesson.cs b/API_SQLuedo/Model/Lesson.cs index b9222d6..d8cdb85 100644 --- a/API_SQLuedo/Model/Lesson.cs +++ b/API_SQLuedo/Model/Lesson.cs @@ -3,12 +3,12 @@ public class Lesson { public int Id { get; } - public string? Title { get; set; } - public string? LastPublisher { get; set; } - public DateOnly? LastEdit { get; set; } + public string Title { get; set; } + public string LastPublisher { get; set; } + public DateOnly LastEdit { get; set; } public ICollection Content { get; set; } = new List(); - public Lesson(int id, string title, string lastPublisher, DateOnly? lastEdit) + public Lesson(int id, string title, string lastPublisher, DateOnly lastEdit) { Id = id; Title = title; @@ -16,7 +16,7 @@ public class Lesson LastEdit = lastEdit; } - public Lesson(string title, string lastPublisher, DateOnly? lastEdit) + public Lesson(string title, string lastPublisher, DateOnly lastEdit) { Title = title; LastPublisher = lastPublisher; diff --git a/API_SQLuedo/Shared/ILessonService.cs b/API_SQLuedo/Shared/ILessonService.cs index b0a1666..92f2683 100644 --- a/API_SQLuedo/Shared/ILessonService.cs +++ b/API_SQLuedo/Shared/ILessonService.cs @@ -9,5 +9,5 @@ public interface ILessonService public TLesson GetLessonByTitle(string title); public bool DeleteLesson(int id); public TLesson UpdateLesson(int id, TLesson lesson); - public TLesson CreateLesson(string title, string lastPublisher, DateOnly? lastEdit); + public TLesson CreateLesson(string title, string lastPublisher, DateOnly lastEdit); } \ No newline at end of file diff --git a/API_SQLuedo/Shared/Mapper/BlackListMapper.cs b/API_SQLuedo/Shared/Mapper/BlackListMapper.cs index a3187a3..3e8924f 100644 --- a/API_SQLuedo/Shared/Mapper/BlackListMapper.cs +++ b/API_SQLuedo/Shared/Mapper/BlackListMapper.cs @@ -6,17 +6,17 @@ namespace Shared.Mapper; public static class BlackListMapper { - public static BlackListDto FromModelToDTO(this BlackList model) + public static BlackListDto FromModelToDto(this BlackList model) { return new BlackListDto(model.Email, model.ExpirationDate); } - public static BlackListDto FromEntityToDTO(this BlackListEntity ent) + public static BlackListDto FromEntityToDto(this BlackListEntity ent) { return new BlackListDto(ent.Email, ent.ExpirationDate); } - public static BlackList FromDTOToModel(this BlackListDto dto) + public static BlackList FromDtoToModel(this BlackListDto dto) { return new BlackList(dto.Email, dto.ExpirationDate); } @@ -26,13 +26,21 @@ public static class BlackListMapper return new BlackList(ent.Email, ent.ExpirationDate); } - public static BlackListEntity FromDTOToEntity(this BlackListDto dto) + public static BlackListEntity FromDtoToEntity(this BlackListDto dto) { - return new BlackListEntity(dto.Email, dto.ExpirationDate); + return new BlackListEntity + { + Email = dto.Email, + ExpirationDate = dto.ExpirationDate + }; } public static BlackListEntity FromModelToEntity(this BlackList model) { - return new BlackListEntity(model.Email, model.ExpirationDate); + return new BlackListEntity + { + Email = model.Email, + ExpirationDate = model.ExpirationDate + }; } } \ No newline at end of file diff --git a/API_SQLuedo/Shared/Mapper/InquiryMapper.cs b/API_SQLuedo/Shared/Mapper/InquiryMapper.cs index af57277..0b99620 100644 --- a/API_SQLuedo/Shared/Mapper/InquiryMapper.cs +++ b/API_SQLuedo/Shared/Mapper/InquiryMapper.cs @@ -6,7 +6,7 @@ namespace Shared.Mapper; public static class InquiryMapper { - public static Inquiry FromDTOToModel(this InquiryDto inqDto) + public static Inquiry FromDtoToModel(this InquiryDto inqDto) { return new Inquiry(inqDto.Id, inqDto.Title, inqDto.Description, inqDto.IsUser); } @@ -19,20 +19,32 @@ public static class InquiryMapper public static InquiryEntity FromModelToEntity(this Inquiry inq) { - return new InquiryEntity(inq.Id, inq.Title, inq.Description, inq.IsUser); + return new InquiryEntity + { + Id = inq.Id, + Title = inq.Title, + Description = inq.Description, + IsUser = inq.IsUser + }; } - public static InquiryEntity FromDTOToEntity(this InquiryDto inqDto) + public static InquiryEntity FromDtoToEntity(this InquiryDto inqDto) { - return new InquiryEntity(inqDto.Id, inqDto.Title, inqDto.Description, inqDto.IsUser); + return new InquiryEntity + { + Id = inqDto.Id, + Title = inqDto.Title, + Description = inqDto.Description, + IsUser = inqDto.IsUser + }; } - public static InquiryDto FromModelToDTO(this Inquiry inq) + public static InquiryDto FromModelToDto(this Inquiry inq) { return new InquiryDto(inq.Id, inq.Title, inq.Description, inq.IsUser); } - public static InquiryDto FromEntityToDTO(this InquiryEntity inqEntity) + public static InquiryDto FromEntityToDto(this InquiryEntity inqEntity) { return new InquiryDto(inqEntity.Id, inqEntity.Title, inqEntity.Description, inqEntity.IsUser); } diff --git a/API_SQLuedo/Shared/Mapper/InquiryTableMapper.cs b/API_SQLuedo/Shared/Mapper/InquiryTableMapper.cs index 7469e28..4143ebb 100644 --- a/API_SQLuedo/Shared/Mapper/InquiryTableMapper.cs +++ b/API_SQLuedo/Shared/Mapper/InquiryTableMapper.cs @@ -6,7 +6,7 @@ namespace Shared.Mapper; public static class InquiryTableMapper { - public static InquiryTable FromDTOToModel(this InquiryTableDto inqTDto) + public static InquiryTable FromDtoToModel(this InquiryTableDto inqTDto) { return new InquiryTable(inqTDto.OwnerId, inqTDto.ConnectionInfo, inqTDto.DatabaseName); } @@ -16,23 +16,33 @@ public static class InquiryTableMapper return new InquiryTable(inqTEntity.OwnerId, inqTEntity.ConnectionInfo, inqTEntity.DatabaseName); } - public static InquiryTableDto FromModelToDTO(this InquiryTable inqT) + public static InquiryTableDto FromModelToDto(this InquiryTable inqT) { return new InquiryTableDto(inqT.OwnerId, inqT.DatabaseName, inqT.ConnectionInfo); } - public static InquiryTableDto FromEntityToDTO(this InquiryTableEntity inqTEntity) + public static InquiryTableDto FromEntityToDto(this InquiryTableEntity inqTEntity) { return new InquiryTableDto(inqTEntity.OwnerId, inqTEntity.DatabaseName, inqTEntity.ConnectionInfo); } public static InquiryTableEntity FromModelToEntity(this InquiryTable inqT) { - return new InquiryTableEntity(inqT.OwnerId, inqT.DatabaseName, inqT.ConnectionInfo); + return new InquiryTableEntity + { + OwnerId = inqT.OwnerId, + DatabaseName = inqT.DatabaseName, + ConnectionInfo = inqT.ConnectionInfo + }; } - public static InquiryTableEntity FromDTOToEntity(this InquiryTableDto dto) + public static InquiryTableEntity FromDtoToEntity(this InquiryTableDto dto) { - return new InquiryTableEntity(dto.OwnerId, dto.DatabaseName, dto.ConnectionInfo); + return new InquiryTableEntity + { + OwnerId = dto.OwnerId, + DatabaseName = dto.DatabaseName, + ConnectionInfo = dto.ConnectionInfo + }; } } \ No newline at end of file diff --git a/API_SQLuedo/Shared/Mapper/LessonMapper.cs b/API_SQLuedo/Shared/Mapper/LessonMapper.cs index f218943..7db70a4 100644 --- a/API_SQLuedo/Shared/Mapper/LessonMapper.cs +++ b/API_SQLuedo/Shared/Mapper/LessonMapper.cs @@ -6,27 +6,38 @@ namespace Shared.Mapper; public static class LessonMapper { - public static LessonDto FromModelToDTO(this Lesson model) + public static LessonDto FromModelToDto(this Lesson model) { return new LessonDto(model.Id, model.Title, model.LastPublisher, model.LastEdit); } - public static LessonDto FromEntityToDTO(this LessonEntity model) + public static LessonDto FromEntityToDto(this LessonEntity model) { return new LessonDto(model.Id, model.Title, model.LastPublisher, model.LastEdit); } public static LessonEntity FromModelToEntity(this Lesson model) { - return new LessonEntity(model.Id, model.Title, model.LastPublisher, model.LastEdit); + return new LessonEntity + { + Id = model.Id, + Title = model.Title, + LastPublisher = model.LastPublisher, + LastEdit = model.LastEdit + }; } - - public static LessonEntity FromDTOToEntity(this LessonDto dto) + public static LessonEntity FromDtoToEntity(this LessonDto dto) { - return new LessonEntity(dto.Id, dto.Title, dto.LastPublisher, dto.LastEdit); + return new LessonEntity + { + Id = dto.Id, + Title = dto.Title, + LastPublisher = dto.LastPublisher, + LastEdit = dto.LastEdit + }; } - public static Lesson FromDTOToModel(this LessonDto dto) + public static Lesson FromDtoToModel(this LessonDto dto) { return new Lesson(dto.Id, dto.Title, dto.LastPublisher, dto.LastEdit); } diff --git a/API_SQLuedo/Shared/Mapper/NotepadMapper.cs b/API_SQLuedo/Shared/Mapper/NotepadMapper.cs index 08ffce4..48b2705 100644 --- a/API_SQLuedo/Shared/Mapper/NotepadMapper.cs +++ b/API_SQLuedo/Shared/Mapper/NotepadMapper.cs @@ -6,7 +6,7 @@ namespace Shared.Mapper; public static class NotepadMapper { - public static Notepad FromDTOToModel(this NotepadDto dto) + public static Notepad FromDtoToModel(this NotepadDto dto) { return new Notepad(dto.Id, dto.UserId, dto.InquiryId, dto.Notes); } @@ -16,25 +16,49 @@ public static class NotepadMapper return new Notepad(ent.Id, ent.UserId, ent.InquiryId, ent.Notes); } - public static NotepadDto FromModelToDTO(this Notepad not) + public static NotepadDto FromModelToDto(this Notepad not) { return new NotepadDto(not.Id, not.UserId, not.InquiryId, not.Notes); } - public static NotepadDto FromEntityToDTO(this NotepadEntity ent) + public static NotepadDto FromEntityToDto(this NotepadEntity ent) { return new NotepadDto(ent.Id, ent.UserId, ent.InquiryId, ent.Notes); } - public static NotepadEntity FromDTOToEntity(this NotepadDto dto) + public static NotepadEntity FromDtoToEntity(this NotepadDto dto) { - return new NotepadEntity(dto.Id, new UserEntity(dto.UserId), dto.UserId, new InquiryEntity(dto.InquiryId), - dto.Notes); + return new NotepadEntity + { + Id = dto.Id, + User = new UserEntity + { + Id = dto.UserId + }, + UserId = dto.UserId, + Inquiry = new InquiryEntity + { + Id = dto.InquiryId + }, + Notes = dto.Notes + }; } public static NotepadEntity FromModelToEntity(this Notepad not) { - return new NotepadEntity(not.Id, new UserEntity(not.UserId), not.UserId, new InquiryEntity(not.InquiryId), - not.Notes); + return new NotepadEntity + { + Id = not.Id, + User = new UserEntity + { + Id = not.UserId + }, + UserId = not.UserId, + Inquiry = new InquiryEntity + { + Id = not.InquiryId + }, + Notes = not.Notes + }; } } \ No newline at end of file diff --git a/API_SQLuedo/Shared/Mapper/ParagraphMapper.cs b/API_SQLuedo/Shared/Mapper/ParagraphMapper.cs index cb9083b..69f5be8 100644 --- a/API_SQLuedo/Shared/Mapper/ParagraphMapper.cs +++ b/API_SQLuedo/Shared/Mapper/ParagraphMapper.cs @@ -6,7 +6,7 @@ namespace Shared.Mapper; public static class ParagraphMapper { - public static Paragraph FromDTOToModel(this ParagraphDto dto) + public static Paragraph FromDtoToModel(this ParagraphDto dto) { return new Paragraph(dto.ContentTitle, dto.ContentContent, dto.Info, dto.Query, dto.Comment); } @@ -16,27 +16,42 @@ public static class ParagraphMapper return new Paragraph(model.ContentTitle, model.ContentContent, model.Info, model.Query, model.Comment); } - public static ParagraphDto FromEntityToDTO(this ParagraphEntity model) + public static ParagraphDto FromEntityToDto(this ParagraphEntity model) { return new ParagraphDto(model.Id, model.ContentTitle, model.ContentContent, model.Info, model.Query, model.Comment, model.LessonId); } - public static ParagraphDto FromModelToDTO(this Paragraph model) + public static ParagraphDto FromModelToDto(this Paragraph model) { return new ParagraphDto(model.Id, model.ContentTitle, model.ContentContent, model.Info, model.Query, model.Comment, model.LessonId); } - public static ParagraphEntity FromDTOToEntity(this ParagraphDto dto) + public static ParagraphEntity FromDtoToEntity(this ParagraphDto dto) { - return new ParagraphEntity(dto.Id, dto.ContentTitle, dto.ContentContent, dto.Info, dto.Query, dto.Comment, - dto.LessonId); + return new ParagraphEntity + { + Id = dto.Id, + ContentTitle = dto.ContentTitle, + ContentContent = dto.ContentContent, + Info = dto.Info, + Query = dto.Query, + Comment = dto.Comment, + LessonId = dto.LessonId + }; } public static ParagraphEntity FromModelToEntity(this Paragraph model) { - return new ParagraphEntity(model.Id, model.ContentTitle, model.ContentContent, model.Info, model.Query, - model.Comment, model.LessonId); + return new ParagraphEntity + { + Id = model.Id, + ContentTitle = model.ContentTitle, + ContentContent = model.ContentContent, + Info = model.Info, + Query = model.Query, + Comment = model.Comment, LessonId = model.LessonId + }; } } \ No newline at end of file diff --git a/API_SQLuedo/Shared/Mapper/SolutionMapper.cs b/API_SQLuedo/Shared/Mapper/SolutionMapper.cs index 3615528..8d7a246 100644 --- a/API_SQLuedo/Shared/Mapper/SolutionMapper.cs +++ b/API_SQLuedo/Shared/Mapper/SolutionMapper.cs @@ -6,7 +6,7 @@ namespace Shared.Mapper; public static class SolutionMapper { - public static Solution FromDTOToModel(this SolutionDto dto) + public static Solution FromDtoToModel(this SolutionDto dto) { return new Solution(dto.OwnerId, dto.MurdererFirstName, dto.MurdererLastName, dto.MurderPlace, dto.MurderWeapon, dto.Explanation); @@ -18,13 +18,13 @@ public static class SolutionMapper entity.MurderWeapon, entity.Explaination); } - public static SolutionDto FromModelToDTO(this Solution model) + public static SolutionDto FromModelToDto(this Solution model) { return new SolutionDto(model.OwnerId, model.MurdererFirstName, model.MurdererLastName, model.MurderPlace, model.MurderWeapon, model.Explanation); } - public static SolutionDto FromEntityToDTO(this SolutionEntity entity) + public static SolutionDto FromEntityToDto(this SolutionEntity entity) { return new SolutionDto(entity.OwnerId, entity.MurdererFirstName, entity.MurdererLastName, entity.MurderPlace, entity.MurderWeapon, entity.Explaination); @@ -32,13 +32,35 @@ public static class SolutionMapper public static SolutionEntity FromModelToEntity(this Solution model) { - return new SolutionEntity(model.OwnerId, new InquiryEntity(model.OwnerId), model.MurdererFirstName, - model.MurdererLastName, model.MurderPlace, model.MurderWeapon, model.Explanation); + return new SolutionEntity + { + OwnerId = model.OwnerId, + Owner = new InquiryEntity + { + Id = model.OwnerId + }, + MurdererFirstName = model.MurdererFirstName, + MurdererLastName = model.MurdererLastName, + MurderPlace = model.MurderPlace, + MurderWeapon = model.MurderWeapon, + Explaination = model.Explanation + }; } - public static SolutionEntity FromDTOToEntity(this SolutionDto dto) + public static SolutionEntity FromDtoToEntity(this SolutionDto dto) { - return new SolutionEntity(dto.OwnerId, new InquiryEntity(dto.OwnerId), dto.MurdererFirstName, - dto.MurdererLastName, dto.MurderPlace, dto.MurderWeapon, dto.Explanation); + return new SolutionEntity + { + OwnerId = dto.OwnerId, + Owner = new InquiryEntity + { + Id = dto.OwnerId + }, + MurdererFirstName = dto.MurdererFirstName, + MurdererLastName = dto.MurdererLastName, + MurderPlace = dto.MurderPlace, + MurderWeapon = dto.MurderWeapon, + Explaination = dto.Explanation + }; } } \ No newline at end of file diff --git a/API_SQLuedo/Shared/Mapper/SuccessMapper.cs b/API_SQLuedo/Shared/Mapper/SuccessMapper.cs index 8a9ebd3..1a175b1 100644 --- a/API_SQLuedo/Shared/Mapper/SuccessMapper.cs +++ b/API_SQLuedo/Shared/Mapper/SuccessMapper.cs @@ -6,7 +6,7 @@ namespace Shared.Mapper; public static class SuccessMapper { - public static Success FromDTOToModel(this SuccessDto dto) + public static Success FromDtoToModel(this SuccessDto dto) { return new Success(dto.UserId, dto.InquiryId, dto.IsFinished); } @@ -16,25 +16,49 @@ public static class SuccessMapper return new Success(ent.UserId, ent.InquiryId, ent.IsFinished); } - public static SuccessDto FromModelToDTO(this Success suc) + public static SuccessDto FromModelToDto(this Success suc) { return new SuccessDto(suc.UserId, suc.InquiryId, suc.IsFinished); } - public static SuccessDto FromEntityToDTO(this SuccessEntity ent) + public static SuccessDto FromEntityToDto(this SuccessEntity ent) { return new SuccessDto(ent.UserId, ent.InquiryId, ent.IsFinished); } - public static SuccessEntity FromDTOToEntity(this SuccessDto dto) + public static SuccessEntity FromDtoToEntity(this SuccessDto dto) { - return new SuccessEntity(dto.UserId, new UserEntity(dto.UserId), dto.InquiryId, - new InquiryEntity(dto.InquiryId), dto.IsFinished); + return new SuccessEntity + { + UserId = dto.UserId, + User = new UserEntity + { + Id = dto.UserId + }, + InquiryId = dto.InquiryId, + Inquiry = new InquiryEntity + { + Id = dto.InquiryId + }, + IsFinished = dto.IsFinished + }; } public static SuccessEntity FromModelToEntity(this Success suc) { - return new SuccessEntity(suc.UserId, new UserEntity(suc.UserId), suc.InquiryId, - new InquiryEntity(suc.InquiryId), suc.IsFinished); + return new SuccessEntity + { + UserId = suc.UserId, + User = new UserEntity + { + Id = suc.UserId + }, + InquiryId = suc.InquiryId, + Inquiry = new InquiryEntity + { + Id = suc.InquiryId + }, + IsFinished = suc.IsFinished + }; } } \ No newline at end of file diff --git a/API_SQLuedo/Shared/Mapper/UserMapper.cs b/API_SQLuedo/Shared/Mapper/UserMapper.cs index 813931b..5b05609 100644 --- a/API_SQLuedo/Shared/Mapper/UserMapper.cs +++ b/API_SQLuedo/Shared/Mapper/UserMapper.cs @@ -6,14 +6,21 @@ namespace Shared.Mapper; public static class UserMapper { - public static User FromDTOToModel(this UserDto dto) + public static User FromDtoToModel(this UserDto dto) { return new User(dto.Id, dto.Username, dto.Password, dto.Email, dto.IsAdmin); } - public static UserEntity FromDTOToEntity(this UserDto dto) + public static UserEntity FromDtoToEntity(this UserDto dto) { - return new UserEntity(dto.Id, dto.Username, dto.Password, dto.Email, dto.IsAdmin); + return new UserEntity + { + Id = dto.Id, + Username = dto.Username, + Password = dto.Password, + Email = dto.Email, + IsAdmin = dto.IsAdmin + }; } public static User FromEntityToModel(this UserEntity entity) @@ -21,18 +28,25 @@ public static class UserMapper return new User(entity.Id, entity.Username, entity.Password, entity.Email, entity.IsAdmin); } - public static UserDto FromEntityToDTO(this UserEntity entity) + public static UserDto FromEntityToDto(this UserEntity entity) { return new UserDto(entity.Id, entity.Username, entity.Password, entity.Email, entity.IsAdmin); } - public static UserDto FromModelToDTO(this User user) + public static UserDto FromModelToDto(this User user) { return new UserDto(user.Id, user.Username, user.Password, user.Email, user.IsAdmin); } public static UserEntity FromModelToEntity(this User user) { - return new UserEntity(user.Id, user.Username, user.Password, user.Email, user.IsAdmin); + return new UserEntity + { + Id = user.Id, + Username = user.Username, + Password = user.Password, + Email = user.Email, + IsAdmin = user.IsAdmin + }; } } \ No newline at end of file diff --git a/API_SQLuedo/StubbedContextLib/StubbedContext.cs b/API_SQLuedo/StubbedContextLib/StubbedContext.cs index 818785d..919394a 100644 --- a/API_SQLuedo/StubbedContextLib/StubbedContext.cs +++ b/API_SQLuedo/StubbedContextLib/StubbedContext.cs @@ -16,70 +16,145 @@ public class StubbedContext : UserDbContext { base.OnModelCreating(builder); builder.Entity().HasData( - new UserEntity(1, "johnny", Convert.ToBase64String(KeyDerivation.Pbkdf2( - password: "motdepasse", - salt: RandomNumberGenerator.GetBytes(128 / 8), - prf: KeyDerivationPrf.HMACSHA256, - iterationCount: 100000, - numBytesRequested: 256 / 8)), "Johnny.RATTON@etu.uca.fr", true), - new UserEntity(2, "maxime", Convert.ToBase64String(KeyDerivation.Pbkdf2( - password: "motdepasse", - salt: RandomNumberGenerator.GetBytes(128 / 8), - prf: KeyDerivationPrf.HMACSHA256, - iterationCount: 100000, - numBytesRequested: 256 / 8)), "Maxime.SAPOUNTZIS@etu.uca.fr", true), - new UserEntity(3, "clement", Convert.ToBase64String(KeyDerivation.Pbkdf2( - password: "motdepasse", - salt: RandomNumberGenerator.GetBytes(128 / 8), - prf: KeyDerivationPrf.HMACSHA256, - iterationCount: 100000, - numBytesRequested: 256 / 8)), "Clement.CHIEU@etu.uca.fr", true), - new UserEntity(4, "erwan", Convert.ToBase64String(KeyDerivation.Pbkdf2( - password: "motdepasse", - salt: RandomNumberGenerator.GetBytes(128 / 8), - prf: KeyDerivationPrf.HMACSHA256, - iterationCount: 100000, - numBytesRequested: 256 / 8)), "Erwan.MENAGER@etu.uca.fr", true), - new UserEntity(5, "victor", Convert.ToBase64String(KeyDerivation.Pbkdf2( - password: "motdepasse", - salt: RandomNumberGenerator.GetBytes(128 / 8), - prf: KeyDerivationPrf.HMACSHA256, - iterationCount: 100000, - numBytesRequested: 256 / 8)), "Victor.GABORIT@etu.uca.fr", true)); + new UserEntity + { + Id = 1, + Username = "johnny", + Password = Convert.ToBase64String(KeyDerivation.Pbkdf2( + password: "motdepasse", + salt: RandomNumberGenerator.GetBytes(128 / 8), + prf: KeyDerivationPrf.HMACSHA256, + iterationCount: 100000, + numBytesRequested: 256 / 8)), + Email = "Johnny.RATTON@etu.uca.fr", + IsAdmin = true + }, + new UserEntity + { + Id = 2, + Username = "maxime", + Password = Convert.ToBase64String(KeyDerivation.Pbkdf2( + password: "motdepasse", + salt: RandomNumberGenerator.GetBytes(128 / 8), + prf: KeyDerivationPrf.HMACSHA256, + iterationCount: 100000, + numBytesRequested: 256 / 8)), + Email = "Maxime.SAPOUNTZIS@etu.uca.fr", + IsAdmin = true + }, + new UserEntity + { + Id = 3, + Username = "clement", + Password = Convert.ToBase64String(KeyDerivation.Pbkdf2( + password: "motdepasse", + salt: RandomNumberGenerator.GetBytes(128 / 8), + prf: KeyDerivationPrf.HMACSHA256, + iterationCount: 100000, + numBytesRequested: 256 / 8)), + Email = "Clement.CHIEU@etu.uca.fr", + IsAdmin = true + }, + new UserEntity + { + Id = 4, + Username = "erwan", + Password = Convert.ToBase64String(KeyDerivation.Pbkdf2( + password: "motdepasse", + salt: RandomNumberGenerator.GetBytes(128 / 8), + prf: KeyDerivationPrf.HMACSHA256, + iterationCount: 100000, + numBytesRequested: 256 / 8)), + Email = "Erwan.MENAGER@etu.uca.fr", + IsAdmin = true + }, + new UserEntity + { + Id = 5, + Username = "victor", + Password = Convert.ToBase64String(KeyDerivation.Pbkdf2( + password: "motdepasse", + salt: RandomNumberGenerator.GetBytes(128 / 8), + prf: KeyDerivationPrf.HMACSHA256, + iterationCount: 100000, + numBytesRequested: 256 / 8)), + Email = "Victor.GABORIT@etu.uca.fr", + IsAdmin = true + }); builder.Entity().HasData( - new InquiryTableEntity(1, "Inquiry1", - "Server=localhost;Database=Inquiry1;Trusted_Connection=True;MultipleActiveResultSets=true"), - new InquiryTableEntity(2, "Inquiry2", - "Server=localhost;Database=Inquiry2;Trusted_Connection=True;MultipleActiveResultSets=true"), - new InquiryTableEntity(3, "Inquiry3", - "Server=localhost;Database=Inquiry3;Trusted_Connection=True;MultipleActiveResultSets=true")); + new InquiryTableEntity + { + OwnerId = 1, + DatabaseName = "Inquiry1", + ConnectionInfo = + "Server=localhost;Database=Inquiry1;Trusted_Connection=True;MultipleActiveResultSets=true" + }, + new InquiryTableEntity + { + OwnerId = 2, + DatabaseName = "Inquiry2", + ConnectionInfo = + "Server=localhost;Database=Inquiry2;Trusted_Connection=True;MultipleActiveResultSets=true" + }, + new InquiryTableEntity + { + OwnerId = 3, + DatabaseName = "Inquiry3", + ConnectionInfo = + "Server=localhost;Database=Inquiry3;Trusted_Connection=True;MultipleActiveResultSets=true" + }); builder.Entity().HasData( - new SolutionEntity(1, "Maxime", "Sapountzis", "La cuisine", "Le couteau", "Parce que c'est Maxime"), - new SolutionEntity(2, "Johnny", "Ratton", "La cuisine", "Le couteau", "Parce que il est fou"), - new SolutionEntity(3, "Erwan", "Menager", "La salle de bain", "L'arachide", "Parce que c'est Erwan")); + new SolutionEntity + { + OwnerId = 1, + MurdererFirstName = "Maxime", + MurdererLastName = "Sapountzis", + MurderPlace = "La cuisine", + MurderWeapon = "Le couteau", + Explaination = "Parce que c'est Maxime" + }, + new SolutionEntity + { + OwnerId = 2, + MurdererFirstName = "Johnny", + MurdererLastName = "Ratton", + MurderPlace = "La cuisine", + MurderWeapon = "Le couteau", + Explaination = "Parce que il est fou" + }, + new SolutionEntity + { + OwnerId = 3, + MurdererFirstName = "Erwan", + MurdererLastName = "Menager", + MurderPlace = "La salle de bain", + MurderWeapon = "L'arachide", + Explaination = "Parce que c'est Erwan" + }); - builder.Entity().HasData( - new LessonEntity(1, "La cuisine", "Maxime", new DateOnly(2021, 10, 10)), - new LessonEntity(2, "La salle de bain", "Erwan", new DateOnly(2021, 10, 10)), - new LessonEntity(3, "La chambre", "Johnny", new DateOnly(2021, 10, 10)), - new LessonEntity(4, "Le salon", "Clement", new DateOnly(2021, 10, 10))); - - builder.Entity().HasData( - new ParagraphEntity(1, "Le premier paragraphe", "Le contenu du premier paragraphe", "Attention", "La query", - "Le commentaire", 1), - new ParagraphEntity(2, "Le deuxième paragraphe", "Le contenu du deuxième paragraphe", "Attention", - "La query", "Le commentaire", 1), - new ParagraphEntity(3, "Le troisième paragraphe", "Le contenu du troisième paragraphe", "Attention", - "query", "commentaire", 2), - new ParagraphEntity(4, "Le quatrième paragraphe", "Le contenu du quatrième paragraphe", "Attention", - "La query", "Le commentaire", 3), - new ParagraphEntity(5, "Le cinquième paragraphe", "Le contenu du quatrième paragraphe", "Attention", - "La query", "Le commentaire", 4)); builder.Entity().HasData( - new InquiryEntity(1, "L'enquête de la carotte", "La description de l'inquiry1", true), - new InquiryEntity(2, "L'enquête sur les orang outan", "The new description", false), - new InquiryEntity(3, "L'enquête sur les parapluies", "Il pleuvait", false)); + new InquiryEntity + { + Id = 1, + Title = "L'enquête de la carotte", + Description = "La description de l'inquiry1", + IsUser = true + }, + new InquiryEntity + { + Id = 2, + Title = "L'enquête sur les orang outan", + Description = "The new description", + IsUser = false + }, + new InquiryEntity + { + Id = 3, + Title = "L'enquête sur les parapluies", + Description = "Il pleuvait", + IsUser = false + }); } } \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/Extensions/InquiryDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/InquiryDto.EqualityComparer.cs index 39572f9..f9e7698 100644 --- a/API_SQLuedo/TestAPI/Extensions/InquiryDto.EqualityComparer.cs +++ b/API_SQLuedo/TestAPI/Extensions/InquiryDto.EqualityComparer.cs @@ -1,22 +1,16 @@ using Dto; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace TestAPI.Extensions +namespace TestAPI.Extensions; + +class InquiryIdEqualityComparer : EqualityComparer { - class InquiryIdEqualityComparer : EqualityComparer + public override bool Equals(InquiryDto x, InquiryDto y) { - public override bool Equals(InquiryDto x, InquiryDto y) - { - return x.Id == y.Id; - } + return x.Id == y.Id; + } - public override int GetHashCode(InquiryDto obj) - { - return obj.Id; - } + public override int GetHashCode(InquiryDto obj) + { + return obj.Id; } -} +} \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/Extensions/LessonsDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/LessonsDto.EqualityComparer.cs index 6356a5e..0d89815 100644 --- a/API_SQLuedo/TestAPI/Extensions/LessonsDto.EqualityComparer.cs +++ b/API_SQLuedo/TestAPI/Extensions/LessonsDto.EqualityComparer.cs @@ -1,22 +1,16 @@ using Dto; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace TestAPI.Extensions +namespace TestAPI.Extensions; + +class LessonIdEqualityComparer : EqualityComparer { - class LessonIdEqualityComparer : EqualityComparer + public override bool Equals(LessonDto x, LessonDto y) { - public override bool Equals(LessonDto x, LessonDto y) - { - return x.Id == y.Id; - } + return x.Id == y.Id; + } - public override int GetHashCode(LessonDto obj) - { - return obj.Id; - } + public override int GetHashCode(LessonDto obj) + { + return obj.Id; } -} +} \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/Extensions/ParagraphDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/ParagraphDto.EqualityComparer.cs index 42e9c15..1763b68 100644 --- a/API_SQLuedo/TestAPI/Extensions/ParagraphDto.EqualityComparer.cs +++ b/API_SQLuedo/TestAPI/Extensions/ParagraphDto.EqualityComparer.cs @@ -1,22 +1,16 @@ using Dto; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace TestAPI.Extensions +namespace TestAPI.Extensions; + +class ParagraphIdEqualityComparer : EqualityComparer { - class ParagraphIdEqualityComparer : EqualityComparer + public override bool Equals(ParagraphDto x, ParagraphDto y) { - public override bool Equals(ParagraphDto x, ParagraphDto y) - { - return x.Id == y.Id; - } + return x.Id == y.Id; + } - public override int GetHashCode(ParagraphDto obj) - { - return obj.Id; - } + public override int GetHashCode(ParagraphDto obj) + { + return obj.Id; } -} +} \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/Extensions/SuccessDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/SuccessDto.EqualityComparer.cs index 4acb0b1..2d190bd 100644 --- a/API_SQLuedo/TestAPI/Extensions/SuccessDto.EqualityComparer.cs +++ b/API_SQLuedo/TestAPI/Extensions/SuccessDto.EqualityComparer.cs @@ -1,22 +1,16 @@ using Dto; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace TestAPI.Extensions +namespace TestAPI.Extensions; + +class SuccessIdEqualityComparer : EqualityComparer { - class SuccessIdEqualityComparer : EqualityComparer + public override bool Equals(SuccessDto x, SuccessDto y) { - public override bool Equals(SuccessDto x, SuccessDto y) - { - return x.UserId == y.UserId && x.InquiryId == y.InquiryId; - } + return x.UserId == y.UserId && x.InquiryId == y.InquiryId; + } - public override int GetHashCode(SuccessDto obj) - { - return obj.UserId * obj.InquiryId; - } + public override int GetHashCode(SuccessDto obj) + { + return obj.UserId * obj.InquiryId; } -} +} \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs b/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs index f1c81e4..f3e1c9f 100644 --- a/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs +++ b/API_SQLuedo/TestAPI/Extensions/UserDto.EqualityComparer.cs @@ -1,22 +1,16 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dto; +using Dto; -namespace TestAPI.Extensions +namespace TestAPI.Extensions; + +class UserIdEqualityComparer : EqualityComparer { - class UserIdEqualityComparer : EqualityComparer + public override bool Equals(UserDto x, UserDto y) { - public override bool Equals(UserDto x, UserDto y) - { - return x.Id == y.Id; - } + return x.Id == y.Id; + } - public override int GetHashCode(UserDto obj) - { - return obj.Id; - } + public override int GetHashCode(UserDto obj) + { + return obj.Id; } -} +} \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/InquiryUnitTest.cs b/API_SQLuedo/TestAPI/InquiryUnitTest.cs index ac2bd41..9bfdb68 100644 --- a/API_SQLuedo/TestAPI/InquiryUnitTest.cs +++ b/API_SQLuedo/TestAPI/InquiryUnitTest.cs @@ -3,299 +3,265 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging.Abstractions; using Moq; using Shared; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using API.Controllers; -using Microsoft.Extensions.Logging; using TestAPI.Extensions; -namespace TestAPI -{ - public class InquiryUnitTest - { - private readonly Mock> inquiryService; - public InquiryUnitTest() - { - inquiryService = new Mock>(); - } - +namespace TestAPI; - [Fact] - public void GetInquiriesListSuccess() - { - var inquiryList = GetInquiriesData(); - inquiryService.Setup(x => x.GetInquiries(1, 4, 0)) - .Returns(inquiryList); - var InquiryController = new InquiriesController(inquiryService.Object, new NullLogger()); - - var inquiriesResult = InquiryController.GetInquiries(1, 4, 0); - - if (inquiriesResult is OkObjectResult okObjectResult) - { - var valeur = okObjectResult.Value; +public class InquiryUnitTest +{ + private readonly Mock> _inquiryService; - Assert.NotNull(valeur); - Assert.Equal(GetInquiriesData().ToString(), valeur.ToString()); - Assert.True(inquiryList.SequenceEqual(valeur as IEnumerable, new InquiryIdEqualityComparer())); + public InquiryUnitTest() + { + _inquiryService = new Mock>(); + } - } + [Fact] + public void GetInquiriesListSuccess() + { + var inquiryList = GetInquiriesData(); + _inquiryService.Setup(x => x.GetInquiries(1, 4, 0)) + .Returns(inquiryList); + var inquiryController = new InquiriesController(_inquiryService.Object, new NullLogger()); - } + var inquiriesResult = inquiryController.GetInquiries(1, 4, 0); - [Fact] - public void GetInquiresListFail() + if (inquiriesResult is OkObjectResult okObjectResult) { - inquiryService.Setup(x => x.GetInquiries(1, 4, 0)) - .Returns(new List()); - var InquiryController = new InquiriesController(inquiryService.Object, new NullLogger()); - - var inquiriesResult = InquiryController.GetInquiries(2, 3, 0); - - if (inquiriesResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) - - { - - Assert.IsNotType(inquiriesResult); - } + var valeur = okObjectResult.Value; + Assert.NotNull(valeur); + Assert.Equal(GetInquiriesData().ToString(), valeur.ToString()); + Assert.True(inquiryList.SequenceEqual(valeur as IEnumerable, new InquiryIdEqualityComparer())); } + } + [Fact] + public void GetInquiresListFail() + { + _inquiryService.Setup(x => x.GetInquiries(1, 4, 0)) + .Returns(new List()); + var inquiryController = new InquiriesController(_inquiryService.Object, new NullLogger()); + var inquiriesResult = inquiryController.GetInquiries(2, 3, 0); - - - - [Fact] - public void GetInquiryIdSuccess() + if (inquiriesResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) { - var inquiryList = GetInquiriesData(); - inquiryService.Setup(x => x.GetInquiryById(1)) - .Returns(inquiryList[1]); - var InquiriesController = new InquiriesController(inquiryService.Object, new NullLogger() ); - - var inquiryResult = InquiriesController.GetInquiryById(1); - if (inquiryResult is OkObjectResult okObjectResult) - { - InquiryDto valeur = okObjectResult.Value as InquiryDto; - - Assert.NotNull(valeur); - Assert.Equal("titre 2", valeur.Title); - Assert.Equal("Description", valeur.Description); - Assert.True(valeur.IsUser); - Assert.Equal(valeur.GetHashCode(), inquiryList[1].GetHashCode()); - Assert.True(valeur.Equals(inquiryList[1])); - Assert.False(valeur.Equals(new object())); - Assert.IsType(valeur); - Assert.Contains(valeur, inquiryList); - } - + Assert.IsNotType(inquiriesResult); } + } - [Fact] - public void GetInquiryIdFail() + [Fact] + public void GetInquiryIdSuccess() + { + var inquiryList = GetInquiriesData(); + _inquiryService.Setup(x => x.GetInquiryById(1)) + .Returns(inquiryList[1]); + var inquiriesController = + new InquiriesController(_inquiryService.Object, new NullLogger()); + + var inquiryResult = inquiriesController.GetInquiryById(1); + if (inquiryResult is OkObjectResult okObjectResult) { - var inquiryList = GetInquiriesData(); - inquiryService.Setup(x => x.GetInquiryById(1)) - .Returns(inquiryList[1]); - var InquiriesController = new InquiriesController(inquiryService.Object,new NullLogger()); - - var inquiryResult = InquiriesController.GetInquiryById(100); - if (inquiryResult is NotFoundObjectResult NFObjectResult) - { - var valeur = NFObjectResult.Value; - - Assert.NotNull(valeur); - Assert.IsNotType(valeur); - Assert.DoesNotContain(valeur, inquiryList); - } - + InquiryDto valeur = okObjectResult.Value as InquiryDto; + + Assert.NotNull(valeur); + Assert.Equal("titre 2", valeur.Title); + Assert.Equal("Description", valeur.Description); + Assert.True(valeur.IsUser); + Assert.Equal(valeur.GetHashCode(), inquiryList[1].GetHashCode()); + Assert.True(valeur.Equals(inquiryList[1])); + Assert.False(valeur.Equals(new object())); + Assert.IsType(valeur); + Assert.Contains(valeur, inquiryList); } + } - - - [Fact] - public void GetInquiryTitleSuccess() + [Fact] + public void GetInquiryIdFail() + { + var inquiryList = GetInquiriesData(); + _inquiryService.Setup(x => x.GetInquiryById(1)) + .Returns(inquiryList[1]); + var inquiriesController = + new InquiriesController(_inquiryService.Object, new NullLogger()); + + var inquiryResult = inquiriesController.GetInquiryById(100); + if (inquiryResult is NotFoundObjectResult nfObjectResult) { - var inquiryList = GetInquiriesData(); - inquiryService.Setup(x => x.GetInquiryByTitle("ZUDZU")) - .Returns(inquiryList[2]); - var InquiriesController = new InquiriesController(inquiryService.Object,new NullLogger()); - - var inquiriesResult = InquiriesController.GetInquiryByTitle("ZUDZU"); - if (inquiriesResult is OkObjectResult okObjectResult) - { - InquiryDto valeur = okObjectResult.Value as InquiryDto; - - Assert.NotNull(valeur); - Assert.IsType(valeur); - Assert.Contains(valeur, inquiryList); - Assert.Equal("ZUDZU", valeur.Title); - Assert.Equal("OUHHHH", valeur.Description); - Assert.Equal(2, valeur.Id); - Assert.False(valeur.IsUser); - } + var valeur = nfObjectResult.Value; + Assert.NotNull(valeur); + Assert.IsNotType(valeur); + Assert.DoesNotContain(valeur, inquiryList); } + } - - [Fact] - public void GetInquiryTitleFail() + [Fact] + public void GetInquiryTitleSuccess() + { + var inquiryList = GetInquiriesData(); + _inquiryService.Setup(x => x.GetInquiryByTitle("ZUDZU")) + .Returns(inquiryList[2]); + var inquiriesController = + new InquiriesController(_inquiryService.Object, new NullLogger()); + + var inquiriesResult = inquiriesController.GetInquiryByTitle("ZUDZU"); + if (inquiriesResult is OkObjectResult okObjectResult) { - var inquiryList = GetInquiriesData(); - inquiryService.Setup(x => x.GetInquiryByTitle("ZUDZU")) - .Returns(inquiryList[2]); - var InquiriesController = new InquiriesController(inquiryService.Object, new NullLogger()); - - var inquiriesResult = InquiriesController.GetInquiryByTitle("GYIIieihhh"); - - if (inquiriesResult is NotFoundObjectResult NFObjectResult) - { - var valeur = NFObjectResult.Value; - - Assert.NotNull(valeur); - Assert.IsNotType(valeur); - Assert.DoesNotContain(valeur, inquiryList); - Assert.False(inquiryList == valeur); - } + InquiryDto valeur = okObjectResult.Value as InquiryDto; + + Assert.NotNull(valeur); + Assert.IsType(valeur); + Assert.Contains(valeur, inquiryList); + Assert.Equal("ZUDZU", valeur.Title); + Assert.Equal("OUHHHH", valeur.Description); + Assert.Equal(2, valeur.Id); + Assert.False(valeur.IsUser); } + } + [Fact] + public void GetInquiryTitleFail() + { + var inquiryList = GetInquiriesData(); + _inquiryService.Setup(x => x.GetInquiryByTitle("ZUDZU")) + .Returns(inquiryList[2]); + var inquiriesController = + new InquiriesController(_inquiryService.Object, new NullLogger()); + var inquiriesResult = inquiriesController.GetInquiryByTitle("GYIIieihhh"); + if (inquiriesResult is NotFoundObjectResult nfObjectResult) + { + var valeur = nfObjectResult.Value; + Assert.NotNull(valeur); + Assert.IsNotType(valeur); + Assert.DoesNotContain(valeur, inquiryList); + Assert.False(inquiryList == valeur); + } + } + [Fact] + public void DeleteInquirySuccess() + { + _inquiryService.Setup(x => x.DeleteInquiry(1)) + .Returns(true); + var inquiriesController = + new InquiriesController(_inquiryService.Object, new NullLogger()); - [Fact] - public void DeleteInquirySuccess() + var inquiryResult = inquiriesController.DeleteInquiry(1); + if (inquiryResult is OkObjectResult okObjectResult) { - inquiryService.Setup(x => x.DeleteInquiry(1)) - .Returns(true); - var inquiriesController = new InquiriesController(inquiryService.Object, new NullLogger()); - - var inquiryResult = inquiriesController.DeleteInquiry(1); - if (inquiryResult is OkObjectResult okObjectResult) - { - bool valeur = (bool)okObjectResult.Value; - - Assert.True(valeur); - } + bool valeur = (bool)okObjectResult.Value; + Assert.True(valeur); } + } + [Fact] + public void DeleteInquiryFail() + { + _inquiryService.Setup(x => x.DeleteInquiry(1)) + .Returns(true); + var inquiriesController = + new InquiriesController(_inquiryService.Object, new NullLogger()); - [Fact] - public void DeleteInquiryFail() + var inquiryResult = inquiriesController.DeleteInquiry(100); + if (inquiryResult is NotFoundObjectResult nfObjectResult) { - inquiryService.Setup(x => x.DeleteInquiry(1)) - .Returns(true); - var inquiriesController = new InquiriesController(inquiryService.Object, new NullLogger()); - - var inquiryResult = inquiriesController.DeleteInquiry(100); - if (inquiryResult is NotFoundObjectResult NFObjectResult) - { - Assert.Null(NFObjectResult.Value); - Assert.IsNotType(NFObjectResult.Value); - } + Assert.Null(nfObjectResult.Value); + Assert.IsNotType(nfObjectResult.Value); } + } + [Fact] + public void CreateInquirySuccess() + { + _inquiryService.Setup(x => x.CreateInquiry("Titros", "description", false)) + .Returns(new InquiryDto(4, "Titros", "description", false)); + var inquiriesController = + new InquiriesController(_inquiryService.Object, new NullLogger()); - [Fact] - public void CreateInquirySuccess() + var inquiriesResult = inquiriesController.CreateInquiry(new InquiryDto("Titros", "description", false)); + if (inquiriesResult is CreatedResult createdObjectResult) { - inquiryService.Setup(x => x.CreateInquiry("Titros","description",false)) - .Returns(new InquiryDto(4,"Titros","description",false)); - var InquiriesController = new InquiriesController( inquiryService.Object,new NullLogger()); - - var inquiriesResult = InquiriesController.CreateInquiry(new InquiryDto("Titros", "description", false)); - if (inquiriesResult is CreatedResult createdObjectResult) - { - InquiryDto valeur = createdObjectResult.Value as InquiryDto; - - Assert.NotNull(valeur); - Assert.Equal(4, valeur.Id); - Assert.Equal("Titros", valeur.Title); - Assert.Equal("description", valeur.Description); - Assert.False(valeur.IsUser); - } + InquiryDto valeur = createdObjectResult.Value as InquiryDto; + Assert.NotNull(valeur); + Assert.Equal(4, valeur.Id); + Assert.Equal("Titros", valeur.Title); + Assert.Equal("description", valeur.Description); + Assert.False(valeur.IsUser); } + } - [Fact] - public void CreateInquiryFail() - { - inquiryService.Setup(x => x.CreateInquiry("Titros", "description", false)) - .Returns(new InquiryDto(4, "Titros", "description", false)); - var InquiriesController = new InquiriesController(inquiryService.Object, new NullLogger()); - - var inquiriesResult = InquiriesController.CreateInquiry(new InquiryDto(4, null, "heudfk@hdye.com", true)); - - if (inquiriesResult is BadRequestResult BDObjectResult) - { - - Assert.Equal(400, BDObjectResult.StatusCode); - } - } + [Fact] + public void CreateInquiryFail() + { + _inquiryService.Setup(x => x.CreateInquiry("Titros", "description", false)) + .Returns(new InquiryDto(4, "Titros", "description", false)); + var inquiriesController = + new InquiriesController(_inquiryService.Object, new NullLogger()); + var inquiriesResult = inquiriesController.CreateInquiry(new InquiryDto(4, null, "heudfk@hdye.com", true)); - [Fact] - public void UpdateInquirySuccess() + if (inquiriesResult is BadRequestResult bdObjectResult) { - inquiryService.Setup(x => x.UpdateInquiry(1, new InquiryDto(1, "Passssss", "heudfk@hdye.com", true))) - .Returns(new InquiryDto(1, "Passssss", "heudfk@hdye.com", true)); - var InquiriesController = new InquiriesController(inquiryService.Object, new NullLogger()); - - var inquiriesResult = InquiriesController.UpdateInquiry(1, new InquiryDto(1, "Passssss", "heudfk@hdye.com", true)); - if (inquiriesResult is OkObjectResult okObjectResult) - { - InquiryDto valeur = okObjectResult.Value as InquiryDto; - - Assert.NotNull(valeur); - Assert.Equal("Passssss", valeur.Title); - Assert.Equal("heudfk@hdye.com", valeur.Description); - Assert.True(valeur.IsUser); - } - + Assert.Equal(400, bdObjectResult.StatusCode); } + } - [Fact] - public void UpdateInquiryFail() + [Fact] + public void UpdateInquirySuccess() + { + _inquiryService.Setup(x => x.UpdateInquiry(1, new InquiryDto(1, "Passssss", "heudfk@hdye.com", true))) + .Returns(new InquiryDto(1, "Passssss", "heudfk@hdye.com", true)); + var inquiriesController = + new InquiriesController(_inquiryService.Object, new NullLogger()); + + var inquiriesResult = + inquiriesController.UpdateInquiry(1, new InquiryDto(1, "Passssss", "heudfk@hdye.com", true)); + if (inquiriesResult is OkObjectResult okObjectResult) { - inquiryService.Setup(x => x.UpdateInquiry(1, new InquiryDto(1, "Passssss", "heudfk@hdye.com", true))) - .Returns(new InquiryDto(1, "Passssss", "heudfk@hdye.com", true)); - var InquiriesController = new InquiriesController(inquiryService.Object, new NullLogger()); - - var inquiriesResult = InquiriesController.UpdateInquiry(1, new InquiryDto(2, "Passssss", "heudfk@hdye.com", true)); + InquiryDto valeur = okObjectResult.Value as InquiryDto; - if (inquiriesResult is BadRequestResult BDObjectResult) - { - - Assert.Equal(400, BDObjectResult.StatusCode); - } + Assert.NotNull(valeur); + Assert.Equal("Passssss", valeur.Title); + Assert.Equal("heudfk@hdye.com", valeur.Description); + Assert.True(valeur.IsUser); } + } + [Fact] + public void UpdateInquiryFail() + { + _inquiryService.Setup(x => x.UpdateInquiry(1, new InquiryDto(1, "Passssss", "heudfk@hdye.com", true))) + .Returns(new InquiryDto(1, "Passssss", "heudfk@hdye.com", true)); + var inquiriesController = + new InquiriesController(_inquiryService.Object, new NullLogger()); + var inquiriesResult = + inquiriesController.UpdateInquiry(1, new InquiryDto(2, "Passssss", "heudfk@hdye.com", true)); - - - - - - - - private List GetInquiriesData() + if (inquiriesResult is BadRequestResult bdObjectResult) { - List inquiriesData = new List(4) - { - new (0,"titre 1","La desc",false), - new (1,"titre 2","Description",true), - new (2,"ZUDZU","OUHHHH",false), - new ("titre premium","Ascendant",true), - }; - return inquiriesData; + Assert.Equal(400, bdObjectResult.StatusCode); } + } + private List GetInquiriesData() + { + List inquiriesData = new List(4) + { + new(0, "titre 1", "La desc", false), + new(1, "titre 2", "Description", true), + new(2, "ZUDZU", "OUHHHH", false), + new("titre premium", "Ascendant", true), + }; + return inquiriesData; } -} +} \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/LessonUnitTest.cs b/API_SQLuedo/TestAPI/LessonUnitTest.cs index 3bdb345..bdf7c7e 100644 --- a/API_SQLuedo/TestAPI/LessonUnitTest.cs +++ b/API_SQLuedo/TestAPI/LessonUnitTest.cs @@ -4,312 +4,264 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging.Abstractions; using Moq; using Shared; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using TestAPI.Extensions; -namespace TestAPI -{ - public class LessonUnitTest - { - private readonly Mock> lessonService; - - public LessonUnitTest() - { - lessonService = new Mock>(); - } +namespace TestAPI; - [Fact] - public void GetLessonsListSuccess() - { - var lessonList = GetLessonsData(); - lessonService.Setup(x => x.GetLessons(1, 4, 0)) - .Returns(lessonList); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - - var lessonsResult = LessonsController.GetLessons(1, 4, 0); - - if (lessonsResult is OkObjectResult okObjectResult) - { - var valeur = okObjectResult.Value; +public class LessonUnitTest +{ + private readonly Mock> _lessonService; - Assert.NotNull(valeur); - Assert.Equal(GetLessonsData().ToString(), valeur.ToString()); - Assert.True(lessonList.SequenceEqual(valeur as IEnumerable, new LessonIdEqualityComparer())); + public LessonUnitTest() + { + _lessonService = new Mock>(); + } - } + [Fact] + public void GetLessonsListSuccess() + { + var lessonList = GetLessonsData(); + _lessonService.Setup(x => x.GetLessons(1, 4, 0)) + .Returns(lessonList); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); - } + var lessonsResult = lessonsController.GetLessons(1, 4, 0); - [Fact] - public void GetLessonsListFail() + if (lessonsResult is OkObjectResult okObjectResult) { - lessonService.Setup(x => x.GetLessons(1, 4, 0)) - .Returns(new List()); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - - var lessonsResult = LessonsController.GetLessons(2, 3, 0); - - if (lessonsResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) - - { - - Assert.IsNotType(lessonsResult); - } + var valeur = okObjectResult.Value; + Assert.NotNull(valeur); + Assert.Equal(GetLessonsData().ToString(), valeur.ToString()); + Assert.True(lessonList.SequenceEqual(valeur as IEnumerable, new LessonIdEqualityComparer())); } + } + [Fact] + public void GetLessonsListFail() + { + _lessonService.Setup(x => x.GetLessons(1, 4, 0)) + .Returns(new List()); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); - [Fact] - public void GetLessonIdSuccess() - { - var lessonList = GetLessonsData(); - lessonService.Setup(x => x.GetLessonById(1)) - .Returns(lessonList[0]); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - - var lessonsResult = LessonsController.GetLessonById(1); - if (lessonsResult is OkObjectResult okObjectResult) - { - LessonDto valeur = okObjectResult.Value as LessonDto; - - Assert.NotNull(valeur); - Assert.Equal("Le titre", valeur.Title); - Assert.Equal("Clément", valeur.LastPublisher); - Assert.Equal(new DateOnly(2024, 03, 10), valeur.LastEdit); - Assert.NotEqual(2, valeur.Id); - - - Assert.Equal(valeur.GetHashCode(), lessonList[0].GetHashCode()); - Assert.True(valeur.Equals(lessonList[0])); - Assert.False(valeur.Equals(new object())); - Assert.True(valeur.Equals(valeur)); - Assert.IsType(valeur); - Assert.Contains(valeur, lessonList); - } + var lessonsResult = lessonsController.GetLessons(2, 3, 0); - } + if (lessonsResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) - [Fact] - public void GetLessonIdFail() { - var lessonList = GetLessonsData(); - lessonService.Setup(x => x.GetLessonById(1)) - .Returns(lessonList[0]); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - - var lessonsResult = LessonsController.GetLessonById(100); - if (lessonsResult is NotFoundObjectResult NFObjectResult) - { - var valeur = NFObjectResult.Value; - - Assert.NotNull(valeur); - Assert.IsNotType(valeur); - Assert.DoesNotContain(valeur, lessonList); - } - + Assert.IsNotType(lessonsResult); } + } + [Fact] + public void GetLessonIdSuccess() + { + var lessonList = GetLessonsData(); + _lessonService.Setup(x => x.GetLessonById(1)) + .Returns(lessonList[0]); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); - [Fact] - public void GetLessonTitleSuccess() + var lessonsResult = lessonsController.GetLessonById(1); + if (lessonsResult is OkObjectResult okObjectResult) { - var lessonList = GetLessonsData(); - lessonService.Setup(x => x.GetLessonByTitle("Chiant la")) - .Returns(lessonList[2]); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - - var lessonsResult = LessonsController.GetLessonByTitle("Chiant la"); - if (lessonsResult is OkObjectResult okObjectResult) - { - LessonDto valeur = okObjectResult.Value as LessonDto; - - Assert.NotNull(valeur); - Assert.Equal("Chiant la", valeur.Title); - Assert.Equal("Une personne", valeur.LastPublisher); - Assert.Equal(new DateOnly(2012, 12, 25), valeur.LastEdit); - Assert.Equal(3, valeur.Id); - Assert.IsType(valeur); - Assert.Contains(valeur, lessonList); - } + LessonDto valeur = okObjectResult.Value as LessonDto; - } + Assert.NotNull(valeur); + Assert.Equal("Le titre", valeur.Title); + Assert.Equal("Clément", valeur.LastPublisher); + Assert.Equal(new DateOnly(2024, 03, 10), valeur.LastEdit); + Assert.NotEqual(2, valeur.Id); - [Fact] - public void GetLessonTitleFail() - { - var lessonList = GetLessonsData(); - lessonService.Setup(x => x.GetLessonByTitle("Chiant la")) - .Returns(lessonList[2]); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - - var lessonsResult = LessonsController.GetLessonByTitle("IUHIUHU"); - - if (lessonsResult is NotFoundObjectResult NFObjectResult) - { - var valeur = NFObjectResult.Value; - - Assert.NotNull(valeur); - Assert.IsNotType(valeur); - Assert.DoesNotContain(valeur, lessonList); - Assert.False(lessonList == valeur); - } + Assert.Equal(valeur.GetHashCode(), lessonList[0].GetHashCode()); + Assert.True(valeur.Equals(lessonList[0])); + Assert.False(valeur.Equals(new object())); + Assert.True(valeur.Equals(valeur)); + Assert.IsType(valeur); + Assert.Contains(valeur, lessonList); } + } + [Fact] + public void GetLessonIdFail() + { + var lessonList = GetLessonsData(); + _lessonService.Setup(x => x.GetLessonById(1)) + .Returns(lessonList[0]); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); - [Fact] - public void DeleteLessonSuccess() + var lessonsResult = lessonsController.GetLessonById(100); + if (lessonsResult is NotFoundObjectResult nfObjectResult) { - lessonService.Setup(x => x.DeleteLesson(1)) - .Returns(true); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - - var lessonsResult = LessonsController.DeleteLesson(1); - if (lessonsResult is OkObjectResult okObjectResult) - { - bool valeur = (bool)okObjectResult.Value; - - Assert.True(valeur); - } + var valeur = nfObjectResult.Value; + Assert.NotNull(valeur); + Assert.IsNotType(valeur); + Assert.DoesNotContain(valeur, lessonList); } + } + [Fact] + public void GetLessonTitleSuccess() + { + var lessonList = GetLessonsData(); + _lessonService.Setup(x => x.GetLessonByTitle("Chiant la")) + .Returns(lessonList[2]); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); - [Fact] - public void DeleteLessonFail() + var lessonsResult = lessonsController.GetLessonByTitle("Chiant la"); + if (lessonsResult is OkObjectResult okObjectResult) { - lessonService.Setup(x => x.DeleteLesson(1)) - .Returns(true); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - - var lessonsResult = LessonsController.DeleteLesson(100); - if (lessonsResult is NotFoundObjectResult NFObjectResult) - { - Assert.Null(NFObjectResult.Value); - Assert.IsNotType(NFObjectResult.Value); - } + LessonDto valeur = okObjectResult.Value as LessonDto; + + Assert.NotNull(valeur); + Assert.Equal("Chiant la", valeur.Title); + Assert.Equal("Une personne", valeur.LastPublisher); + Assert.Equal(new DateOnly(2012, 12, 25), valeur.LastEdit); + Assert.Equal(3, valeur.Id); + Assert.IsType(valeur); + Assert.Contains(valeur, lessonList); } + } - [Fact] - public void CreateLessonSuccess() - { - lessonService.Setup(x => x.CreateLesson("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024,03,16))) - .Returns(new LessonDto("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); + [Fact] + public void GetLessonTitleFail() + { + var lessonList = GetLessonsData(); + _lessonService.Setup(x => x.GetLessonByTitle("Chiant la")) + .Returns(lessonList[2]); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); - var lessonsResult = LessonsController.CreateLesson(new LessonDto("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))); - if (lessonsResult is CreatedResult createdObjectResult) - { - LessonDto valeur = createdObjectResult.Value as LessonDto; + var lessonsResult = lessonsController.GetLessonByTitle("IUHIUHU"); - Assert.NotNull(valeur); - Assert.Equal("Le nouveau titre", valeur.Title); - Assert.Equal("Le nouvel éditeur", valeur.LastPublisher); - Assert.Equal(new DateOnly(2024, 03, 16), valeur.LastEdit); - } + if (lessonsResult is NotFoundObjectResult nfObjectResult) + { + var valeur = nfObjectResult.Value; + Assert.NotNull(valeur); + Assert.IsNotType(valeur); + Assert.DoesNotContain(valeur, lessonList); + Assert.False(lessonList == valeur); } + } - [Fact] - public void CreateLessonFail() - { - lessonService.Setup(x => x.CreateLesson("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))) - .Returns(new LessonDto("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - - var lessonsResult = LessonsController.CreateLesson(new LessonDto(null, "Le nouvel éditeur", new DateOnly(2024, 03, 16))); + [Fact] + public void DeleteLessonSuccess() + { + _lessonService.Setup(x => x.DeleteLesson(1)) + .Returns(true); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); - if (lessonsResult is BadRequestResult BDObjectResult) - { + var lessonsResult = lessonsController.DeleteLesson(1); + if (lessonsResult is OkObjectResult okObjectResult) + { + bool valeur = (bool)okObjectResult.Value; - Assert.Equal(400, BDObjectResult.StatusCode); - } + Assert.True(valeur); } + } + [Fact] + public void DeleteLessonFail() + { + _lessonService.Setup(x => x.DeleteLesson(1)) + .Returns(true); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); - [Fact] - public void UpdateLessonSuccess() + var lessonsResult = lessonsController.DeleteLesson(100); + if (lessonsResult is NotFoundObjectResult nfObjectResult) { - lessonService.Setup(x => x.UpdateLesson(1,new LessonDto(1,"Titre update","Le dernier publisher",new DateOnly(2022,02,02)))) - .Returns(new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - - var lessonsResult = LessonsController.UpdateLesson(1, new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); - if (lessonsResult is OkObjectResult okObjectResult) - { - LessonDto valeur = okObjectResult.Value as LessonDto; - - Assert.NotNull(valeur); - Assert.Equal("Titre update", valeur.Title); - Assert.Equal("Le dernier publisher", valeur.LastPublisher); - Assert.Equal(new DateOnly(2022, 02, 02), valeur.LastEdit); - Assert.Equal(1, valeur.Id); - } - + Assert.Null(nfObjectResult.Value); + Assert.IsNotType(nfObjectResult.Value); } + } - [Fact] - public void UpdateLessonFail() + [Fact] + public void CreateLessonSuccess() + { + _lessonService.Setup(x => x.CreateLesson("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))) + .Returns(new LessonDto("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); + + var lessonsResult = + lessonsController.CreateLesson(new LessonDto("Le nouveau titre", "Le nouvel éditeur", + new DateOnly(2024, 03, 16))); + if (lessonsResult is CreatedResult createdObjectResult) { - lessonService.Setup(x => x.UpdateLesson(1, new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02)))) - .Returns(new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); - var LessonsController = new LessonsController(lessonService.Object, new NullLogger()); - - var lessonsResult = LessonsController.UpdateLesson(1, new LessonDto(2, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); + LessonDto valeur = createdObjectResult.Value as LessonDto; - if (lessonsResult is BadRequestResult BDObjectResult) - { - - Assert.Equal(400, BDObjectResult.StatusCode); - } + Assert.NotNull(valeur); + Assert.Equal("Le nouveau titre", valeur.Title); + Assert.Equal("Le nouvel éditeur", valeur.LastPublisher); + Assert.Equal(new DateOnly(2024, 03, 16), valeur.LastEdit); } + } + [Fact] + public void CreateLessonFail() + { + _lessonService.Setup(x => x.CreateLesson("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))) + .Returns(new LessonDto("Le nouveau titre", "Le nouvel éditeur", new DateOnly(2024, 03, 16))); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); + var lessonsResult = + lessonsController.CreateLesson(new LessonDto(null, "Le nouvel éditeur", new DateOnly(2024, 03, 16))); + if (lessonsResult is BadRequestResult bdObjectResult) + { + Assert.Equal(400, bdObjectResult.StatusCode); + } + } + [Fact] + public void UpdateLessonSuccess() + { + _lessonService.Setup(x => + x.UpdateLesson(1, new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02)))) + .Returns(new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); + + var lessonsResult = lessonsController.UpdateLesson(1, + new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); + if (lessonsResult is OkObjectResult okObjectResult) + { + LessonDto valeur = okObjectResult.Value as LessonDto; + Assert.NotNull(valeur); + Assert.Equal("Titre update", valeur.Title); + Assert.Equal("Le dernier publisher", valeur.LastPublisher); + Assert.Equal(new DateOnly(2022, 02, 02), valeur.LastEdit); + Assert.Equal(1, valeur.Id); + } + } + [Fact] + public void UpdateLessonFail() + { + _lessonService.Setup(x => + x.UpdateLesson(1, new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02)))) + .Returns(new LessonDto(1, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); + var lessonsController = new LessonsController(_lessonService.Object, new NullLogger()); + var lessonsResult = lessonsController.UpdateLesson(1, + new LessonDto(2, "Titre update", "Le dernier publisher", new DateOnly(2022, 02, 02))); - - - - - - - - - - - - - - - - - - - - - - - private List GetLessonsData() + if (lessonsResult is BadRequestResult bdObjectResult) { - List lessonsData = new List(4) - { - new (1,"Le titre", "Clément",new DateOnly(2024,03,10)), - new (2,"Pas titre", "Erwan",new DateOnly(2024,02,11)), - new (3,"Chiant la", "Une personne",new DateOnly(2012,12,25)), - new ("Les fleurs du mal", "Baudelaire",new DateOnly(1872,10,01)), - }; - return lessonsData; + Assert.Equal(400, bdObjectResult.StatusCode); } + } - + private List GetLessonsData() + { + List lessonsData = new List(4) + { + new(1, "Le titre", "Clément", new DateOnly(2024, 03, 10)), + new(2, "Pas titre", "Erwan", new DateOnly(2024, 02, 11)), + new(3, "Chiant la", "Une personne", new DateOnly(2012, 12, 25)), + new("Les fleurs du mal", "Baudelaire", new DateOnly(1872, 10, 01)), + }; + return lessonsData; } } \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/ParagraphsUnitTest.cs b/API_SQLuedo/TestAPI/ParagraphsUnitTest.cs index ec16679..a7b5438 100644 --- a/API_SQLuedo/TestAPI/ParagraphsUnitTest.cs +++ b/API_SQLuedo/TestAPI/ParagraphsUnitTest.cs @@ -4,298 +4,297 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging.Abstractions; using Moq; using Shared; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using TestAPI.Extensions; -namespace TestAPI -{ - public class ParagraphsUnitTest - - { - private readonly Mock> paragraphService; +namespace TestAPI; - public ParagraphsUnitTest() - { - paragraphService = new Mock>(); - } +public class ParagraphsUnitTest - [Fact] - public void GetParagraphsListSuccess() - { - var paragraphsList = GetParagraphsData(); - paragraphService.Setup(x => x.GetParagraphs(1, 4, 0)) - .Returns(paragraphsList); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.GetParagraphs(1, 4, 0); - - if (paragraphsResult is OkObjectResult okObjectResult) - { - var valeur = okObjectResult.Value; +{ + private readonly Mock> _paragraphService; - Assert.NotNull(valeur); - Assert.Equal(GetParagraphsData().ToString(), valeur.ToString()); - Assert.True(paragraphsList.SequenceEqual(valeur as IEnumerable, new ParagraphIdEqualityComparer())); + public ParagraphsUnitTest() + { + _paragraphService = new Mock>(); + } - } + [Fact] + public void GetParagraphsListSuccess() + { + var paragraphsList = GetParagraphsData(); + _paragraphService.Setup(x => x.GetParagraphs(1, 4, 0)) + .Returns(paragraphsList); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); - } + var paragraphsResult = paragraphsController.GetParagraphs(1, 4, 0); - [Fact] - public void GetParagraphsListFail() + if (paragraphsResult is OkObjectResult okObjectResult) { - paragraphService.Setup(x => x.GetParagraphs(1, 4, 0)) - .Returns(new List()); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.GetParagraphs(1, 4, 0); - - if (paragraphsResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) - - { - - Assert.IsNotType(paragraphsResult); - } + var valeur = okObjectResult.Value; + Assert.NotNull(valeur); + Assert.Equal(GetParagraphsData().ToString(), valeur.ToString()); + Assert.True(paragraphsList.SequenceEqual(valeur as IEnumerable, + new ParagraphIdEqualityComparer())); } + } + [Fact] + public void GetParagraphsListFail() + { + _paragraphService.Setup(x => x.GetParagraphs(1, 4, 0)) + .Returns(new List()); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); + var paragraphsResult = paragraphsController.GetParagraphs(1, 4, 0); - [Fact] - public void GetParagraphIdSuccess() - { - var paragraphsList = GetParagraphsData(); - paragraphService.Setup(x => x.GetParagraphById(1)) - .Returns(paragraphsList[1]); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.GetParagraphById(1); - if (paragraphsResult is OkObjectResult okObjectResult) - { - ParagraphDto valeur = okObjectResult.Value as ParagraphDto; - - Assert.NotNull(valeur); - Assert.Equal("Le titre", valeur.Title); - Assert.Equal("pas contenu", valeur.Content); - Assert.Equal("Pas d'infos ici", valeur.Info); - Assert.Equal("Delete * from Earth", valeur.Query); - Assert.Equal("Miam", valeur.Comment); - Assert.Equal(2, valeur.LessonId); - - - Assert.Equal(valeur.GetHashCode(), paragraphsList[1].GetHashCode()); - Assert.True(valeur.Equals(paragraphsList[1])); - Assert.False(valeur.Equals(new object())); - Assert.True(valeur.Equals(valeur)); - Assert.IsType(valeur); - Assert.Contains(valeur, paragraphsList); - } + if (paragraphsResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) + { + Assert.IsNotType(paragraphsResult); } + } - [Fact] - public void GetParagraphIdFail() + [Fact] + public void GetParagraphIdSuccess() + { + var paragraphsList = GetParagraphsData(); + _paragraphService.Setup(x => x.GetParagraphById(1)) + .Returns(paragraphsList[1]); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); + + var paragraphsResult = paragraphsController.GetParagraphById(1); + if (paragraphsResult is OkObjectResult okObjectResult) { - var paragraphsList = GetParagraphsData(); - paragraphService.Setup(x => x.GetParagraphById(1)) - .Returns(paragraphsList[1]); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.GetParagraphById(100); - if (paragraphsResult is NotFoundObjectResult NFObjectResult) - { - var valeur = NFObjectResult.Value; - - Assert.NotNull(valeur); - Assert.IsNotType(valeur); - Assert.DoesNotContain(valeur, paragraphsList); - } - + ParagraphDto valeur = okObjectResult.Value as ParagraphDto; + + Assert.NotNull(valeur); + Assert.Equal("Le titre", valeur.Title); + Assert.Equal("pas contenu", valeur.Content); + Assert.Equal("Pas d'infos ici", valeur.Info); + Assert.Equal("Delete * from Earth", valeur.Query); + Assert.Equal("Miam", valeur.Comment); + Assert.Equal(2, valeur.LessonId); + + + Assert.Equal(valeur.GetHashCode(), paragraphsList[1].GetHashCode()); + Assert.True(valeur.Equals(paragraphsList[1])); + Assert.False(valeur.Equals(new object())); + Assert.True(valeur.Equals(valeur)); + Assert.IsType(valeur); + Assert.Contains(valeur, paragraphsList); } + } - - [Fact] - public void GetParagraphTitleSuccess() + [Fact] + public void GetParagraphIdFail() + { + var paragraphsList = GetParagraphsData(); + _paragraphService.Setup(x => x.GetParagraphById(1)) + .Returns(paragraphsList[1]); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); + + var paragraphsResult = paragraphsController.GetParagraphById(100); + if (paragraphsResult is NotFoundObjectResult nfObjectResult) { - var paragraphsList = GetParagraphsData(); - paragraphService.Setup(x => x.GetParagraphByTitle("Title")) - .Returns(paragraphsList[3]); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.GetParagraphByTitle("Title"); - if (paragraphsResult is OkObjectResult okObjectResult) - { - ParagraphDto valeur = okObjectResult.Value as ParagraphDto; - - Assert.NotNull(valeur); - Assert.Equal("Title", valeur.Title); - Assert.Equal("Content", valeur.Content); - Assert.Equal("Je ne parle pas anglais", valeur.Info); - Assert.Equal("Select select from select", valeur.Query); - Assert.Equal("Mais qui est ce commentaire", valeur.Comment); - Assert.Equal(3, valeur.LessonId); - Assert.IsType(valeur); - Assert.Contains(valeur, paragraphsList); - } + var valeur = nfObjectResult.Value; + Assert.NotNull(valeur); + Assert.IsNotType(valeur); + Assert.DoesNotContain(valeur, paragraphsList); } + } - - [Fact] - public void GetParagraphTitleFail() + [Fact] + public void GetParagraphTitleSuccess() + { + var paragraphsList = GetParagraphsData(); + _paragraphService.Setup(x => x.GetParagraphByTitle("Title")) + .Returns(paragraphsList[3]); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); + + var paragraphsResult = paragraphsController.GetParagraphByTitle("Title"); + if (paragraphsResult is OkObjectResult okObjectResult) { - var paragraphsList = GetParagraphsData(); - paragraphService.Setup(x => x.GetParagraphByTitle("Title")) - .Returns(paragraphsList[3]); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.GetParagraphByTitle("IUHIUHU"); - - if (paragraphsResult is NotFoundObjectResult NFObjectResult) - { - var valeur = NFObjectResult.Value; - - Assert.NotNull(valeur); - Assert.IsNotType(valeur); - Assert.DoesNotContain(valeur, paragraphsList); - Assert.False(paragraphsList == valeur); - } + ParagraphDto valeur = okObjectResult.Value as ParagraphDto; + + Assert.NotNull(valeur); + Assert.Equal("Title", valeur.Title); + Assert.Equal("Content", valeur.Content); + Assert.Equal("Je ne parle pas anglais", valeur.Info); + Assert.Equal("Select select from select", valeur.Query); + Assert.Equal("Mais qui est ce commentaire", valeur.Comment); + Assert.Equal(3, valeur.LessonId); + Assert.IsType(valeur); + Assert.Contains(valeur, paragraphsList); } + } + [Fact] + public void GetParagraphTitleFail() + { + var paragraphsList = GetParagraphsData(); + _paragraphService.Setup(x => x.GetParagraphByTitle("Title")) + .Returns(paragraphsList[3]); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); - [Fact] - public void DeleteParagraphSuccess() - { - paragraphService.Setup(x => x.DeleteParagraph(1)) - .Returns(true); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.DeleteParagraph(1); - if (paragraphsResult is OkObjectResult okObjectResult) - { - bool valeur = (bool)okObjectResult.Value; + var paragraphsResult = paragraphsController.GetParagraphByTitle("IUHIUHU"); - Assert.True(valeur); - } + if (paragraphsResult is NotFoundObjectResult nfObjectResult) + { + var valeur = nfObjectResult.Value; + Assert.NotNull(valeur); + Assert.IsNotType(valeur); + Assert.DoesNotContain(valeur, paragraphsList); + Assert.False(paragraphsList == valeur); } + } + [Fact] + public void DeleteParagraphSuccess() + { + _paragraphService.Setup(x => x.DeleteParagraph(1)) + .Returns(true); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); - [Fact] - public void DeleteParagraphFail() + var paragraphsResult = paragraphsController.DeleteParagraph(1); + if (paragraphsResult is OkObjectResult okObjectResult) { - paragraphService.Setup(x => x.DeleteParagraph(1)) - .Returns(true); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.DeleteParagraph(100); - if (paragraphsResult is NotFoundObjectResult NFObjectResult) - { - Assert.Null(NFObjectResult.Value); - Assert.IsNotType(NFObjectResult.Value); - } + bool valeur = (bool)okObjectResult.Value; + + Assert.True(valeur); } + } + [Fact] + public void DeleteParagraphFail() + { + _paragraphService.Setup(x => x.DeleteParagraph(1)) + .Returns(true); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); - [Fact] - public void CreateParagraphSuccess() + var paragraphsResult = paragraphsController.DeleteParagraph(100); + if (paragraphsResult is NotFoundObjectResult nfObjectResult) { - paragraphService.Setup(x => x.CreateParagraph("Le nouveau titre","Le nouveau content","Les infos","La requête requêtante","Commentaires",2)) - .Returns(new ParagraphDto("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.CreateParagraph(new ParagraphDto("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); - if (paragraphsResult is CreatedResult createdObjectResult) - { - ParagraphDto valeur = createdObjectResult.Value as ParagraphDto; - - Assert.NotNull(valeur); - Assert.Equal("Le nouveau titre", valeur.Title); - Assert.Equal("Le nouveau content", valeur.Content); - Assert.Equal("Les infos", valeur.Info); - Assert.Equal("La requête requêtante", valeur.Query); - Assert.Equal("Commentaires", valeur.Comment); - Assert.Equal(2, valeur.LessonId); - } - + Assert.Null(nfObjectResult.Value); + Assert.IsNotType(nfObjectResult.Value); } + } - [Fact] - public void CreateParagraphFail() + [Fact] + public void CreateParagraphSuccess() + { + _paragraphService.Setup(x => x.CreateParagraph("Le nouveau titre", "Le nouveau content", "Les infos", + "La requête requêtante", "Commentaires", 2)) + .Returns(new ParagraphDto("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", + "Commentaires", 2)); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); + + var paragraphsResult = paragraphsController.CreateParagraph(new ParagraphDto("Le nouveau titre", + "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); + if (paragraphsResult is CreatedResult createdObjectResult) { - paragraphService.Setup(x => x.CreateParagraph("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)) - .Returns(new ParagraphDto("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.CreateParagraph(new ParagraphDto(null, "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); - - if (paragraphsResult is BadRequestResult BDObjectResult) - { - - Assert.Equal(400, BDObjectResult.StatusCode); - } + ParagraphDto valeur = createdObjectResult.Value as ParagraphDto; + + Assert.NotNull(valeur); + Assert.Equal("Le nouveau titre", valeur.Title); + Assert.Equal("Le nouveau content", valeur.Content); + Assert.Equal("Les infos", valeur.Info); + Assert.Equal("La requête requêtante", valeur.Query); + Assert.Equal("Commentaires", valeur.Comment); + Assert.Equal(2, valeur.LessonId); } + } + [Fact] + public void CreateParagraphFail() + { + _paragraphService.Setup(x => x.CreateParagraph("Le nouveau titre", "Le nouveau content", "Les infos", + "La requête requêtante", "Commentaires", 2)) + .Returns(new ParagraphDto("Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", + "Commentaires", 2)); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); - [Fact] - public void UpdateParagraphSuccess() - { - paragraphService.Setup(x => x.UpdateParagraph(1,new ParagraphDto(1,"Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2))) - .Returns(new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.UpdateParagraph(1, new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); - if (paragraphsResult is OkObjectResult okObjectResult) - { - ParagraphDto valeur = okObjectResult.Value as ParagraphDto; - - Assert.NotNull(valeur); - Assert.Equal("Le nouveau titre", valeur.Title); - Assert.Equal("Le nouveau content", valeur.Content); - Assert.Equal("Les infos", valeur.Info); - Assert.Equal("La requête requêtante", valeur.Query); - Assert.Equal("Commentaires", valeur.Comment); - Assert.Equal(2, valeur.LessonId); - } + var paragraphsResult = paragraphsController.CreateParagraph(new ParagraphDto(null, "Le nouveau content", + "Les infos", "La requête requêtante", "Commentaires", 2)); + if (paragraphsResult is BadRequestResult bdObjectResult) + { + Assert.Equal(400, bdObjectResult.StatusCode); } + } - [Fact] - public void UpdateParagraphFail() + [Fact] + public void UpdateParagraphSuccess() + { + _paragraphService.Setup(x => x.UpdateParagraph(1, + new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", + "Commentaires", 2))) + .Returns(new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", + "Commentaires", 2)); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); + + var paragraphsResult = paragraphsController.UpdateParagraph(1, + new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", + "Commentaires", 2)); + if (paragraphsResult is OkObjectResult okObjectResult) { - paragraphService.Setup(x => x.UpdateParagraph(1, new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2))) - .Returns(new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); - var ParagraphsController = new ParagraphsController(paragraphService.Object, new NullLogger()); - - var paragraphsResult = ParagraphsController.UpdateParagraph(1, new ParagraphDto(2, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", "Commentaires", 2)); - - if (paragraphsResult is BadRequestResult BDObjectResult) - { + ParagraphDto valeur = okObjectResult.Value as ParagraphDto; + + Assert.NotNull(valeur); + Assert.Equal("Le nouveau titre", valeur.Title); + Assert.Equal("Le nouveau content", valeur.Content); + Assert.Equal("Les infos", valeur.Info); + Assert.Equal("La requête requêtante", valeur.Query); + Assert.Equal("Commentaires", valeur.Comment); + Assert.Equal(2, valeur.LessonId); + } + } - Assert.Equal(400, BDObjectResult.StatusCode); - } - } - private List GetParagraphsData() + [Fact] + public void UpdateParagraphFail() + { + _paragraphService.Setup(x => x.UpdateParagraph(1, + new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", + "Commentaires", 2))) + .Returns(new ParagraphDto(1, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", + "Commentaires", 2)); + var paragraphsController = + new ParagraphsController(_paragraphService.Object, new NullLogger()); + + var paragraphsResult = paragraphsController.UpdateParagraph(1, + new ParagraphDto(2, "Le nouveau titre", "Le nouveau content", "Les infos", "La requête requêtante", + "Commentaires", 2)); + + if (paragraphsResult is BadRequestResult bdObjectResult) { - List paragraphsData = new List(4) - { - new (0,"Titre 1","Le contenu","Les infos de ce paragraphes sont ","Select * from C#","Le commentaire",1), - new (1,"Le titre","pas contenu","Pas d'infos ici","Delete * from Earth","Miam",2), - new (2,"Ceci n'est pas un titre","Certainement hmmm","OUOOOOO ","Autocommit = {true}","First",1), - new ("Title","Content","Je ne parle pas anglais","Select select from select","Mais qui est ce commentaire",3), - - - }; - return paragraphsData; + Assert.Equal(400, bdObjectResult.StatusCode); } - } - - -} - + private List GetParagraphsData() + { + List paragraphsData = new List(4) + { + new(0, "Titre 1", "Le contenu", "Les infos de ce paragraphes sont ", "Select * from C#", "Le commentaire", + 1), + new(1, "Le titre", "pas contenu", "Pas d'infos ici", "Delete * from Earth", "Miam", 2), + new(2, "Ceci n'est pas un titre", "Certainement hmmm", "OUOOOOO ", "Autocommit = {true}", "First", 1), + new("Title", "Content", "Je ne parle pas anglais", "Select select from select", + "Mais qui est ce commentaire", 3), + }; + return paragraphsData; + } +} \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/SuccessesUnitTest.cs b/API_SQLuedo/TestAPI/SuccessesUnitTest.cs index 553ddc4..8ad235a 100644 --- a/API_SQLuedo/TestAPI/SuccessesUnitTest.cs +++ b/API_SQLuedo/TestAPI/SuccessesUnitTest.cs @@ -4,293 +4,275 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging.Abstractions; using Moq; using Shared; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using TestAPI.Extensions; -namespace TestAPI -{ - public class SuccessesUnitTest - { - private readonly Mock> successService; - public SuccessesUnitTest() - { - successService = new Mock>(); - } - +namespace TestAPI; - [Fact] - public void GetSuccessesListSuccess() - { - var successesList = GetSuccessesData(); - successService.Setup(x => x.GetSuccesses(1, 4, 0)) - .Returns(successesList); - var successesController = new SuccessesController(successService.Object, new NullLogger()); - - var successesResult = successesController.GetSuccesses(1, 4, 0); - - if (successesResult is OkObjectResult okObjectResult) - { - var valeur = okObjectResult.Value; +public class SuccessesUnitTest +{ + private readonly Mock> _successService; - Assert.NotNull(valeur); - Assert.Equal(GetSuccessesData().ToString(), valeur.ToString()); - Assert.True(successesList.SequenceEqual(valeur as IEnumerable, new SuccessIdEqualityComparer())); + public SuccessesUnitTest() + { + _successService = new Mock>(); + } - } + [Fact] + public void GetSuccessesListSuccess() + { + var successesList = GetSuccessesData(); + _successService.Setup(x => x.GetSuccesses(1, 4, 0)) + .Returns(successesList); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); - } + var successesResult = successesController.GetSuccesses(1, 4, 0); - [Fact] - public void GetSuccessesListFail() + if (successesResult is OkObjectResult okObjectResult) { - successService.Setup(x => x.GetSuccesses(1, 4, 0)) - .Returns(new List()); - var successesController = new SuccessesController(successService.Object, new NullLogger()); + var valeur = okObjectResult.Value; - var successesResult = successesController.GetSuccesses(2, 3, 0); - - if (successesResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) + Assert.NotNull(valeur); + Assert.Equal(GetSuccessesData().ToString(), valeur.ToString()); + Assert.True(successesList.SequenceEqual(valeur as IEnumerable, + new SuccessIdEqualityComparer())); + } + } - { + [Fact] + public void GetSuccessesListFail() + { + _successService.Setup(x => x.GetSuccesses(1, 4, 0)) + .Returns(new List()); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); - Assert.IsNotType(successesResult); - } + var successesResult = successesController.GetSuccesses(2, 3, 0); + if (successesResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) + { + Assert.IsNotType(successesResult); } + } - - [Fact] - public void GetSuccessInquiryIdSuccess() + [Fact] + public void GetSuccessInquiryIdSuccess() + { + var successesList = GetSuccessesData(); + _successService.Setup(x => x.GetSuccessesByInquiryId(1)) + .Returns(new List { successesList[0], successesList[1] }); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); + + var sucessesResult = successesController.GetSuccessByInquiryId(1); + if (sucessesResult is OkObjectResult okObjectResult) { - var successesList = GetSuccessesData(); - successService.Setup(x => x.GetSuccessesByInquiryId(1)) - .Returns(new List { successesList[0], successesList[1] }); - var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - - var sucessesResult = SuccessesController.GetSuccessByInquiryId(1); - if (sucessesResult is OkObjectResult okObjectResult) - { - List valeur = okObjectResult.Value as List; - - Assert.NotNull(valeur); - Assert.Equal(0, valeur[0].UserId); - Assert.Equal(1, valeur[0].InquiryId); - Assert.True(valeur[0].IsFinished); - Assert.Equal(1, valeur[1].UserId); - Assert.Equal(1, valeur[1].InquiryId); - Assert.True(valeur[1].IsFinished); - - - Assert.Equal(valeur[1].GetHashCode(), successesList[1].GetHashCode()); - Assert.True(valeur[1].Equals(successesList[1])); - Assert.False(valeur.Equals(new object())); - Assert.False(valeur.Equals(null)); - Assert.True(valeur.Equals(valeur)); - Assert.IsType(valeur[0]); - Assert.Contains(valeur[1], successesList); - } - + List valeur = okObjectResult.Value as List; + + Assert.NotNull(valeur); + Assert.Equal(0, valeur[0].UserId); + Assert.Equal(1, valeur[0].InquiryId); + Assert.True(valeur[0].IsFinished); + Assert.Equal(1, valeur[1].UserId); + Assert.Equal(1, valeur[1].InquiryId); + Assert.True(valeur[1].IsFinished); + + + Assert.Equal(valeur[1].GetHashCode(), successesList[1].GetHashCode()); + Assert.True(valeur[1].Equals(successesList[1])); + Assert.False(valeur.Equals(new object())); + Assert.False(valeur.Equals(null)); + Assert.True(valeur.Equals(valeur)); + Assert.IsType(valeur[0]); + Assert.Contains(valeur[1], successesList); } + } - [Fact] - public void GetSuccessInquiryIdFail() + [Fact] + public void GetSuccessInquiryIdFail() + { + var successesList = GetSuccessesData(); + _successService.Setup(x => x.GetSuccessesByInquiryId(1)) + .Returns(new List { successesList[0], successesList[1] }); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); + + var sucessesResult = successesController.GetSuccessByInquiryId(100); + if (sucessesResult is NotFoundObjectResult nfObjectResult) { - var successesList = GetSuccessesData(); - successService.Setup(x => x.GetSuccessesByInquiryId(1)) - .Returns(new List { successesList[0], successesList[1] }); - var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - - var sucessesResult = SuccessesController.GetSuccessByInquiryId(100); - if (sucessesResult is NotFoundObjectResult NFObjectResult) - { - var valeur = NFObjectResult.Value; - - Assert.NotNull(valeur); - Assert.IsNotType(valeur); - Assert.DoesNotContain(valeur, successesList); - } + var valeur = nfObjectResult.Value; + Assert.NotNull(valeur); + Assert.IsNotType(valeur); + Assert.DoesNotContain(valeur, successesList); } + } - - [Fact] - public void GetSuccessUserIdSuccess() + [Fact] + public void GetSuccessUserIdSuccess() + { + var successesList = GetSuccessesData(); + _successService.Setup(x => x.GetSuccessesByUserId(2)) + .Returns(new List { successesList[2], successesList[3] }); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); + + var sucessesResult = successesController.GetSuccessByUserId(2); + if (sucessesResult is OkObjectResult okObjectResult) { - var successesList = GetSuccessesData(); - successService.Setup(x => x.GetSuccessesByUserId(2)) - .Returns(new List { successesList[2], successesList[3] }); - var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - - var sucessesResult = SuccessesController.GetSuccessByUserId(2); - if (sucessesResult is OkObjectResult okObjectResult) - { - List valeur = okObjectResult.Value as List; - - Assert.NotNull(valeur); - Assert.Equal(2, valeur[0].UserId); - Assert.Equal(3, valeur[0].InquiryId); - Assert.True(valeur[0].IsFinished); - Assert.Equal(2, valeur[1].UserId); - Assert.Equal(4, valeur[1].InquiryId); - Assert.True(valeur[1].IsFinished); - - - Assert.Equal(valeur[1].GetHashCode(), successesList[3].GetHashCode()); - Assert.True(valeur[1].Equals(successesList[3])); - Assert.False(valeur.Equals(new object())); - Assert.IsType(valeur[0]); - Assert.Contains(valeur[1], successesList); - } - + List valeur = okObjectResult.Value as List; + + Assert.NotNull(valeur); + Assert.Equal(2, valeur[0].UserId); + Assert.Equal(3, valeur[0].InquiryId); + Assert.True(valeur[0].IsFinished); + Assert.Equal(2, valeur[1].UserId); + Assert.Equal(4, valeur[1].InquiryId); + Assert.True(valeur[1].IsFinished); + + + Assert.Equal(valeur[1].GetHashCode(), successesList[3].GetHashCode()); + Assert.True(valeur[1].Equals(successesList[3])); + Assert.False(valeur.Equals(new object())); + Assert.IsType(valeur[0]); + Assert.Contains(valeur[1], successesList); } + } - [Fact] - public void GetSuccessUserIdFail() + [Fact] + public void GetSuccessUserIdFail() + { + var successesList = GetSuccessesData(); + _successService.Setup(x => x.GetSuccessesByUserId(2)) + .Returns(new List { successesList[2], successesList[3] }); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); + + var sucessesResult = successesController.GetSuccessByUserId(200); + if (sucessesResult is NotFoundObjectResult nfObjectResult) { - var successesList = GetSuccessesData(); - successService.Setup(x => x.GetSuccessesByUserId(2)) - .Returns(new List { successesList[2], successesList[3] }); - var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - - var sucessesResult = SuccessesController.GetSuccessByUserId(200); - if (sucessesResult is NotFoundObjectResult NFObjectResult) - { - var valeur = NFObjectResult.Value; - - Assert.NotNull(valeur); - Assert.IsNotType(valeur); - Assert.DoesNotContain(valeur, successesList); - } + var valeur = nfObjectResult.Value; + Assert.NotNull(valeur); + Assert.IsNotType(valeur); + Assert.DoesNotContain(valeur, successesList); } + } + [Fact] + public void DeleteSuccessSuccess() + { + _successService.Setup(x => x.DeleteSuccess(1, 1)) + .Returns(true); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); - - [Fact] - public void DeleteSuccessSuccess() + var sucessesResult = successesController.DeleteSuccess(1, 1); + if (sucessesResult is OkObjectResult okObjectResult) { - successService.Setup(x => x.DeleteSuccess(1,1)) - .Returns(true); - var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - - var sucessesResult = SuccessesController.DeleteSuccess(1,1); - if (sucessesResult is OkObjectResult okObjectResult) - { - bool valeur = (bool)okObjectResult.Value; - - Assert.True(valeur); - } + bool valeur = (bool)okObjectResult.Value; + Assert.True(valeur); } + } + [Fact] + public void DeleteSuccessFail() + { + _successService.Setup(x => x.DeleteSuccess(1, 1)) + .Returns(true); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); - [Fact] - public void DeleteSuccessFail() + var sucessesResult = successesController.DeleteSuccess(100, 278); + if (sucessesResult is NotFoundObjectResult nfObjectResult) { - successService.Setup(x => x.DeleteSuccess(1, 1)) - .Returns(true); - var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - - var sucessesResult = SuccessesController.DeleteSuccess(100, 278); - if (sucessesResult is NotFoundObjectResult NFObjectResult) - { - Assert.Null(NFObjectResult.Value); - Assert.IsNotType(NFObjectResult.Value); - } + Assert.Null(nfObjectResult.Value); + Assert.IsNotType(nfObjectResult.Value); } + } + [Fact] + public void CreateSuccessSuccess() + { + _successService.Setup(x => x.CreateSuccess(8, 8, true)) + .Returns(new SuccessDto(8, 8, true)); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); - [Fact] - public void CreateSuccessSuccess() + var successesResult = successesController.CreateSuccess(new SuccessDto(8, 8, true)); + if (successesResult is CreatedResult createdObjectResult) { - successService.Setup(x => x.CreateSuccess(8,8,true)) - .Returns(new SuccessDto(8,8,true)); - var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - - var successesResult = SuccessesController.CreateSuccess(new SuccessDto(8,8,true)); - if (successesResult is CreatedResult createdObjectResult) - { - SuccessDto valeur = createdObjectResult.Value as SuccessDto; - - Assert.NotNull(valeur); - Assert.Equal(8, valeur.UserId); - Assert.Equal(8, valeur.InquiryId); - Assert.True(valeur.IsFinished); - } + SuccessDto valeur = createdObjectResult.Value as SuccessDto; + Assert.NotNull(valeur); + Assert.Equal(8, valeur.UserId); + Assert.Equal(8, valeur.InquiryId); + Assert.True(valeur.IsFinished); } + } - [Fact] - public void CreateSuccessFail() - { - successService.Setup(x => x.CreateSuccess(8, 8, true)) - .Returns(new SuccessDto(8, 8, true)); - var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - - var successesResult = SuccessesController.CreateSuccess(new SuccessDto(882, 818, true)); + [Fact] + public void CreateSuccessFail() + { + _successService.Setup(x => x.CreateSuccess(8, 8, true)) + .Returns(new SuccessDto(8, 8, true)); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); - if (successesResult is BadRequestResult BDObjectResult) - { + var successesResult = successesController.CreateSuccess(new SuccessDto(882, 818, true)); - Assert.Equal(400, BDObjectResult.StatusCode); - } + if (successesResult is BadRequestResult bdObjectResult) + { + Assert.Equal(400, bdObjectResult.StatusCode); } + } + [Fact] + public void UpdateSuccessSuccess() + { + _successService.Setup(x => x.UpdateSuccess(1, 1, new SuccessDto(1, 1, true))) + .Returns(new SuccessDto(1, 1, true)); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); - - [Fact] - public void UpdateSuccessSuccess() + var successesResult = successesController.UpdateSuccess(1, 1, new SuccessDto(1, 1, true)); + if (successesResult is OkObjectResult okObjectResult) { - successService.Setup(x => x.UpdateSuccess(1,1,new SuccessDto(1,1,true))) - .Returns(new SuccessDto(1, 1, true)); - var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - - var successesResult = SuccessesController.UpdateSuccess(1, 1, new SuccessDto(1, 1, true)); - if (successesResult is OkObjectResult okObjectResult) - { - SuccessDto valeur = okObjectResult.Value as SuccessDto; - - Assert.NotNull(valeur); - Assert.Equal(1, valeur.UserId); - Assert.Equal(1, valeur.InquiryId); - Assert.True(valeur.IsFinished); - } + SuccessDto valeur = okObjectResult.Value as SuccessDto; + Assert.NotNull(valeur); + Assert.Equal(1, valeur.UserId); + Assert.Equal(1, valeur.InquiryId); + Assert.True(valeur.IsFinished); } + } - [Fact] - public void UpdateSuccessFail() - { - successService.Setup(x => x.UpdateSuccess(1, 1, new SuccessDto(1, 2, true))) - .Returns(new SuccessDto(1, 2, true)); - var SuccessesController = new SuccessesController(successService.Object, new NullLogger()); - - var successesResult = SuccessesController.UpdateSuccess(1, 1, new SuccessDto(1, 2, true)); + [Fact] + public void UpdateSuccessFail() + { + _successService.Setup(x => x.UpdateSuccess(1, 1, new SuccessDto(1, 2, true))) + .Returns(new SuccessDto(1, 2, true)); + var successesController = + new SuccessesController(_successService.Object, new NullLogger()); - if (successesResult is BadRequestResult BDObjectResult) - { + var successesResult = successesController.UpdateSuccess(1, 1, new SuccessDto(1, 2, true)); - Assert.Equal(400, BDObjectResult.StatusCode); - } + if (successesResult is BadRequestResult bdObjectResult) + { + Assert.Equal(400, bdObjectResult.StatusCode); } + } - - - - private List GetSuccessesData() + private List GetSuccessesData() + { + List successesData = new List(4) { - List successesData = new List(4) - { - new (0,1,true), - new (1,1,true), - new (2,3,true), - new (2,4,true), - }; - return successesData; - } + new(0, 1, true), + new(1, 1, true), + new(2, 3, true), + new(2, 4, true), + }; + return successesData; } -} +} \ No newline at end of file diff --git a/API_SQLuedo/TestAPI/UserUnitTest.cs b/API_SQLuedo/TestAPI/UserUnitTest.cs index 18ef7b0..90d5045 100644 --- a/API_SQLuedo/TestAPI/UserUnitTest.cs +++ b/API_SQLuedo/TestAPI/UserUnitTest.cs @@ -1,319 +1,281 @@ -using System.Collections; using API.Controllers; -using API.Service; -using DbContextLib; -using DbDataManager.Service; using Dto; -using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging.Abstractions; using Moq; using Shared; using TestAPI.Extensions; -namespace TestAPI +namespace TestAPI; + +public class UserUnitTest { - public class UserUnitTest - { - private readonly Mock> userService; - public UserUnitTest() - { - userService = new Mock>(); - } + private readonly Mock> _userService; - [Fact] - public void GetUserListSuccess() - { - var userList = GetUsersData(); - userService.Setup(x => x.GetUsers(1 ,4,0)) - .Returns(userList); - var UsersController = new UsersController(new NullLogger(), userService.Object); + public UserUnitTest() + { + _userService = new Mock>(); + } - var userResult = UsersController.GetUsers(1,4, 0); + [Fact] + public void GetUserListSuccess() + { + var userList = GetUsersData(); + _userService.Setup(x => x.GetUsers(1, 4, 0)) + .Returns(userList); + var usersController = new UsersController(new NullLogger(), _userService.Object); - if (userResult is OkObjectResult okObjectResult) - { - var valeur = okObjectResult.Value; + var userResult = usersController.GetUsers(1, 4, 0); - Assert.NotNull(valeur); - Assert.Equal(GetUsersData().ToString(), valeur.ToString()); - Assert.True(userList.SequenceEqual(valeur as IEnumerable,new UserIdEqualityComparer())); - - } + if (userResult is OkObjectResult okObjectResult) + { + var valeur = okObjectResult.Value; + Assert.NotNull(valeur); + Assert.Equal(GetUsersData().ToString(), valeur.ToString()); + Assert.True(userList.SequenceEqual(valeur as IEnumerable, new UserIdEqualityComparer())); } + } - [Fact] - public void GetUserListFail() - { - userService.Setup(x => x.GetUsers(1, 4,0)) - .Returns(new List()); - var UsersController = new UsersController(new NullLogger(), userService.Object); - - var userResult = UsersController.GetUsers(2,3, 0); - - if (userResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) - - { - - Assert.IsNotType(userResult); - } + [Fact] + public void GetUserListFail() + { + _userService.Setup(x => x.GetUsers(1, 4, 0)) + .Returns(new List()); + var usersController = new UsersController(new NullLogger(), _userService.Object); - } + var userResult = usersController.GetUsers(2, 3, 0); + if (userResult is StatusCodeResult statusCodeResult && statusCodeResult.StatusCode == 204) - [Fact] - public void GetUserIdSuccess() { - var userList = GetUsersData(); - userService.Setup(x => x.GetUserById(1)) - .Returns(userList[1]); - var UsersController = new UsersController(new NullLogger(), userService.Object); - - var userResult = UsersController.GetUserById(1); - if (userResult is OkObjectResult okObjectResult) - { - UserDto valeur = okObjectResult.Value as UserDto; - - Assert.NotNull(valeur); - Assert.Equal("Leuser",valeur.Username); - Assert.Equal("motdepasse", valeur.Password); - Assert.Equal("deuxadresse@gmail.com", valeur.Email); - Assert.IsType(valeur); - Assert.Contains(valeur, userList); - } - + Assert.IsNotType(userResult); } + } - [Fact] - public void GetUserIdFail() - { - var userList = GetUsersData(); - userService.Setup(x => x.GetUserById(1)) - .Returns(userList[1]); - var UsersController = new UsersController(new NullLogger(), userService.Object); - - var userResult = UsersController.GetUserById(100); - if (userResult is NotFoundObjectResult NFObjectResult) - { - var valeur = NFObjectResult.Value; - Assert.NotNull(valeur); - Assert.IsNotType(valeur); - Assert.DoesNotContain(valeur, userList); - } + [Fact] + public void GetUserIdSuccess() + { + var userList = GetUsersData(); + _userService.Setup(x => x.GetUserById(1)) + .Returns(userList[1]); + var usersController = new UsersController(new NullLogger(), _userService.Object); + var userResult = usersController.GetUserById(1); + if (userResult is OkObjectResult okObjectResult) + { + UserDto valeur = okObjectResult.Value as UserDto; + + Assert.NotNull(valeur); + Assert.Equal("Leuser", valeur.Username); + Assert.Equal("motdepasse", valeur.Password); + Assert.Equal("deuxadresse@gmail.com", valeur.Email); + Assert.IsType(valeur); + Assert.Contains(valeur, userList); } + } + [Fact] + public void GetUserIdFail() + { + var userList = GetUsersData(); + _userService.Setup(x => x.GetUserById(1)) + .Returns(userList[1]); + var usersController = new UsersController(new NullLogger(), _userService.Object); - [Fact] - public void GetUserUsernameSuccess() + var userResult = usersController.GetUserById(100); + if (userResult is NotFoundObjectResult nfObjectResult) { - var userList = GetUsersData(); - userService.Setup(x => x.GetUserByUsername("Useruser")) - .Returns(userList[0]); - var UsersController = new UsersController(new NullLogger(), userService.Object); - - var userResult = UsersController.GetUserByUsername("Useruser"); - if (userResult is OkObjectResult okObjectResult) - { - UserDto valeur = okObjectResult.Value as UserDto; - - Assert.NotNull(valeur); - Assert.IsType(valeur); - Assert.Contains(valeur, userList); - Assert.Equal("adressemail@gmail.com", valeur.Email); - Assert.Equal("Useruser", valeur.Username); - Assert.Equal("motdepasse", valeur.Password); - Assert.True(valeur.IsAdmin); - } + var valeur = nfObjectResult.Value; + Assert.NotNull(valeur); + Assert.IsNotType(valeur); + Assert.DoesNotContain(valeur, userList); } + } + [Fact] + public void GetUserUsernameSuccess() + { + var userList = GetUsersData(); + _userService.Setup(x => x.GetUserByUsername("Useruser")) + .Returns(userList[0]); + var usersController = new UsersController(new NullLogger(), _userService.Object); - [Fact] - public void GetUserUsernameFail() + var userResult = usersController.GetUserByUsername("Useruser"); + if (userResult is OkObjectResult okObjectResult) { - var userList = GetUsersData(); - userService.Setup(x => x.GetUserByUsername("Useruser")) - .Returns(userList[0]); - var UsersController = new UsersController(new NullLogger(), userService.Object); - - var userResult = UsersController.GetUserByUsername("GYIIieihhh"); - - if (userResult is NotFoundObjectResult NFObjectResult) - { - var valeur = NFObjectResult.Value; - - Assert.NotNull(valeur); - Assert.IsNotType(valeur); - Assert.DoesNotContain(valeur, userList); - Assert.False(userList == valeur); - } + UserDto valeur = okObjectResult.Value as UserDto; + + Assert.NotNull(valeur); + Assert.IsType(valeur); + Assert.Contains(valeur, userList); + Assert.Equal("adressemail@gmail.com", valeur.Email); + Assert.Equal("Useruser", valeur.Username); + Assert.Equal("motdepasse", valeur.Password); + Assert.True(valeur.IsAdmin); } + } + [Fact] + public void GetUserUsernameFail() + { + var userList = GetUsersData(); + _userService.Setup(x => x.GetUserByUsername("Useruser")) + .Returns(userList[0]); + var usersController = new UsersController(new NullLogger(), _userService.Object); + var userResult = usersController.GetUserByUsername("GYIIieihhh"); - - - - [Fact] - public void DeleteUserSuccess() + if (userResult is NotFoundObjectResult nfObjectResult) { - userService.Setup(x => x.DeleteUser(1)) - .Returns(true); - var UsersController = new UsersController(new NullLogger(), userService.Object); - - var userResult = UsersController.DeleteUser(1); - if (userResult is OkObjectResult okObjectResult) - { - bool valeur = (bool)okObjectResult.Value; - - Assert.True(valeur); - } + var valeur = nfObjectResult.Value; + Assert.NotNull(valeur); + Assert.IsNotType(valeur); + Assert.DoesNotContain(valeur, userList); + Assert.False(userList == valeur); } + } + [Fact] + public void DeleteUserSuccess() + { + _userService.Setup(x => x.DeleteUser(1)) + .Returns(true); + var usersController = new UsersController(new NullLogger(), _userService.Object); - [Fact] - public void DeleteUserFail() + var userResult = usersController.DeleteUser(1); + if (userResult is OkObjectResult okObjectResult) { - userService.Setup(x => x.DeleteUser(1)) - .Returns(true); - var UsersController = new UsersController(new NullLogger(), userService.Object); - - var userResult = UsersController.DeleteUser(100); - if (userResult is NotFoundObjectResult NFObjectResult) - { - Assert.Null(NFObjectResult.Value); - Assert.IsNotType(NFObjectResult.Value); - } + bool valeur = (bool)okObjectResult.Value; + + Assert.True(valeur); } + } + [Fact] + public void DeleteUserFail() + { + _userService.Setup(x => x.DeleteUser(1)) + .Returns(true); + var usersController = new UsersController(new NullLogger(), _userService.Object); - [Fact] - public void CreateUserSuccess() + var userResult = usersController.DeleteUser(100); + if (userResult is NotFoundObjectResult nfObjectResult) { - userService.Setup(x => x.CreateUser("Nom","Passssss","heudfk@hdye.com",true)) - .Returns(new UserDto("Nom","Passssss", "heudfk@hdye.com",true)); - var UsersController = new UsersController(new NullLogger(), userService.Object); - - var userResult = UsersController.CreateUser(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); - if (userResult is CreatedResult createdObjectResult) - { - UserDto valeur = createdObjectResult.Value as UserDto; - - Assert.NotNull(valeur); - Assert.Equal("Nom", valeur.Username); - Assert.Equal("Passssss",valeur.Password); - Assert.Equal("heudfk@hdye.com",valeur.Email); - Assert.True(valeur.IsAdmin); - } - + Assert.Null(nfObjectResult.Value); + Assert.IsNotType(nfObjectResult.Value); } + } + + [Fact] + public void CreateUserSuccess() + { + _userService.Setup(x => x.CreateUser("Nom", "Passssss", "heudfk@hdye.com", true)) + .Returns(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); + var usersController = new UsersController(new NullLogger(), _userService.Object); - [Fact] - public void CreateUserFail() + var userResult = usersController.CreateUser(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); + if (userResult is CreatedResult createdObjectResult) { - var userList = GetUsersData(); - userService.Setup(x => x.CreateUser("Nom", "Passssss", "heudfk@hdye.com", true)) - .Returns(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); - var UsersController = new UsersController(new NullLogger(), userService.Object); - - var userResult = UsersController.CreateUser(new UserDto(null, "Passssss", "heudfk@hdye.com", true)); - - if (userResult is BadRequestResult BDObjectResult) - { + UserDto valeur = createdObjectResult.Value as UserDto; - Assert.Equal(400, BDObjectResult.StatusCode); - } + Assert.NotNull(valeur); + Assert.Equal("Nom", valeur.Username); + Assert.Equal("Passssss", valeur.Password); + Assert.Equal("heudfk@hdye.com", valeur.Email); + Assert.True(valeur.IsAdmin); } + } + [Fact] + public void CreateUserFail() + { + GetUsersData(); + _userService.Setup(x => x.CreateUser("Nom", "Passssss", "heudfk@hdye.com", true)) + .Returns(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); + var usersController = new UsersController(new NullLogger(), _userService.Object); - [Fact] - public void UpdateUserSuccess() - { - userService.Setup(x => x.UpdateUser(1, new UserDto("Nom", "Passssss", "heudfk@hdye.com", true))) - .Returns(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); - var UsersController = new UsersController(new NullLogger(), userService.Object); - - var userResult = UsersController.UpdateUser(1, new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); - if (userResult is OkObjectResult okObjectResult) - { - UserDto valeur = okObjectResult.Value as UserDto; - - Assert.NotNull(valeur); - Assert.Equal("Nom", valeur.Username); - Assert.Equal("Passssss", valeur.Password); - Assert.Equal("heudfk@hdye.com", valeur.Email); - Assert.True(valeur.IsAdmin); - } - - } + var userResult = usersController.CreateUser(new UserDto(null, "Passssss", "heudfk@hdye.com", true)); - [Fact] - public void UpdateUserFail() + if (userResult is BadRequestResult bdObjectResult) { - userService.Setup(x => x.UpdateUser(1, new UserDto(1,"Nom", "Passssss", "heudfk@hdye.com", true))) - .Returns(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); - var UsersController = new UsersController(new NullLogger(), userService.Object); - - var userResult = UsersController.UpdateUser(1, new UserDto(2,"Nom", "Passssss", "heudfk@hdye.com", true)); - - if (userResult is BadRequestResult BDObjectResult) - { - - Assert.Equal(400,BDObjectResult.StatusCode); - } + Assert.Equal(400, bdObjectResult.StatusCode); } + } + [Fact] + public void UpdateUserSuccess() + { + _userService.Setup(x => x.UpdateUser(1, new UserDto("Nom", "Passssss", "heudfk@hdye.com", true))) + .Returns(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); + var usersController = new UsersController(new NullLogger(), _userService.Object); + var userResult = usersController.UpdateUser(1, new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); + if (userResult is OkObjectResult okObjectResult) + { + UserDto valeur = okObjectResult.Value as UserDto; - + Assert.NotNull(valeur); + Assert.Equal("Nom", valeur.Username); + Assert.Equal("Passssss", valeur.Password); + Assert.Equal("heudfk@hdye.com", valeur.Email); + Assert.True(valeur.IsAdmin); + } + } + [Fact] + public void UpdateUserFail() + { + _userService.Setup(x => x.UpdateUser(1, new UserDto(1, "Nom", "Passssss", "heudfk@hdye.com", true))) + .Returns(new UserDto("Nom", "Passssss", "heudfk@hdye.com", true)); + var usersController = new UsersController(new NullLogger(), _userService.Object); + var userResult = usersController.UpdateUser(1, new UserDto(2, "Nom", "Passssss", "heudfk@hdye.com", true)); - private List GetUsersData() + if (userResult is BadRequestResult bdObjectResult) { - List usersData = new List(4) - { - new ( - 0, - "Useruser", - "motdepasse", - "adressemail@gmail.com" , - - true - ), - new - ( - 1, - "Leuser", - "motdepasse", - "deuxadresse@gmail.com" , - - false - ), - new - ( - 2, - "gygyggyg", - "ennodlavehc", - "thirdadress@gmail.com" , - - false - ), - new - ( - "ferferf", - "h_nh_78", - "fourthadress@gmail.com" , - - false - ), - }; - return usersData; + Assert.Equal(400, bdObjectResult.StatusCode); } } + + private List GetUsersData() + { + List usersData = new List(4) + { + new( + 0, + "Useruser", + "motdepasse", + "adressemail@gmail.com", + true + ), + new + ( + 1, + "Leuser", + "motdepasse", + "deuxadresse@gmail.com", + false + ), + new + ( + 2, + "gygyggyg", + "ennodlavehc", + "thirdadress@gmail.com", + false + ), + new + ( + "ferferf", + "h_nh_78", + "fourthadress@gmail.com", + false + ), + }; + return usersData; + } } \ No newline at end of file diff --git a/API_SQLuedo/TestConsoleEf/Program.cs b/API_SQLuedo/TestConsoleEf/Program.cs index 7921b88..42a14e8 100644 --- a/API_SQLuedo/TestConsoleEf/Program.cs +++ b/API_SQLuedo/TestConsoleEf/Program.cs @@ -46,12 +46,19 @@ using (var db = new StubbedContext(options)) // Ajout d'un utilisateur Console.WriteLine("\nAjout du nouvel utilisateur"); - var newUser = new UserEntity("le nouveau du groupe", Convert.ToBase64String(KeyDerivation.Pbkdf2( - password: "motdepasse", - salt: RandomNumberGenerator.GetBytes(128 / 8), - prf: KeyDerivationPrf.HMACSHA256, - iterationCount: 100000, - numBytesRequested: 256 / 8)), "Efff.fffff@etu.uca.fr", true); + var newUser = new UserEntity + { + Username = "le nouveau du groupe", + Password = Convert.ToBase64String(KeyDerivation.Pbkdf2( + password: "motdepasse", + salt: RandomNumberGenerator.GetBytes(128 / 8), + prf: KeyDerivationPrf.HMACSHA256, + iterationCount: 100000, + numBytesRequested: 256 / 8)), + Email = "Efff.fffff@etu.uca.fr", + IsAdmin = true + } + ; if (!users.Any(u => u.Username == newUser.Username)) { users.Add(newUser); @@ -159,24 +166,23 @@ 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 sol = await solutions.FirstOrDefaultAsync(s => s.Owner.Title == "L'enquête sur les orang outan"); - Console.WriteLine(sol.MurdererFirstName); - - var inquirySolution = await inquiries.FirstOrDefaultAsync(i => i.Title == "L'enquête sur les orang outan"); - var i = inquirySolution.Id; + + 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() - .Where(p => p.CanWrite && p.Name != nameof(SolutionEntity.Owner))) + .Where(p => p.CanRead && p.Name != nameof(SolutionEntity.Owner))) { - Console.WriteLine(pptt.GetValue(i)); + Console.WriteLine(pptt.GetValue(solution)); } // Ajout d'une enquete Console.WriteLine("\nAjout de la nouvelle enquete"); - var newInquiry = new InquiryEntity( - "La nouvelle enquete", - "La description de la nouvelle enquete", - true); + var newInquiry = new InquiryEntity + { + Title = "La nouvelle enquete", + Description = "La description de la nouvelle enquete", + IsUser = true + }; if (!inquiries.Any(inquiry => inquiry.Title == newInquiry.Title)) { inquiries.Add(newInquiry); diff --git a/API_SQLuedo/TestEF/Dto/TestInquiryDTO.cs b/API_SQLuedo/TestEF/Dto/TestInquiryDTO.cs new file mode 100644 index 0000000..e25e9ee --- /dev/null +++ b/API_SQLuedo/TestEF/Dto/TestInquiryDTO.cs @@ -0,0 +1,41 @@ +using Dto; + +namespace TestEF.Dto; + +public class TestInquiryDto +{ + private const int _id = 1; + private const string _title = "Title"; + private const string _description = "_description"; + private const bool _isUser = true; + + [Fact] + public void TestConstructorWithId() + { + InquiryDto inquiry = new InquiryDto(_id, _title, _description, _isUser); + Assert.Equal(_id, inquiry.Id); + Assert.Equal(_title, inquiry.Title); + Assert.Equal(_description, inquiry.Description); + Assert.True(inquiry.IsUser); + } + + [Fact] + public void TestConstructorWithoutId() + { + InquiryDto inquiry = new InquiryDto(_title,_description,_isUser); + Assert.Equal(0, inquiry.Id); + 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); + Assert.Equal(_id, inquiry.Id); + 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 new file mode 100644 index 0000000..4718c3f --- /dev/null +++ b/API_SQLuedo/TestEF/Dto/TestInquiryTableDTO.cs @@ -0,0 +1,28 @@ +using Dto; + +namespace TestEF.Dto; + +public class TestInquiryTableDto +{ + private const int Id = 1; + private const string Database = "database"; + private const string Connection = "_connection"; + + [Fact] + public void TestConstructorWithId() + { + InquiryTableDto inquiry = new InquiryTableDto(Id, Database, Connection); + Assert.Equal(Id, inquiry.OwnerId); + Assert.Equal(Database, inquiry.DatabaseName); + Assert.Equal(Connection, inquiry.ConnectionInfo); + } + + [Fact] + public void TestDefaultConstructor() + { + InquiryTableDto inquiry = new InquiryTableDto(); + Assert.Equal(0, inquiry.OwnerId); + Assert.Null(inquiry.DatabaseName); + Assert.Null(inquiry.ConnectionInfo); + } +} \ No newline at end of file diff --git a/API_SQLuedo/TestEF/Dto/TestLessonDTO.cs b/API_SQLuedo/TestEF/Dto/TestLessonDTO.cs new file mode 100644 index 0000000..0fb5b1a --- /dev/null +++ b/API_SQLuedo/TestEF/Dto/TestLessonDTO.cs @@ -0,0 +1,42 @@ +using Dto; + +namespace TestEF.Dto; + +public class TestLessonDto +{ + private const int Id = 42; + private const string Title = "Title"; + private const string LastPublisher = "Last Publisher"; + private static readonly DateOnly LastEdit = new(); + + [Fact] + public void TestDefaultConstructor() + { + LessonDto lesson = new LessonDto(); + Assert.Equal(0, lesson.Id); + Assert.Null(lesson.Title); + Assert.Null(lesson.LastPublisher); + // Default date + Assert.Equal(new DateOnly(0001, 01, 01), LastEdit); + } + + [Fact] + public void TestConstructorWithoutId() + { + LessonDto lesson = new LessonDto(Title, LastPublisher, LastEdit); + Assert.Equal(0, lesson.Id); + Assert.Equal(Title, lesson.Title); + Assert.Equal(LastPublisher, lesson.LastPublisher); + Assert.Equal(LastEdit, lesson.LastEdit); + } + + [Fact] + public void TestConstructorWithAllAttributes() + { + LessonDto lesson = new LessonDto(Id, Title, LastPublisher, LastEdit); + Assert.Equal(Id, lesson.Id); + Assert.Equal(Title, lesson.Title); + Assert.Equal(LastPublisher, lesson.LastPublisher); + Assert.Equal(LastEdit, lesson.LastEdit); + } +} \ No newline at end of file diff --git a/API_SQLuedo/TestEF/Dto/TestNotepadDTO.cs b/API_SQLuedo/TestEF/Dto/TestNotepadDTO.cs new file mode 100644 index 0000000..903f09a --- /dev/null +++ b/API_SQLuedo/TestEF/Dto/TestNotepadDTO.cs @@ -0,0 +1,41 @@ +using Dto; + +namespace TestEF.Dto; + +public class TestNotepadDto +{ + private const int Id = 42; + private const int UserId = 42; + private const int InquiryId = 42; + private const string Notes = "This is some notes example"; + + [Fact] + public void TestDefaultConstructor() + { + NotepadDto notepad = new NotepadDto(); + 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); + } + + [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); + } +} \ No newline at end of file diff --git a/API_SQLuedo/TestEF/Dto/TestParagraphDTO.cs b/API_SQLuedo/TestEF/Dto/TestParagraphDTO.cs new file mode 100644 index 0000000..5e92cc3 --- /dev/null +++ b/API_SQLuedo/TestEF/Dto/TestParagraphDTO.cs @@ -0,0 +1,50 @@ +using Dto; + +namespace TestEF.Dto; + +public class TestParagraphDto +{ + private const int Id = 42; + private const string Title = "Title"; + private const string Info = "Info"; + private const string Content = "Content"; + private const string Query = "Query"; + private const string Comment = "Comment"; + + [Fact] + public void TestDefaultConstructor() + { + ParagraphDto paragraph = new ParagraphDto(); + Assert.Equal(0, paragraph.Id); + Assert.Null(paragraph.Title); + Assert.Null(paragraph.Info); + Assert.Null(paragraph.Content); + Assert.Null(paragraph.Query); + Assert.Null(paragraph.Comment); + } + + [Fact] + public void TestConstructorWithoutId() + { + 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); + } + + [Fact] + public void TestConstructorWithAllAttributes() + { + 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(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 new file mode 100644 index 0000000..d9d9423 --- /dev/null +++ b/API_SQLuedo/TestEF/Dto/TestSolutionDTO.cs @@ -0,0 +1,48 @@ +using Dto; + +namespace TestEF.Dto; + +public class TestSolutionDto +{ + private const string MurdererFirstName = "John"; + private const string MurdererLastName = "Doe"; + private const string MurderPlace = "WhiteHouse"; + private const string MurderWeapon = "Nuclear Bomb"; + private const string Explaination = "This is an explaination"; + private const int InquiryId = 42; + + [Fact] + public void TestDefaultConstructor() + { + SolutionDto solution = new SolutionDto(); + 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); + 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); + Assert.Equal(Explaination, solution.Explanation); + } +} \ No newline at end of file diff --git a/API_SQLuedo/TestEF/Dto/TestSuccessDTO.cs b/API_SQLuedo/TestEF/Dto/TestSuccessDTO.cs new file mode 100644 index 0000000..7be75f4 --- /dev/null +++ b/API_SQLuedo/TestEF/Dto/TestSuccessDTO.cs @@ -0,0 +1,28 @@ +using Dto; + +namespace TestEF.Dto; + +public class TestSuccessDto +{ + private const int UserId = 42; + private const int InquiryId = 7; + private const bool IsFinished = true; + + [Fact] + public void TestDefaultConstructor() + { + SuccessDto success = new SuccessDto(); + Assert.Equal(0, success.UserId); + Assert.Equal(0, success.InquiryId); + Assert.False(success.IsFinished); + } + + [Fact] + public void TestConstructorWithIds() + { + SuccessDto success = new SuccessDto(UserId, InquiryId, IsFinished); + Assert.Equal(UserId, success.UserId); + Assert.Equal(InquiryId, success.InquiryId); + Assert.True(success.IsFinished); + } +} \ No newline at end of file diff --git a/API_SQLuedo/TestEF/Dto/TestUserDTO.cs b/API_SQLuedo/TestEF/Dto/TestUserDTO.cs new file mode 100644 index 0000000..faff408 --- /dev/null +++ b/API_SQLuedo/TestEF/Dto/TestUserDTO.cs @@ -0,0 +1,46 @@ +using Dto; + +namespace TestEF.Dto +{ + public class TestUserDto + { + private const string Username = "username"; + private const string Email = "example@email.com"; + private const string Password = "password"; + private const bool IsAdmin = true; + private const int Id = 42; + + [Fact] + public void TestDefaultConstructor() + { + UserDto user = new UserDto(); + Assert.Equal(0,user.Id); + Assert.Null(user.Username); + Assert.Null(user.Email); + Assert.Null(user.Password); + Assert.False(user.IsAdmin); + } + + [Fact] + public void TestConstructorWithoutId() + { + UserDto user = new UserDto(Username, Password, Email, IsAdmin); + 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(Username, user.Username); + Assert.Equal(Email, user.Email); + Assert.Equal(Password, user.Password); + Assert.True(user.IsAdmin); + } + } +} \ No newline at end of file diff --git a/API_SQLuedo/TestEF/EntitiesTests/ConcreteContentLessonEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/ConcreteContentLessonEntity.cs deleted file mode 100644 index 15789eb..0000000 --- a/API_SQLuedo/TestEF/EntitiesTests/ConcreteContentLessonEntity.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Entities; - -namespace TestEF.EntitiesTests; - -public class ConcreteContentLessonEntity : ContentLessonEntity -{ - public ConcreteContentLessonEntity(int id, string contentContent, string contentTitle) - : base(id, contentContent, contentTitle) - { - } - - public ConcreteContentLessonEntity(int id, int lessonId, string contentContent, string contentTitle) - : base(id, lessonId, contentContent, contentTitle) - { - } - - public ConcreteContentLessonEntity(string contentContent, string contentTitle) - : base(contentContent, contentTitle) - { - } -} \ No newline at end of file diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestBlackListEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestBlackListEntity.cs index abc2ad6..1453cd4 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestBlackListEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestBlackListEntity.cs @@ -8,7 +8,7 @@ public class TestBlackListEntity public void Constructor_ShouldSetProperties_WhenCalledWithTwoParameters() { // Arrange - string email = "test@example.com"; + const string email = "test@example.com"; DateOnly expirationDate = DateOnly.FromDateTime(DateTime.Now.AddDays(10)); // Act diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestContentLessonEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestContentLessonEntity.cs deleted file mode 100644 index 6d2bd7e..0000000 --- a/API_SQLuedo/TestEF/EntitiesTests/TestContentLessonEntity.cs +++ /dev/null @@ -1,55 +0,0 @@ -namespace TestEF.EntitiesTests; - -public class TestContentLessonEntity -{ - [Fact] - public void Constructor_ShouldSetProperties_WhenCalledWithTwoParameters() - { - // Arrange - const string contentContent = "Content"; - const string contentTitle = "Title"; - - // Act - var concreteContentLessonEntity = new ConcreteContentLessonEntity(contentContent, contentTitle); - - // Assert - Assert.Equal(contentContent, concreteContentLessonEntity.ContentContent); - Assert.Equal(contentTitle, concreteContentLessonEntity.ContentTitle); - } - - [Fact] - public void Constructor_ShouldSetProperties_WhenCalledWithThreeParameters() - { - // Arrange - const int id = 1; - const string contentContent = "Content"; - const string contentTitle = "Title"; - - // Act - var concreteContentLessonEntity = new ConcreteContentLessonEntity(id, contentContent, contentTitle); - - // Assert - Assert.Equal(id, concreteContentLessonEntity.Id); - Assert.Equal(contentContent, concreteContentLessonEntity.ContentContent); - Assert.Equal(contentTitle, concreteContentLessonEntity.ContentTitle); - } - - [Fact] - public void Constructor_ShouldSetProperties_WhenCalledWithFourParameters() - { - // Arrange - const int id = 1; - const int lessonId = 2; - const string contentContent = "Content"; - const string contentTitle = "Title"; - - // Act - var concreteContentLessonEntity = new ConcreteContentLessonEntity(id, lessonId, contentContent, contentTitle); - - // Assert - Assert.Equal(id, concreteContentLessonEntity.Id); - Assert.Equal(lessonId, concreteContentLessonEntity.LessonId); - Assert.Equal(contentContent, concreteContentLessonEntity.ContentContent); - Assert.Equal(contentTitle, concreteContentLessonEntity.ContentTitle); - } -} \ No newline at end of file diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestInquiryEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestInquiryEntity.cs index 8b54d26..4a9215f 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestInquiryEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestInquiryEntity.cs @@ -4,15 +4,15 @@ namespace TestEF.EntitiesTests; public class TestInquiryEntity { - private const int _id = 42; - private const string _title = "Title"; - private const string _description = "_description"; - private const bool _isUser = true; + private const int Id = 42; + private const string Title = "Title"; + private const string Description = "_description"; + private const bool IsUser = true; [Fact] public void TestDefaultConstructor() { - InquiryEntity inquiry = new InquiryEntity(); + var inquiry = new InquiryEntity(); Assert.Equal(0, inquiry.Id); Assert.Null(inquiry.Title); Assert.Null(inquiry.Description); @@ -22,8 +22,11 @@ public class TestInquiryEntity [Fact] public void TestConstructorWithOnlyId() { - InquiryEntity inquiry = new InquiryEntity(_id); - Assert.Equal(_id, inquiry.Id); + var inquiry = new InquiryEntity + { + Id = Id + }; + Assert.Equal(Id, inquiry.Id); Assert.Null(inquiry.Title); Assert.Null(inquiry.Description); Assert.False(inquiry.IsUser); @@ -32,20 +35,31 @@ public class TestInquiryEntity [Fact] public void TestConstructorWithoutId() { - InquiryEntity inquiry = new InquiryEntity(_title, _description, _isUser); + var inquiry = new InquiryEntity + { + Title = Title, + Description = Description, + IsUser = 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() { - InquiryEntity inquiry = new InquiryEntity(_id, _title, _description, _isUser); - Assert.Equal(_id, inquiry.Id); - Assert.Equal(_title, inquiry.Title); - Assert.Equal(_description, inquiry.Description); + var inquiry = new InquiryEntity + { + Id = Id, + Title = Title, + Description = Description, + IsUser = IsUser + }; + Assert.Equal(Id, inquiry.Id); + 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/EntitiesTests/TestInquiryTableEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestInquiryTableEntity.cs index 72d4d23..90281fd 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestInquiryTableEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestInquiryTableEntity.cs @@ -1,13 +1,13 @@ using Entities; -namespace TestEF; +namespace TestEF.EntitiesTests; public class TestInquiryTableEntity { - private const int _inquiryId = 42; - private static InquiryEntity _inquiry = new InquiryEntity(); - private const string _databaseName = "Database"; - private const string _connectionInfo = "Connection"; + private const int InquiryId = 42; + private static readonly InquiryEntity Inquiry = new(); + private const string DatabaseName = "Database"; + private const string ConnectionInfo = "Connection"; [Fact] public void TestDefaultConstructor() @@ -22,8 +22,11 @@ public class TestInquiryTableEntity [Fact] public void TestConstructorWithOnlyId() { - InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiryId); - Assert.Equal(_inquiryId, tableEntity.OwnerId); + InquiryTableEntity tableEntity = new InquiryTableEntity + { + OwnerId = InquiryId + }; + Assert.Equal(InquiryId, tableEntity.OwnerId); Assert.Null(tableEntity.Owner); Assert.Null(tableEntity.DatabaseName); Assert.Null(tableEntity.ConnectionInfo); @@ -33,20 +36,30 @@ public class TestInquiryTableEntity [Fact] public void TestConstructorWithoutId() { - InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiry, _databaseName, _connectionInfo); + InquiryTableEntity tableEntity = new InquiryTableEntity + { + Owner = Inquiry, + DatabaseName = DatabaseName, + ConnectionInfo = ConnectionInfo + }; Assert.Equal(0, tableEntity.OwnerId); - Assert.Equal(_inquiry, tableEntity.Owner); - Assert.Equal(_databaseName, tableEntity.DatabaseName); - Assert.Equal(_connectionInfo, tableEntity.ConnectionInfo); + Assert.Equal(Inquiry, tableEntity.Owner); + Assert.Equal(DatabaseName, tableEntity.DatabaseName); + Assert.Equal(ConnectionInfo, tableEntity.ConnectionInfo); } [Fact] public void TestConstructorWithoutNavigationProperty() { - InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiryId, _databaseName, _connectionInfo); - Assert.Equal(_inquiryId, tableEntity.OwnerId); + InquiryTableEntity tableEntity = new InquiryTableEntity + { + OwnerId = InquiryId, + DatabaseName = DatabaseName, + ConnectionInfo = ConnectionInfo + }; + Assert.Equal(InquiryId, tableEntity.OwnerId); Assert.Null(tableEntity.Owner); - Assert.Equal(_databaseName, tableEntity.DatabaseName); - Assert.Equal(_connectionInfo, tableEntity.ConnectionInfo); + Assert.Equal(DatabaseName, tableEntity.DatabaseName); + Assert.Equal(ConnectionInfo, tableEntity.ConnectionInfo); } } \ No newline at end of file diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestLessonEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestLessonEntity.cs index 4566dad..366fa87 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestLessonEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestLessonEntity.cs @@ -1,14 +1,13 @@ using Entities; -using Microsoft.VisualBasic; -namespace TestEF; +namespace TestEF.EntitiesTests; public class TestLessonEntity { - private const int _id = 42; - private const string _title = "Title"; - private const string _lastPublisher = "Last Publisher"; - private static DateOnly _lastEdit = new DateOnly(); + private const int Id = 42; + private const string Title = "Title"; + private const string LastPublisher = "Last Publisher"; + private static readonly DateOnly LastEdit = new(); [Fact] public void TestDefaultConstructor() @@ -17,26 +16,37 @@ public class TestLessonEntity Assert.Equal(0, lesson.Id); Assert.Null(lesson.Title); Assert.Null(lesson.LastPublisher); - Assert.Null(lesson.LastEdit); + Assert.Equal(new DateOnly(0001, 01, 01), LastEdit); } [Fact] public void TestConstructorWithoutId() { - LessonEntity lesson = new LessonEntity(_title, _lastPublisher, _lastEdit); + LessonEntity lesson = new LessonEntity + { + Title = Title, + LastPublisher = LastPublisher, + LastEdit = LastEdit + }; Assert.Equal(0, lesson.Id); - Assert.Equal(_title, lesson.Title); - Assert.Equal(_lastPublisher, lesson.LastPublisher); - Assert.Equal(_lastEdit, lesson.LastEdit); + Assert.Equal(Title, lesson.Title); + Assert.Equal(LastPublisher, lesson.LastPublisher); + Assert.Equal(LastEdit, lesson.LastEdit); } [Fact] public void TestConstructorWithAllAttributes() { - LessonEntity lesson = new LessonEntity(_id, _title, _lastPublisher, _lastEdit); - Assert.Equal(_id, lesson.Id); - Assert.Equal(_title, lesson.Title); - Assert.Equal(_lastPublisher, lesson.LastPublisher); - Assert.Equal(_lastEdit, lesson.LastEdit); + LessonEntity lesson = new LessonEntity + { + Id = Id, + Title = Title, + LastPublisher = LastPublisher, + LastEdit = LastEdit + }; + Assert.Equal(Id, lesson.Id); + Assert.Equal(Title, lesson.Title); + Assert.Equal(LastPublisher, lesson.LastPublisher); + Assert.Equal(LastEdit, lesson.LastEdit); } } \ No newline at end of file diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestNotepadEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestNotepadEntity.cs index 09e5807..0a9796b 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestNotepadEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestNotepadEntity.cs @@ -1,15 +1,15 @@ using Entities; -namespace TestEF; +namespace TestEF.EntitiesTests; public class TestNotepadEntity { - private const int _id = 42; - private const int _userId = 42; - private static UserEntity _userEntity = new UserEntity(); - private const int _inquiryId = 42; - private static InquiryEntity _inquiryEntity = new InquiryEntity(); - private const string _notes = "This is some notes example"; + private const int Id = 42; + private const int UserId = 42; + private static readonly UserEntity UserEntity = new(); + private const int InquiryId = 42; + private static readonly InquiryEntity InquiryEntity = new(); + private const string Notes = "This is some notes example"; [Fact] public void TestDefaultConstructor() @@ -26,24 +26,39 @@ public class TestNotepadEntity [Fact] public void TestConstructorWithoutId() { - NotepadEntity notepad = new NotepadEntity(_userId, _userEntity, _inquiryId, _inquiryEntity, _notes); + NotepadEntity notepad = new NotepadEntity + { + UserId = UserId, + User = UserEntity, + InquiryId = InquiryId, + Inquiry = InquiryEntity, + Notes = Notes + }; Assert.Equal(0, notepad.Id); - Assert.Equal(_userId, notepad.UserId); - Assert.Equal(_userEntity, notepad.User); - Assert.Equal(_inquiryId, notepad.InquiryId); - Assert.Equal(_inquiryEntity, notepad.Inquiry); - Assert.Equal(_notes, notepad.Notes); + Assert.Equal(UserId, notepad.UserId); + Assert.Equal(UserEntity, notepad.User); + Assert.Equal(InquiryId, notepad.InquiryId); + Assert.Equal(InquiryEntity, notepad.Inquiry); + Assert.Equal(Notes, notepad.Notes); } [Fact] public void TestConstructorWithAllAttributes() { - NotepadEntity notepad = new NotepadEntity(_id, _userId, _userEntity, _inquiryId, _inquiryEntity, _notes); - Assert.Equal(_id, notepad.Id); - Assert.Equal(_userId, notepad.UserId); - Assert.Equal(_userEntity, notepad.User); - Assert.Equal(_inquiryId, notepad.InquiryId); - Assert.Equal(_inquiryEntity, notepad.Inquiry); - Assert.Equal(_notes, notepad.Notes); + NotepadEntity notepad = new NotepadEntity + { + Id = Id, + UserId = UserId, + User = UserEntity, + InquiryId = InquiryId, + Inquiry = InquiryEntity, + Notes = Notes + }; + Assert.Equal(Id, notepad.Id); + Assert.Equal(UserId, notepad.UserId); + Assert.Equal(UserEntity, notepad.User); + Assert.Equal(InquiryId, notepad.InquiryId); + Assert.Equal(InquiryEntity, notepad.Inquiry); + Assert.Equal(Notes, notepad.Notes); } } \ No newline at end of file diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestParagraphEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestParagraphEntity.cs index 227a06a..6853fc1 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestParagraphEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestParagraphEntity.cs @@ -1,20 +1,20 @@ using Entities; -namespace TestEF; +namespace TestEF.EntitiesTests; public class TestParagraphEntity { - private const int _id = 42; - private const string _title = "Title"; - private const string _info = "Info"; - private const string _content = "Content"; - private const string _query = "Query"; - private const string _comment = "Comment"; + private const int Id = 42; + private const string Title = "Title"; + private const string Info = "Info"; + private const string Content = "Content"; + private const string Query = "Query"; + private const string Comment = "Comment"; [Fact] public void TestDefaultConstructor() { - ParagraphEntity paragraph = new ParagraphEntity(); + var paragraph = new ParagraphEntity(); Assert.Equal(0, paragraph.Id); Assert.Null(paragraph.Title); Assert.Null(paragraph.Info); @@ -26,25 +26,41 @@ public class TestParagraphEntity [Fact] public void TestConstructorWithoutId() { - ParagraphEntity paragraph = new ParagraphEntity(_title, _content, _info, _query, _comment); + var paragraph = new ParagraphEntity + { + Title = Title, + Content = Content, + Info = Info, + Query = Query, + Comment = Comment + }; 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() { - ParagraphEntity paragraph = new ParagraphEntity(_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); + var paragraph = new ParagraphEntity + { + Id = Id, + Title = Title, + Content = Content, + Info = Info, + Query = Query, + Comment = Comment, + LessonId = 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(10, paragraph.LessonId); } } \ No newline at end of file diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestSolutionEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestSolutionEntity.cs index 8808fd1..6fb2865 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestSolutionEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestSolutionEntity.cs @@ -1,16 +1,16 @@ using Entities; -namespace TestEF; +namespace TestEF.EntitiesTests; public class TestSolutionEntity { - private const string _murdererFirstName = "John"; - private const string _murdererLastName = "Doe"; - private const string _murderPlace = "WhiteHouse"; - private const string _murderWeapon = "Nuclear Bomb"; - private const string _explaination = "This is an explaination"; - private const int _inquiryId = 42; - private static InquiryEntity _inquiry = new InquiryEntity(); + private const string MurdererFirstName = "John"; + private const string MurdererLastName = "Doe"; + private const string MurderPlace = "WhiteHouse"; + private const string MurderWeapon = "Nuclear Bomb"; + private const string Explaination = "This is an explaination"; + private const int InquiryId = 42; + private static readonly InquiryEntity Inquiry = new(); [Fact] public void TestDefaultConstructor() @@ -28,8 +28,11 @@ public class TestSolutionEntity [Fact] public void TestConstructorWithOnlyId() { - SolutionEntity solution = new SolutionEntity(_inquiryId); - Assert.Equal(_inquiryId, solution.OwnerId); + SolutionEntity solution = new SolutionEntity + { + OwnerId = InquiryId + }; + Assert.Equal(InquiryId, solution.OwnerId); Assert.Null(solution.Owner); Assert.Null(solution.MurdererFirstName); Assert.Null(solution.MurdererLastName); @@ -41,29 +44,46 @@ public class TestSolutionEntity [Fact] public void TestConstructorWithoutOwnerId() { - SolutionEntity solution = new SolutionEntity(_inquiry, _murdererFirstName, _murdererLastName, _murderPlace, - _murderWeapon, _explaination); + SolutionEntity solution = new SolutionEntity + { + Owner = Inquiry, + MurdererFirstName = MurdererFirstName, + MurdererLastName = MurdererLastName, + MurderPlace = MurderPlace, + MurderWeapon = MurderWeapon, + Explaination = Explaination + }; + Assert.Equal(0, solution.OwnerId); - Assert.Equal(_inquiry, solution.Owner); - Assert.Equal(_murdererFirstName, solution.MurdererFirstName); - Assert.Equal(_murdererLastName, solution.MurdererLastName); - Assert.Equal(_murderPlace, solution.MurderPlace); - Assert.Equal(_murderWeapon, solution.MurderWeapon); - Assert.Equal(_explaination, solution.Explaination); + Assert.Equal(Inquiry, solution.Owner); + Assert.Equal(MurdererFirstName, solution.MurdererFirstName); + Assert.Equal(MurdererLastName, solution.MurdererLastName); + Assert.Equal(MurderPlace, solution.MurderPlace); + Assert.Equal(MurderWeapon, solution.MurderWeapon); + Assert.Equal(Explaination, solution.Explaination); } [Fact] public void TestConstructorWithAllAttributes() { - SolutionEntity solution = new SolutionEntity(_inquiryId, _inquiry, _murdererFirstName, _murdererLastName, - _murderPlace, _murderWeapon, _explaination); - Assert.Equal(_inquiryId, solution.OwnerId); - Assert.Equal(_inquiry, solution.Owner); - Assert.Equal(_murdererFirstName, solution.MurdererFirstName); - Assert.Equal(_murdererLastName, solution.MurdererLastName); - Assert.Equal(_murderPlace, solution.MurderPlace); - Assert.Equal(_murderWeapon, solution.MurderWeapon); - Assert.Equal(_explaination, solution.Explaination); + SolutionEntity solution = new SolutionEntity + { + OwnerId = InquiryId, + Owner = Inquiry, + MurdererFirstName = MurdererFirstName, + MurdererLastName = MurdererLastName, + MurderPlace = MurderPlace, + MurderWeapon = MurderWeapon, + Explaination = Explaination + }; + + Assert.Equal(InquiryId, solution.OwnerId); + Assert.Equal(Inquiry, solution.Owner); + Assert.Equal(MurdererFirstName, solution.MurdererFirstName); + Assert.Equal(MurdererLastName, solution.MurdererLastName); + Assert.Equal(MurderPlace, solution.MurderPlace); + Assert.Equal(MurderWeapon, solution.MurderWeapon); + Assert.Equal(Explaination, solution.Explaination); } [Fact] @@ -78,8 +98,15 @@ public class TestSolutionEntity const string explanation = "This is an explanation"; // Act - var solutionEntity = new SolutionEntity(ownerId, murdererFirstName, murdererLastName, murderPlace, murderWeapon, - explanation); + var solutionEntity = new SolutionEntity + { + OwnerId = ownerId, + MurdererFirstName = murdererFirstName, + MurdererLastName = murdererLastName, + MurderPlace = murderPlace, + MurderWeapon = murderWeapon, + Explaination = explanation + }; // Assert Assert.Equal(ownerId, solutionEntity.OwnerId); diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestSuccessEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestSuccessEntity.cs index e5a7d50..38fd018 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestSuccessEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestSuccessEntity.cs @@ -1,12 +1,12 @@ using Entities; -namespace TestEF; +namespace TestEF.EntitiesTests; public class TestSuccessEntity { - private const int _userId = 42; - private const int _inquiryId = 7; - private const bool _isFinished = true; + private const int UserId = 42; + private const int InquiryId = 7; + private const bool IsFinished = true; [Fact] public void TestDefaultConstructor() @@ -22,10 +22,15 @@ public class TestSuccessEntity [Fact] public void TestConstructorWithIds() { - SuccessEntity success = new SuccessEntity(_userId, _inquiryId, _isFinished); - Assert.Equal(_userId, success.UserId); + SuccessEntity success = new SuccessEntity + { + UserId = UserId, + InquiryId = InquiryId, + IsFinished = IsFinished + }; + Assert.Equal(UserId, success.UserId); Assert.Null(success.User); - Assert.Equal(_inquiryId, success.InquiryId); + Assert.Equal(InquiryId, success.InquiryId); Assert.Null(success.Inquiry); Assert.True(success.IsFinished); } @@ -35,7 +40,12 @@ public class TestSuccessEntity { UserEntity user = new UserEntity(); InquiryEntity inquiry = new InquiryEntity(); - SuccessEntity success = new SuccessEntity(user, inquiry, _isFinished); + SuccessEntity success = new SuccessEntity + { + User = user, + Inquiry = inquiry, + IsFinished = IsFinished + }; Assert.Equal(0, success.UserId); Assert.NotNull(success.User); Assert.Equal(0, success.InquiryId); @@ -48,10 +58,17 @@ public class TestSuccessEntity { UserEntity user = new UserEntity(); InquiryEntity inquiry = new InquiryEntity(); - SuccessEntity success = new SuccessEntity(_userId, user, _inquiryId, inquiry, _isFinished); - Assert.Equal(_userId, success.UserId); + SuccessEntity success = new SuccessEntity + { + UserId = UserId, + User = user, + InquiryId = InquiryId, + Inquiry = inquiry, + IsFinished = IsFinished + }; + Assert.Equal(UserId, success.UserId); Assert.NotNull(success.User); - Assert.Equal(_inquiryId, success.InquiryId); + Assert.Equal(InquiryId, success.InquiryId); Assert.NotNull(success.Inquiry); Assert.True(success.IsFinished); } diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestUserEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestUserEntity.cs index 7e07927..2a85d28 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestUserEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestUserEntity.cs @@ -1,57 +1,69 @@ using Entities; -namespace TestEF +namespace TestEF.EntitiesTests; + +public class TestUserEntity { - public class TestUserEntity - { - private const string _username = "username"; - private const string _email = "example@email.com"; - private const string _password = "password"; - private const bool _isAdmin = true; - private const int _id = 42; + private const string Username = "username"; + private const string Email = "example@email.com"; + private const string Password = "password"; + private const bool IsAdmin = true; + private const int Id = 42; - [Fact] - public void TestDefaultConstructor() - { - UserEntity user = new UserEntity(); - Assert.Equal(0, user.Id); - Assert.Null(user.Username); - Assert.Null(user.Email); - Assert.Null(user.Password); - Assert.False(user.IsAdmin); - } + [Fact] + public void TestDefaultConstructor() + { + UserEntity user = new UserEntity(); + Assert.Equal(0, user.Id); + Assert.Null(user.Username); + Assert.Null(user.Email); + Assert.Null(user.Password); + Assert.False(user.IsAdmin); + } - [Fact] - public void TestConstructorWithOnlyId() - { - UserEntity user = new UserEntity(_id); - Assert.Equal(_id, user.Id); - Assert.Null(user.Username); - Assert.Null(user.Email); - Assert.Null(user.Password); - Assert.False(user.IsAdmin); - } + [Fact] + public void TestConstructorWithOnlyId() + { + UserEntity user = new UserEntity { Id = Id }; + Assert.Equal(Id, user.Id); + Assert.Null(user.Username); + Assert.Null(user.Email); + Assert.Null(user.Password); + Assert.False(user.IsAdmin); + } - [Fact] - public void TestConstructorWithoutId() + [Fact] + public void TestConstructorWithoutId() + { + UserEntity user = new UserEntity { - UserEntity user = new UserEntity(_username, _password, _email, _isAdmin); - Assert.Equal(0, user.Id); - Assert.Equal(_username, user.Username); - Assert.Equal(_email, user.Email); - Assert.Equal(_password, user.Password); - Assert.True(user.IsAdmin); - } + Username = Username, + Password = Password, + Email = Email, + IsAdmin = IsAdmin + }; + 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() + [Fact] + public void TestConstructorWithoutAllAttributes() + { + UserEntity user = new UserEntity { - UserEntity user = new UserEntity(_id, _username, _password, _email, _isAdmin); - Assert.Equal(_id, user.Id); - Assert.Equal(_username, user.Username); - Assert.Equal(_email, user.Email); - Assert.Equal(_password, user.Password); - Assert.True(user.IsAdmin); - } + Id = Id, + Username = Username, + Password = Password, + Email = Email, + IsAdmin = IsAdmin + }; + Assert.Equal(Id, user.Id); + Assert.Equal(Username, user.Username); + Assert.Equal(Email, user.Email); + Assert.Equal(Password, user.Password); + Assert.True(user.IsAdmin); } } \ No newline at end of file