From 73ba685aa2916f510cab3ba1d96cef7c50a0a076 Mon Sep 17 00:00:00 2001 From: Nestisse Date: Wed, 13 Mar 2024 15:21:13 +0100 Subject: [PATCH 01/15] =?UTF-8?q?Ajout=20de=20la=20strat=C3=A9gie=20pour?= =?UTF-8?q?=20faciliter=20la=20r=C3=A9cup=C3=A9ration=20en=20base=20de=20d?= =?UTF-8?q?onn=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API_SQLuedo/DbContextLib/UserDbContext.cs | 14 +++++++---- .../EntityFramework/ContentLessonEntity.cs | 5 ++-- .../StubbedContextLib/StubbedContext.cs | 23 ++++++++++++++++--- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/API_SQLuedo/DbContextLib/UserDbContext.cs b/API_SQLuedo/DbContextLib/UserDbContext.cs index 6352ab8..b5feec4 100644 --- a/API_SQLuedo/DbContextLib/UserDbContext.cs +++ b/API_SQLuedo/DbContextLib/UserDbContext.cs @@ -12,28 +12,34 @@ namespace DbContextLib public DbSet Inquiry { get; set; } public DbSet InquiryTable { get; set; } public DbSet Lesson { get; set; } - public DbSet ContentLessons { get; set; } public DbSet Paragraph { get; set; } public DbSet Solutions { get; set; } public DbSet Success { get; set; } public DbSet Notepad { get; set; } - public UserDbContext(DbContextOptions options) : base(options) { } + + public UserDbContext(DbContextOptions options) : base(options) + { + } + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { if (!optionsBuilder.IsConfigured) { optionsBuilder.UseNpgsql("Host=localhost;Database=SQLuedo;Username=admin;Password=motdepasse"); } + base.OnConfiguring(optionsBuilder); } protected override void OnModelCreating(ModelBuilder modelBuilder) { - modelBuilder.Entity().HasKey(c => c.LessonId); + // Permet d'avoir les champs de la classe mère dans les classes filles et de ne pas avoir de table pour la classe mère + modelBuilder.Entity().UseTpcMappingStrategy(); + modelBuilder.Entity().HasKey(s => s.UserId); modelBuilder.Entity().HasKey(s => s.InquiryId); modelBuilder.Entity().HasKey(s => s.Id); base.OnModelCreating(modelBuilder); } } -} +} \ No newline at end of file diff --git a/API_SQLuedo/EntityFramework/ContentLessonEntity.cs b/API_SQLuedo/EntityFramework/ContentLessonEntity.cs index ee81947..63ae177 100644 --- a/API_SQLuedo/EntityFramework/ContentLessonEntity.cs +++ b/API_SQLuedo/EntityFramework/ContentLessonEntity.cs @@ -2,14 +2,13 @@ namespace Entities; -[Table("ContentLesson")] public abstract class ContentLessonEntity { public int Id { get; set; } public string ContentContent { get; set; } public string ContentTitle { get; set; } - [ForeignKey(nameof(Lesson))] public int LessonId { get; set; } - public LessonEntity Lesson { get; set; } = null!; + [ForeignKey(nameof(Lesson))] public virtual int LessonId { get; set; } + public virtual LessonEntity Lesson { get; set; } = null!; protected ContentLessonEntity() { diff --git a/API_SQLuedo/StubbedContextLib/StubbedContext.cs b/API_SQLuedo/StubbedContextLib/StubbedContext.cs index e87f12f..0489139 100644 --- a/API_SQLuedo/StubbedContextLib/StubbedContext.cs +++ b/API_SQLuedo/StubbedContextLib/StubbedContext.cs @@ -1,5 +1,4 @@ -using System.Runtime.CompilerServices; -using System.Security.Cryptography; +using System.Security.Cryptography; using DbContextLib; using Entities; using Microsoft.AspNetCore.Cryptography.KeyDerivation; @@ -63,7 +62,25 @@ public class StubbedContext : UserDbContext modelBuilder.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 ra****"), + 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")); + + modelBuilder.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))); + + modelBuilder.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)); } } \ No newline at end of file From 1107d035cb12af00951cb07bae7843156e82b5a8 Mon Sep 17 00:00:00 2001 From: clchieu Date: Fri, 15 Mar 2024 16:43:25 +0100 Subject: [PATCH 02/15] Modification du service de inquiry --- .../API/Controllers/InquiriesController.cs | 2 +- API_SQLuedo/API/Program.cs | 4 +- .../API/Service/InquiryDataServiceAPI.cs | 28 ++--- API_SQLuedo/Shared/InquiryDataService.cs | 101 ------------------ API_SQLuedo/TestConsoleAPI/Program.cs | 9 +- 5 files changed, 25 insertions(+), 119 deletions(-) delete mode 100644 API_SQLuedo/Shared/InquiryDataService.cs diff --git a/API_SQLuedo/API/Controllers/InquiriesController.cs b/API_SQLuedo/API/Controllers/InquiriesController.cs index 045d7a7..25977ab 100644 --- a/API_SQLuedo/API/Controllers/InquiriesController.cs +++ b/API_SQLuedo/API/Controllers/InquiriesController.cs @@ -13,7 +13,7 @@ namespace API.Controllers [ApiController] public class InquiriesController : Controller { - private IInquiryService _inquiryDataService; + private readonly IInquiryService _inquiryDataService; private readonly ILogger _logger; public InquiriesController(IInquiryService inquiryDataService, ILogger logger) diff --git a/API_SQLuedo/API/Program.cs b/API_SQLuedo/API/Program.cs index 338e26c..716256e 100644 --- a/API_SQLuedo/API/Program.cs +++ b/API_SQLuedo/API/Program.cs @@ -24,8 +24,8 @@ builder.Services.AddSwaggerGen(); builder.Services.AddScoped, DbDataManager.Service.UserDataService>(); builder.Services.AddScoped, Shared.UserDataService>(); -builder.Services.AddScoped, DbDataManager.Service.InquiryDataService>(); -builder.Services.AddScoped, Shared.InquiryDataService>(); +builder.Services.AddScoped, InquiryDataService>(); +builder.Services.AddScoped, InquiryDataServiceApi>(); builder.Services.AddScoped, DbDataManager.Service.ParagraphDataService>(); builder.Services.AddScoped, Shared.ParagraphDataService>(); diff --git a/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs b/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs index 7f7ebf4..eb69a91 100644 --- a/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs @@ -1,14 +1,21 @@ -using Entities; +using Dto; +using Entities; using Model.OrderCriteria; using Shared; +using Shared.Mapper; namespace API.Service; -public class InquiryDataServiceApi(IInquiryService inquiryService) : IInquiryService +public class InquiryDataServiceApi(IInquiryService inquiryService) : IInquiryService { - public InquiryEntity CreateInquiry(string title, string description, bool isUser) + public InquiryDTO UpdateInquiry(int id, InquiryDTO inquiry) { - return inquiryService.CreateInquiry(title, description, isUser); + return inquiryService.UpdateInquiry(id, inquiry.FromDTOToEntity()).FromEntityToDTO(); + } + + public InquiryDTO CreateInquiry(string title, string description, bool isUser) + { + return inquiryService.CreateInquiry(title, description, isUser).FromEntityToDTO(); } public bool DeleteInquiry(int id) @@ -16,18 +23,13 @@ public class InquiryDataServiceApi(IInquiryService inquiryService return inquiryService.DeleteInquiry(id); } - public IEnumerable GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria) + public IEnumerable GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria) { var inquiries = inquiryService.GetInquiries(page, number, orderCriteria); - return inquiries.Select(i => i).ToList(); + return inquiries.Select(i => i.FromEntityToDTO()).ToList(); } - public InquiryEntity GetInquiryById(int id) => inquiryService.GetInquiryById(id); + public InquiryDTO GetInquiryById(int id) => inquiryService.GetInquiryById(id).FromEntityToDTO(); - public InquiryEntity GetInquiryByTitle(string title) => inquiryService.GetInquiryByTitle(title); - - public InquiryEntity UpdateInquiry(int id, InquiryEntity inquiry) - { - return inquiryService.UpdateInquiry(id, inquiry); - } + public InquiryDTO GetInquiryByTitle(string title) => inquiryService.GetInquiryByTitle(title).FromEntityToDTO(); } \ No newline at end of file diff --git a/API_SQLuedo/Shared/InquiryDataService.cs b/API_SQLuedo/Shared/InquiryDataService.cs deleted file mode 100644 index 691e24a..0000000 --- a/API_SQLuedo/Shared/InquiryDataService.cs +++ /dev/null @@ -1,101 +0,0 @@ -using Entities; -using Microsoft.EntityFrameworkCore; -using Dto; -using Model.OrderCriteria; -using DbContextLib; -using Shared.Mapper; - -namespace Shared; - -public class InquiryDataService : IInquiryDataService -{ - private UserDbContext DbContext { get; set; } - - public InquiryDataService(UserDbContext context) - { - DbContext = context; - context.Database.EnsureCreated(); - } - - public IEnumerable GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria) - { - IQueryable query = DbContext.Inquiries.Skip((page - 1) * number).Take(number); - switch (orderCriteria) - { - case InquiryOrderCriteria.None: - break; - case InquiryOrderCriteria.ByTitle: - query = query.OrderBy(s => s.Title); - break; - case InquiryOrderCriteria.ByDescription: - query = query.OrderBy(s => s.Description); - break; - case InquiryOrderCriteria.ByIsUser: - query = query.OrderBy(s => s.IsUser); - break; - default: - break; - } - - var inquiries = query.ToList(); - return inquiries.Select(s => s.FromEntityToDTO()); - } - - public InquiryDTO GetInquiryById(int id) - { - var inquiryEntity = DbContext.Inquiries.FirstOrDefault(i => i.Id == id); - if (inquiryEntity == null) - { - throw new ArgumentException("Impossible de trouver l'enquête", nameof(id)); - } - - return inquiryEntity.FromEntityToDTO(); - } - - public InquiryDTO GetInquiryByTitle(string title) - { - var inquiryEntity = DbContext.Inquiries.FirstOrDefault(i => i.Title == title); - if (inquiryEntity == null) - { - throw new ArgumentException("Impossible de trouver l'enquête", nameof(title)); - } - - return inquiryEntity.FromEntityToDTO(); - } - - public InquiryDTO CreateInquiry(string title, string description, bool isUser) - { - var newInquiryEntity = new InquiryDTO(title, description, isUser); - DbContext.Inquiries.Add(newInquiryEntity.FromDTOToEntity()); - DbContext.SaveChangesAsync(); - return newInquiryEntity; - } - - public bool DeleteInquiry(int id) - { - var inquiryEntity = DbContext.Inquiries.FirstOrDefault(u => u.Id == id); - if (inquiryEntity == null) - { - return false; - } - - DbContext.Inquiries.Remove(inquiryEntity); - DbContext.SaveChangesAsync(); - return true; - } - - public InquiryDTO UpdateInquiry(int id, InquiryDTO inquiry) - { - var updatingInquiry = DbContext.Inquiries.FirstOrDefault(u => u.Id == id); - if (updatingInquiry == null) - { - throw new ArgumentException("Impossible de trouver l'enquête", nameof(id)); - } - - updatingInquiry.Title = inquiry.Title; - updatingInquiry.Description = inquiry.Description; - updatingInquiry.IsUser = inquiry.IsUser; - DbContext.SaveChangesAsync(); - return updatingInquiry.FromEntityToDTO(); - } -} \ No newline at end of file diff --git a/API_SQLuedo/TestConsoleAPI/Program.cs b/API_SQLuedo/TestConsoleAPI/Program.cs index 19866e9..07e5a52 100644 --- a/API_SQLuedo/TestConsoleAPI/Program.cs +++ b/API_SQLuedo/TestConsoleAPI/Program.cs @@ -1,14 +1,19 @@ // See https://aka.ms/new-console-template for more information using API.Controllers; +using API.Service; using DbContextLib; +using DbDataManager.Service; using Dto; using Microsoft.AspNetCore.Mvc; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Model.OrderCriteria; -using Shared; +using LessonDataService = Shared.LessonDataService; +using ParagraphDataService = Shared.ParagraphDataService; +using SuccessDataService = Shared.SuccessDataService; +using UserDataService = Shared.UserDataService; var connection = new SqliteConnection("DataSource=:memory:"); connection.Open(); @@ -26,7 +31,7 @@ ILogger successLogger = factory.CreateLogger Date: Fri, 15 Mar 2024 16:55:29 +0100 Subject: [PATCH 03/15] Modification du nom de la racine du projet --- API_SQLuedo/DbDataManager/DbDataManager.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API_SQLuedo/DbDataManager/DbDataManager.csproj b/API_SQLuedo/DbDataManager/DbDataManager.csproj index 42ff6a0..54b34de 100644 --- a/API_SQLuedo/DbDataManager/DbDataManager.csproj +++ b/API_SQLuedo/DbDataManager/DbDataManager.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - ModelToEntities + DbDataManager From fcd258a2df845e57665aa08959b4ad24b6060183 Mon Sep 17 00:00:00 2001 From: clchieu Date: Fri, 15 Mar 2024 16:56:24 +0100 Subject: [PATCH 04/15] Modification des services de lesson --- API_SQLuedo/API/Program.cs | 14 +-- .../API/Service/LessonDataServiceAPI.cs | 25 +++-- .../Service/InquiryDataService.cs | 53 +++++---- .../Service/LessonDataService.cs | 52 ++++++--- API_SQLuedo/Shared/LessonDataService.cs | 103 ------------------ 5 files changed, 88 insertions(+), 159 deletions(-) delete mode 100644 API_SQLuedo/Shared/LessonDataService.cs diff --git a/API_SQLuedo/API/Program.cs b/API_SQLuedo/API/Program.cs index 716256e..060b520 100644 --- a/API_SQLuedo/API/Program.cs +++ b/API_SQLuedo/API/Program.cs @@ -33,8 +33,8 @@ builder.Services.AddScoped, Shared.ParagraphData builder.Services.AddScoped, DbDataManager.Service.SuccessDataService>(); builder.Services.AddScoped, Shared.SuccessDataService>(); -builder.Services.AddScoped, DbDataManager.Service.LessonDataService>(); -builder.Services.AddScoped, Shared.LessonDataService>(); +builder.Services.AddScoped, LessonDataService>(); +builder.Services.AddScoped, LessonDataServiceApi>(); builder.Services.AddDbContext(); builder.Services.AddDbContext(options => options.UseInMemoryDatabase("appDb")); @@ -72,11 +72,11 @@ builder.Services.AddSwaggerGen(option => { Reference = new OpenApiReference { - Type=ReferenceType.SecurityScheme, - Id="Bearer" + Type = ReferenceType.SecurityScheme, + Id = "Bearer" } }, - new string[]{} + new string[] { } } }); }); @@ -86,7 +86,7 @@ var app = builder.Build(); // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { - app.UseSwagger(); + app.UseSwagger(); app.UseSwaggerUI(); } @@ -98,4 +98,4 @@ app.MapControllers(); app.MapIdentityApi(); -app.Run(); +app.Run(); \ No newline at end of file diff --git a/API_SQLuedo/API/Service/LessonDataServiceAPI.cs b/API_SQLuedo/API/Service/LessonDataServiceAPI.cs index 7b26363..391d081 100644 --- a/API_SQLuedo/API/Service/LessonDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/LessonDataServiceAPI.cs @@ -1,26 +1,31 @@ -using Entities; +using Dto; +using Entities; using Model.OrderCriteria; using Shared; +using Shared.Mapper; namespace API.Service; -public class LessonDataServiceApi(ILessonService lessonService) : ILessonService +public class LessonDataServiceApi(ILessonService lessonService) : ILessonService { - public IEnumerable GetLessons(int page, int number, LessonOrderCriteria orderCriteria) + public IEnumerable GetLessons(int page, int number, LessonOrderCriteria orderCriteria) { var lessonsEntities = lessonService.GetLessons(page, number, orderCriteria); - return lessonsEntities.Select(e => e).ToList(); + return lessonsEntities.Select(e => e.FromEntityToDTO()).ToList(); } - public LessonEntity GetLessonById(int id) => lessonService.GetLessonById(id); + public LessonDTO GetLessonById(int id) => lessonService.GetLessonById(id).FromEntityToDTO(); - public LessonEntity GetLessonByTitle(string title) => lessonService.GetLessonByTitle(title); + public LessonDTO GetLessonByTitle(string title) => lessonService.GetLessonByTitle(title).FromEntityToDTO(); public bool DeleteLesson(int id) => lessonService.DeleteLesson(id); - public LessonEntity UpdateLesson(int id, LessonEntity lesson) => - lessonService.UpdateLesson(id, lesson); + public LessonDTO UpdateLesson(int id, LessonDTO lesson) => + lessonService.UpdateLesson(id, lesson.FromDTOToEntity()).FromEntityToDTO(); - public LessonEntity CreateLesson(string title, string lastPublisher, DateOnly? lastEdit) => - lessonService.CreateLesson(title, lastPublisher, lastEdit); + public LessonDTO UpdateLesson(int id, LessonEntity lesson) => + lessonService.UpdateLesson(id, lesson).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/DbDataManager/Service/InquiryDataService.cs b/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs index 2f9b580..df9c2ce 100644 --- a/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs @@ -8,7 +8,7 @@ namespace DbDataManager.Service; public class InquiryDataService : IInquiryService { - private UserDbContext DbContext { get; } + private UserDbContext DbContext { get; set; } public InquiryDataService(UserDbContext context) { @@ -16,9 +16,33 @@ public class InquiryDataService : IInquiryService context.Database.EnsureCreated(); } + public IEnumerable GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria) + { + IQueryable query = DbContext.Inquiries.Skip((page - 1) * number).Take(number); + switch (orderCriteria) + { + case InquiryOrderCriteria.None: + break; + case InquiryOrderCriteria.ByTitle: + query = query.OrderBy(s => s.Title); + break; + case InquiryOrderCriteria.ByDescription: + query = query.OrderBy(s => s.Description); + break; + case InquiryOrderCriteria.ByIsUser: + query = query.OrderBy(s => s.IsUser); + break; + default: + break; + } + + var inquiries = query.ToList(); + return inquiries.Select(s => s); + } + public InquiryEntity GetInquiryById(int id) { - var inquiryEntity = DbContext.Inquiries.FirstOrDefault(u => u.Id == id); + var inquiryEntity = DbContext.Inquiries.FirstOrDefault(i => i.Id == id); if (inquiryEntity == null) { throw new ArgumentException("Impossible de trouver l'enquête", nameof(id)); @@ -29,7 +53,7 @@ public class InquiryDataService : IInquiryService public InquiryEntity GetInquiryByTitle(string title) { - var inquiryEntity = DbContext.Inquiries.FirstOrDefault(u => u.Title == title); + var inquiryEntity = DbContext.Inquiries.FirstOrDefault(i => i.Title == title); if (inquiryEntity == null) { throw new ArgumentException("Impossible de trouver l'enquête", nameof(title)); @@ -38,10 +62,12 @@ public class InquiryDataService : IInquiryService return inquiryEntity; } - public IEnumerable GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria) + public InquiryEntity CreateInquiry(string title, string description, bool isUser) { - return DbContext.Inquiries.Skip((page - 1) * number).Take(number).ToList() - .Select(u => u); + var newInquiryEntity = new InquiryEntity(title, description, isUser); + DbContext.Inquiries.Add(newInquiryEntity); + DbContext.SaveChangesAsync(); + return newInquiryEntity; } public bool DeleteInquiry(int id) @@ -68,22 +94,7 @@ public class InquiryDataService : IInquiryService updatingInquiry.Title = inquiry.Title; updatingInquiry.Description = inquiry.Description; updatingInquiry.IsUser = inquiry.IsUser; - // Permet d'indiquer en Db que l'entité a été modifiée. - DbContext.Entry(updatingInquiry).State = EntityState.Modified; DbContext.SaveChangesAsync(); return updatingInquiry; } - - public InquiryEntity CreateInquiry(string title, string description, bool isUser) - { - var newInquiryEntity = new InquiryEntity() - { - Title = title, - Description = description, - IsUser = isUser, - }; - DbContext.Inquiries.Add(newInquiryEntity); - DbContext.SaveChangesAsync(); - return newInquiryEntity; - } } \ No newline at end of file diff --git a/API_SQLuedo/DbDataManager/Service/LessonDataService.cs b/API_SQLuedo/DbDataManager/Service/LessonDataService.cs index 65ed957..c932f74 100644 --- a/API_SQLuedo/DbDataManager/Service/LessonDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/LessonDataService.cs @@ -1,11 +1,11 @@ -using DbContextLib; -using Entities; -using Microsoft.EntityFrameworkCore; -using Model.OrderCriteria; -using Shared; - -namespace DbDataManager.Service; - +using DbContextLib; +using Entities; +using Microsoft.EntityFrameworkCore; +using Model.OrderCriteria; +using Shared; + +namespace DbDataManager.Service; + public class LessonDataService : ILessonService { private UserDbContext DbContext { get; set; } @@ -16,6 +16,30 @@ public class LessonDataService : ILessonService context.Database.EnsureCreated(); } + public IEnumerable GetLessons(int page, int number, LessonOrderCriteria orderCriteria) + { + IQueryable query = DbContext.Lessons.Skip((page - 1) * number).Take(number); + switch (orderCriteria) + { + case LessonOrderCriteria.None: + break; + case LessonOrderCriteria.ByTitle: + query = query.OrderBy(s => s.Title); + break; + case LessonOrderCriteria.ByLastPublisher: + query = query.OrderBy(s => s.LastPublisher); + break; + case LessonOrderCriteria.ByLastEdit: + query = query.OrderBy(s => s.LastEdit); + break; + default: + break; + } + + var lessons = query.ToList(); + return lessons.Select(s => s); + } + public LessonEntity GetLessonById(int id) { var lessonEntity = DbContext.Lessons.FirstOrDefault(u => u.Id == id); @@ -38,15 +62,9 @@ public class LessonDataService : ILessonService return lessonEntity; } - public IEnumerable GetLessons(int page, int number, LessonOrderCriteria orderCriteria) - { - return DbContext.Lessons.Skip((page - 1) * number).Take(number).ToList() - .Select(u => u); - } - public bool DeleteLesson(int id) { - var lessonEntity = DbContext.Lessons.FirstOrDefault(u => u.Id == id); + var lessonEntity = DbContext.Lessons.FirstOrDefault(l => l.Id == id); if (lessonEntity == null) { return false; @@ -59,7 +77,7 @@ public class LessonDataService : ILessonService public LessonEntity UpdateLesson(int id, LessonEntity lesson) { - var updatingLesson = DbContext.Lessons.FirstOrDefault(u => u.Id == id); + var updatingLesson = DbContext.Lessons.FirstOrDefault(l => l.Id == id); if (updatingLesson == null) { throw new ArgumentException("Impossible de trouver la leçon", nameof(id)); @@ -68,8 +86,6 @@ public class LessonDataService : ILessonService updatingLesson.Title = lesson.Title; updatingLesson.LastPublisher = lesson.LastPublisher; updatingLesson.LastEdit = lesson.LastEdit; - // Permet d'indiquer en Db que l'entité a été modifiée. - DbContext.Entry(updatingLesson).State = EntityState.Modified; DbContext.SaveChangesAsync(); return updatingLesson; } diff --git a/API_SQLuedo/Shared/LessonDataService.cs b/API_SQLuedo/Shared/LessonDataService.cs deleted file mode 100644 index e37b67e..0000000 --- a/API_SQLuedo/Shared/LessonDataService.cs +++ /dev/null @@ -1,103 +0,0 @@ -using DbContextLib; -using Entities; -using Microsoft.EntityFrameworkCore; -using Dto; -using Model.OrderCriteria; -using Shared.Mapper; - -namespace Shared; - -public class LessonDataService : ILessonDataService -{ - private UserDbContext DbContext { get; set; } - public LessonDataService(UserDbContext context) - { - DbContext = context; - context.Database.EnsureCreated(); - } - public IEnumerable GetLessons(int page, int number, LessonOrderCriteria orderCriteria) - { - IQueryable query = DbContext.Lessons.Skip((page - 1) * number).Take(number); - switch (orderCriteria) - { - case LessonOrderCriteria.None: - break; - case LessonOrderCriteria.ByTitle: - query = query.OrderBy(s => s.Title); - break; - case LessonOrderCriteria.ByLastPublisher: - query = query.OrderBy(s => s.LastPublisher); - break; - case LessonOrderCriteria.ByLastEdit: - query = query.OrderBy(s => s.LastEdit); - break; - default: - break; - } - var lessons = query.ToList(); - return lessons.Select(s => s.FromEntityToDTO()); - } - - public LessonDTO GetLessonById(int id) - { - var lessonEntity = DbContext.Lessons.FirstOrDefault(u => u.Id == id); - if (lessonEntity == null) - { - throw new ArgumentException("Impossible de trouver la leçon", nameof(id)); - } - - return lessonEntity.FromEntityToDTO(); - } - - public LessonDTO GetLessonByTitle(string title) - { - var lessonEntity = DbContext.Lessons.FirstOrDefault(u => u.Title == title); - if (lessonEntity == null) - { - throw new ArgumentException("Impossible de trouver la leçon", nameof(title)); - } - - return lessonEntity.FromEntityToDTO(); - } - - public bool DeleteLesson(int id) - { - var lessonEntity = DbContext.Lessons.FirstOrDefault(l => l.Id == id); - if (lessonEntity == null) - { - return false; - } - - DbContext.Lessons.Remove(lessonEntity); - DbContext.SaveChangesAsync(); - return true; - } - - public LessonDTO UpdateLesson(int id, LessonDTO lesson) - { - var updatingLesson = DbContext.Lessons.FirstOrDefault(l => l.Id == id); - if (updatingLesson == null) - { - throw new ArgumentException("Impossible de trouver la leçon", nameof(id)); - } - - updatingLesson.Title = lesson.Title; - updatingLesson.LastPublisher = lesson.LastPublisher; - updatingLesson.LastEdit = lesson.LastEdit; - DbContext.SaveChangesAsync(); - return updatingLesson.FromEntityToDTO(); - } - - public LessonDTO CreateLesson(string title, string lastPublisher, DateOnly? lastEdit) - { - var newLessonEntity = new LessonDTO() - { - Title = title, - LastPublisher = lastPublisher, - LastEdit = lastEdit, - }; - DbContext.Lessons.Add(newLessonEntity.FromDTOToEntity()); - DbContext.SaveChangesAsync(); - return newLessonEntity; - } -} \ No newline at end of file From b4722228bfe83609c1091f18e2445d7b569f37d9 Mon Sep 17 00:00:00 2001 From: clchieu Date: Fri, 15 Mar 2024 16:57:17 +0100 Subject: [PATCH 05/15] Modification du test pour s'adapter aux changements de service --- API_SQLuedo/TestConsoleAPI/Program.cs | 65 +++++++++++++-------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/API_SQLuedo/TestConsoleAPI/Program.cs b/API_SQLuedo/TestConsoleAPI/Program.cs index 07e5a52..5c6486a 100644 --- a/API_SQLuedo/TestConsoleAPI/Program.cs +++ b/API_SQLuedo/TestConsoleAPI/Program.cs @@ -10,16 +10,16 @@ using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Model.OrderCriteria; -using LessonDataService = Shared.LessonDataService; using ParagraphDataService = Shared.ParagraphDataService; +using Service_LessonDataService = DbDataManager.Service.LessonDataService; using SuccessDataService = Shared.SuccessDataService; using UserDataService = Shared.UserDataService; var connection = new SqliteConnection("DataSource=:memory:"); connection.Open(); var options = new DbContextOptionsBuilder() - .UseSqlite(connection) - .Options; + .UseSqlite(connection) + .Options; using ILoggerFactory factory = new LoggerFactory(); ILogger userLogger = factory.CreateLogger(); ILogger inquiryLogger = factory.CreateLogger(); @@ -31,9 +31,11 @@ ILogger successLogger = factory.CreateLogger Date: Fri, 15 Mar 2024 17:02:27 +0100 Subject: [PATCH 06/15] Modification du service de Paragraph --- .../API/Controllers/LessonsController.cs | 2 +- .../API/Controllers/ParagraphsController.cs | 2 +- .../API/Controllers/SuccessesController.cs | 2 +- API_SQLuedo/API/Program.cs | 6 +- .../API/Service/ParagraphDataServiceAPI.cs | 22 ++-- .../Service/ParagraphDataService.cs | 58 ++++++--- API_SQLuedo/Shared/ParagraphDataService.cs | 116 ------------------ API_SQLuedo/TestConsoleAPI/Program.cs | 4 +- 8 files changed, 59 insertions(+), 153 deletions(-) delete mode 100644 API_SQLuedo/Shared/ParagraphDataService.cs diff --git a/API_SQLuedo/API/Controllers/LessonsController.cs b/API_SQLuedo/API/Controllers/LessonsController.cs index eaaec1b..ba99163 100644 --- a/API_SQLuedo/API/Controllers/LessonsController.cs +++ b/API_SQLuedo/API/Controllers/LessonsController.cs @@ -13,7 +13,7 @@ namespace API.Controllers [ApiController] public class LessonsController : Controller { - private ILessonService _lessonDataService; + private readonly ILessonService _lessonDataService; private readonly ILogger _logger; diff --git a/API_SQLuedo/API/Controllers/ParagraphsController.cs b/API_SQLuedo/API/Controllers/ParagraphsController.cs index 9196e21..9be8fd9 100644 --- a/API_SQLuedo/API/Controllers/ParagraphsController.cs +++ b/API_SQLuedo/API/Controllers/ParagraphsController.cs @@ -13,7 +13,7 @@ namespace API.Controllers [ApiController] public class ParagraphsController : Controller { - private IParagraphService _paragraphDataService; + private readonly IParagraphService _paragraphDataService; private readonly ILogger _logger; diff --git a/API_SQLuedo/API/Controllers/SuccessesController.cs b/API_SQLuedo/API/Controllers/SuccessesController.cs index 09df742..a399979 100644 --- a/API_SQLuedo/API/Controllers/SuccessesController.cs +++ b/API_SQLuedo/API/Controllers/SuccessesController.cs @@ -13,7 +13,7 @@ namespace API.Controllers [ApiController] public class SuccessesController : Controller { - private ISuccessService _successDataService; + private readonly ISuccessService _successDataService; private readonly ILogger _logger; diff --git a/API_SQLuedo/API/Program.cs b/API_SQLuedo/API/Program.cs index 060b520..98766d0 100644 --- a/API_SQLuedo/API/Program.cs +++ b/API_SQLuedo/API/Program.cs @@ -6,9 +6,7 @@ using DbDataManager.Service; using Dto; using Entities; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; using Microsoft.OpenApi.Models; using Shared; @@ -27,8 +25,8 @@ builder.Services.AddScoped, Shared.UserDataService>(); builder.Services.AddScoped, InquiryDataService>(); builder.Services.AddScoped, InquiryDataServiceApi>(); -builder.Services.AddScoped, DbDataManager.Service.ParagraphDataService>(); -builder.Services.AddScoped, Shared.ParagraphDataService>(); +builder.Services.AddScoped, ParagraphDataService>(); +builder.Services.AddScoped, ParagraphDataServiceApi>(); builder.Services.AddScoped, DbDataManager.Service.SuccessDataService>(); builder.Services.AddScoped, Shared.SuccessDataService>(); diff --git a/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs b/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs index c29f89d..af09a6b 100644 --- a/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs @@ -1,26 +1,28 @@ -using Entities; +using Dto; +using Entities; using Model.OrderCriteria; using Shared; +using Shared.Mapper; namespace API.Service; -public class ParagraphDataServiceApi(IParagraphService paragraphService) : IParagraphService +public class ParagraphDataServiceApi(IParagraphService paragraphService) : IParagraphService { - public IEnumerable GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria) + public IEnumerable GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria) { var paragraphsEntities = paragraphService.GetParagraphs(page, number, orderCriteria); - return paragraphsEntities.Select(e => e).ToList(); + return paragraphsEntities.Select(e => e.FromEntityToDTO()).ToList(); } - public ParagraphEntity GetParagraphById(int id) => paragraphService.GetParagraphById(id); + public ParagraphDTO GetParagraphById(int id) => paragraphService.GetParagraphById(id).FromEntityToDTO(); - public ParagraphEntity GetParagraphByTitle(string title) => paragraphService.GetParagraphByTitle(title); + public ParagraphDTO GetParagraphByTitle(string title) => paragraphService.GetParagraphByTitle(title).FromEntityToDTO(); public bool DeleteParagraph(int id) => paragraphService.DeleteParagraph(id); - public ParagraphEntity UpdateParagraph(int id, ParagraphEntity paragraph) => - paragraphService.UpdateParagraph(id, paragraph); + public ParagraphDTO UpdateParagraph(int id, ParagraphDTO paragraph) => + paragraphService.UpdateParagraph(id, paragraph.FromDTOToEntity()).FromEntityToDTO(); - public ParagraphEntity CreateParagraph(string title, string content, string info, string query, string comment, int lessonId) => - paragraphService.CreateParagraph(title, content, info, query, comment, lessonId); + public ParagraphDTO CreateParagraph(string title, string content, string info, string query, string comment, int lessonId) => + paragraphService.CreateParagraph(title, content, info, query, comment, lessonId).FromEntityToDTO(); } \ No newline at end of file diff --git a/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs b/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs index d561261..fa92a29 100644 --- a/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs @@ -16,6 +16,36 @@ public class ParagraphDataService : IParagraphService context.Database.EnsureCreated(); } + public IEnumerable GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria) + { + IQueryable query = DbContext.Paragraphs.Skip((page - 1) * number).Take(number); + switch (orderCriteria) + { + case ParagraphOrderCriteria.None: + break; + case ParagraphOrderCriteria.ByTitle: + query = query.OrderBy(s => s.Title); + break; + case ParagraphOrderCriteria.ByContent: + query = query.OrderBy(s => s.Content); + break; + case ParagraphOrderCriteria.ByInfo: + query = query.OrderBy(s => s.Info); + break; + case ParagraphOrderCriteria.ByQuery: + query = query.OrderBy(s => s.Query); + break; + case ParagraphOrderCriteria.ByComment: + query = query.OrderBy(s => s.Comment); + break; + default: + break; + } + + var paragraphs = query.ToList(); + return paragraphs.Select(s => s); + } + public ParagraphEntity GetParagraphById(int id) { var paragraphEntity = DbContext.Paragraphs.FirstOrDefault(u => u.Id == id); @@ -38,15 +68,9 @@ public class ParagraphDataService : IParagraphService return paragraphEntity; } - public IEnumerable GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria) - { - return DbContext.Paragraphs.Skip((page - 1) * number).Take(number).ToList() - .Select(u => u); - } - public bool DeleteParagraph(int id) { - var paragraphEntity = DbContext.Paragraphs.FirstOrDefault(u => u.Id == id); + var paragraphEntity = DbContext.Paragraphs.FirstOrDefault(p => p.Id == id); if (paragraphEntity == null) { return false; @@ -57,27 +81,25 @@ public class ParagraphDataService : IParagraphService return true; } - public ParagraphEntity UpdateParagraph(int id, ParagraphEntity paragraph) + public ParagraphEntity UpdateParagraph(int id, ParagraphEntity paragraphDTO) { - var updatingParagraph = DbContext.Paragraphs.FirstOrDefault(u => u.Id == id); + var updatingParagraph = DbContext.Paragraphs.FirstOrDefault(p => p.Id == id); if (updatingParagraph == null) { throw new ArgumentException("Impossible de trouver le paragraphe", nameof(id)); } - updatingParagraph.Title = paragraph.Title; - updatingParagraph.Content = paragraph.Content; - updatingParagraph.Info = paragraph.Info; - updatingParagraph.Query = paragraph.Query; - updatingParagraph.Comment = paragraph.Comment; - updatingParagraph.LessonId = paragraph.LessonId; - // Permet d'indiquer en Db que l'entité a été modifiée. - DbContext.Entry(updatingParagraph).State = EntityState.Modified; + updatingParagraph.Title = paragraphDTO.Title; + updatingParagraph.Content = paragraphDTO.Content; + updatingParagraph.Info = paragraphDTO.Info; + updatingParagraph.Query = paragraphDTO.Query; + updatingParagraph.Comment = paragraphDTO.Comment; DbContext.SaveChangesAsync(); return updatingParagraph; } - public ParagraphEntity CreateParagraph(string title, string content, string info, string query, string comment, int lessonId) + public ParagraphEntity CreateParagraph(string title, string content, string info, string query, string comment, + int lessonId) { var newParagraphEntity = new ParagraphEntity() { diff --git a/API_SQLuedo/Shared/ParagraphDataService.cs b/API_SQLuedo/Shared/ParagraphDataService.cs deleted file mode 100644 index 7954f78..0000000 --- a/API_SQLuedo/Shared/ParagraphDataService.cs +++ /dev/null @@ -1,116 +0,0 @@ -using Entities; -using Microsoft.EntityFrameworkCore; -using Dto; -using DbContextLib; -using Model.OrderCriteria; -using Shared; -using Shared.Mapper; - -namespace Shared; - -public class ParagraphDataService : IParagraphDataService -{ - private UserDbContext DbContext { get; set; } - public ParagraphDataService(UserDbContext context) - { - DbContext = context; - context.Database.EnsureCreated(); - } - - public IEnumerable GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria) - { - IQueryable query = DbContext.Paragraphs.Skip((page - 1) * number).Take(number); - switch (orderCriteria) - { - case ParagraphOrderCriteria.None: - break; - case ParagraphOrderCriteria.ByTitle: - query = query.OrderBy(s => s.Title); - break; - case ParagraphOrderCriteria.ByContent: - query = query.OrderBy(s => s.Content); - break; - case ParagraphOrderCriteria.ByInfo: - query = query.OrderBy(s => s.Info); - break; - case ParagraphOrderCriteria.ByQuery: - query = query.OrderBy(s => s.Query); - break; - case ParagraphOrderCriteria.ByComment: - query = query.OrderBy(s => s.Comment); - break; - default: - break; - } - var paragraphs = query.ToList(); - return paragraphs.Select(s => s.FromEntityToDTO()); - } - - public ParagraphDTO GetParagraphById(int id) - { - var paragraphEntity = DbContext.Paragraphs.FirstOrDefault(u => u.Id == id); - if (paragraphEntity == null) - { - throw new ArgumentException("Impossible de trouver le paragraphe", nameof(id)); - } - - return paragraphEntity.FromEntityToDTO(); - } - - public ParagraphDTO GetParagraphByTitle(string title) - { - var paragraphEntity = DbContext.Paragraphs.FirstOrDefault(u => u.Title == title); - if (paragraphEntity == null) - { - throw new ArgumentException("Impossible de trouver le paragraphe", nameof(title)); - } - - return paragraphEntity.FromEntityToDTO(); - } - - public bool DeleteParagraph(int id) - { - var paragraphEntity = DbContext.Paragraphs.FirstOrDefault(p => p.Id == id); - if (paragraphEntity == null) - { - return false; - } - - DbContext.Paragraphs.Remove(paragraphEntity); - DbContext.SaveChangesAsync(); - return true; - } - - public ParagraphDTO UpdateParagraph(int id, ParagraphDTO paragraphDTO) - { - var updatingParagraph = DbContext.Paragraphs.FirstOrDefault(p => p.Id == id); - if (updatingParagraph == null) - { - throw new ArgumentException("Impossible de trouver le paragraphe", nameof(id)); - } - - updatingParagraph.Title = paragraphDTO.Title; - updatingParagraph.Content = paragraphDTO.Content; - updatingParagraph.Info = paragraphDTO.Info; - updatingParagraph.Query = paragraphDTO.Query; - updatingParagraph.Comment = paragraphDTO.Comment; - DbContext.SaveChangesAsync(); - return updatingParagraph.FromEntityToDTO(); - } - - public ParagraphDTO CreateParagraph(string title, string content, string info, string query, string comment, int lessonId) - { - var newParagraphEntity = new ParagraphDTO() - { - Title = title, - Content = content, - Info = info, - Query = query, - Comment = comment, - LessonId = lessonId - }; - DbContext.Paragraphs.Add(newParagraphEntity.FromDTOToEntity()); - DbContext.SaveChangesAsync(); - return newParagraphEntity; - } -} \ No newline at end of file diff --git a/API_SQLuedo/TestConsoleAPI/Program.cs b/API_SQLuedo/TestConsoleAPI/Program.cs index 5c6486a..6921e72 100644 --- a/API_SQLuedo/TestConsoleAPI/Program.cs +++ b/API_SQLuedo/TestConsoleAPI/Program.cs @@ -10,8 +10,8 @@ using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Model.OrderCriteria; -using ParagraphDataService = Shared.ParagraphDataService; using Service_LessonDataService = DbDataManager.Service.LessonDataService; +using Service_ParagraphDataService = DbDataManager.Service.ParagraphDataService; using SuccessDataService = Shared.SuccessDataService; using UserDataService = Shared.UserDataService; @@ -33,7 +33,7 @@ using (var context = new UserDbContext(options)) var userController = new UsersController(userLogger, new UserDataService(context)); var inquiryController = new InquiriesController(new InquiryDataServiceApi(new InquiryDataService(context)), inquiryLogger); - var paragraphController = new ParagraphsController(new ParagraphDataService(context), paragraphLogger); + var paragraphController = new ParagraphsController(new ParagraphDataServiceApi(new Service_ParagraphDataService(context)), paragraphLogger); var lessonController = new LessonsController(new LessonDataServiceApi(new Service_LessonDataService(context)), lessonLogger); var successController = new SuccessesController(new SuccessDataService(context), successLogger); From 5686b7267a13b96c340962da1ba7b5995efac37b Mon Sep 17 00:00:00 2001 From: clchieu Date: Fri, 15 Mar 2024 17:07:01 +0100 Subject: [PATCH 07/15] =?UTF-8?q?Am=C3=A9lioration=20du=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/InquiryDataService.cs | 2 +- .../Service/LessonDataService.cs | 2 +- .../Service/ParagraphDataService.cs | 2 +- API_SQLuedo/Shared/SuccessDataService.cs | 103 ------------------ 4 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 API_SQLuedo/Shared/SuccessDataService.cs diff --git a/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs b/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs index df9c2ce..8244c63 100644 --- a/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs @@ -37,7 +37,7 @@ public class InquiryDataService : IInquiryService } var inquiries = query.ToList(); - return inquiries.Select(s => s); + return inquiries; } public InquiryEntity GetInquiryById(int id) diff --git a/API_SQLuedo/DbDataManager/Service/LessonDataService.cs b/API_SQLuedo/DbDataManager/Service/LessonDataService.cs index c932f74..41838ad 100644 --- a/API_SQLuedo/DbDataManager/Service/LessonDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/LessonDataService.cs @@ -37,7 +37,7 @@ public class LessonDataService : ILessonService } var lessons = query.ToList(); - return lessons.Select(s => s); + return lessons; } public LessonEntity GetLessonById(int id) diff --git a/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs b/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs index fa92a29..d50e0fb 100644 --- a/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs @@ -43,7 +43,7 @@ public class ParagraphDataService : IParagraphService } var paragraphs = query.ToList(); - return paragraphs.Select(s => s); + return paragraphs; } public ParagraphEntity GetParagraphById(int id) diff --git a/API_SQLuedo/Shared/SuccessDataService.cs b/API_SQLuedo/Shared/SuccessDataService.cs deleted file mode 100644 index f2f7b88..0000000 --- a/API_SQLuedo/Shared/SuccessDataService.cs +++ /dev/null @@ -1,103 +0,0 @@ -using Entities; -using Microsoft.EntityFrameworkCore; -using Dto; -using DbContextLib; -using Model.OrderCriteria; -using Shared.Mapper; - -namespace Shared; - -public class SuccessDataService : ISuccessDataService -{ - private UserDbContext DbContext { get; set; } - public SuccessDataService(UserDbContext context) - { - DbContext = context; - context.Database.EnsureCreated(); - } - public IEnumerable GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria) - { - IQueryable query = DbContext.Successes.Skip((page - 1) * number).Take(number); - switch (orderCriteria) - { - case SuccessOrderCriteria.None: - break; - case SuccessOrderCriteria.ByUserId: - query = query.OrderBy(s => s.UserId); - break; - case SuccessOrderCriteria.ByInquiryId: - query = query.OrderBy(s => s.InquiryId); - break; - case SuccessOrderCriteria.ByIsFinished: - query = query.OrderBy(s => s.IsFinished); - break; - default: - break; - } - var successes = query.ToList(); - return successes.Select(s => s.FromEntityToDTO()); - } - - public SuccessDTO GetSuccessByUserId(int id) - { - var userEntity = DbContext.Successes.FirstOrDefault(u => u.UserId == id); - if (userEntity == null) - { - throw new ArgumentException("Impossible de trouver le succès", nameof(id)); - } - - return userEntity.FromEntityToDTO(); - } - - public SuccessDTO GetSuccessByInquiryId(int id) - { - var userEntity = DbContext.Successes.FirstOrDefault(u => u.InquiryId == id); - if (userEntity == null) - { - throw new ArgumentException("Impossible de trouver le succès", nameof(id)); - } - - return userEntity.FromEntityToDTO(); - } - - public bool DeleteSuccess(int id) - { - var successEntity = DbContext.Successes.FirstOrDefault(u => u.UserId == id); - if (successEntity == null) - { - return false; - } - - DbContext.Successes.Remove(successEntity); - DbContext.SaveChangesAsync(); - return true; - } - - public SuccessDTO UpdateSuccess(int id, SuccessDTO success) - { - var updatingSuccess = DbContext.Successes.FirstOrDefault(u => u.UserId == id); - if (updatingSuccess == null) - { - throw new ArgumentException("Impossible de trouver le succès", nameof(id)); - } - - updatingSuccess.UserId = success.UserId; - updatingSuccess.InquiryId = success.InquiryId; - updatingSuccess.IsFinished = success.IsFinished; - DbContext.SaveChangesAsync(); - return updatingSuccess.FromEntityToDTO(); - } - - public SuccessDTO CreateSuccess(int userId, int inquiryId, bool isFinished) - { - var newSuccessEntity = new SuccessDTO() - { - UserId = userId, - InquiryId = inquiryId, - IsFinished = isFinished, - }; - DbContext.Successes.Add(newSuccessEntity.FromDTOToEntity()); - DbContext.SaveChangesAsync(); - return newSuccessEntity; - } -} \ No newline at end of file From 4eee15fa4dc630776cab45650a4e3afb144e4b28 Mon Sep 17 00:00:00 2001 From: clchieu Date: Fri, 15 Mar 2024 17:07:21 +0100 Subject: [PATCH 08/15] =?UTF-8?q?Modification=20du=20service=20des=20succ?= =?UTF-8?q?=C3=A8s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API_SQLuedo/API/Program.cs | 4 +- .../API/Service/SuccessDataServiceAPI.cs | 22 ++++---- .../Service/SuccessDataService.cs | 54 ++++++++++++------- API_SQLuedo/TestConsoleAPI/Program.cs | 4 +- 4 files changed, 51 insertions(+), 33 deletions(-) diff --git a/API_SQLuedo/API/Program.cs b/API_SQLuedo/API/Program.cs index 98766d0..286d6a2 100644 --- a/API_SQLuedo/API/Program.cs +++ b/API_SQLuedo/API/Program.cs @@ -28,8 +28,8 @@ builder.Services.AddScoped, InquiryDataServiceApi>() builder.Services.AddScoped, ParagraphDataService>(); builder.Services.AddScoped, ParagraphDataServiceApi>(); -builder.Services.AddScoped, DbDataManager.Service.SuccessDataService>(); -builder.Services.AddScoped, Shared.SuccessDataService>(); +builder.Services.AddScoped, SuccessDataService>(); +builder.Services.AddScoped, SuccessDataServiceApi>(); builder.Services.AddScoped, LessonDataService>(); builder.Services.AddScoped, LessonDataServiceApi>(); diff --git a/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs b/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs index 7433a91..af403c5 100644 --- a/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs @@ -1,26 +1,28 @@ -using Entities; +using Dto; +using Entities; using Model.OrderCriteria; using Shared; +using Shared.Mapper; namespace API.Service; -public class SuccessDataServiceApi(ISuccessService sucessService) : ISuccessService +public class SuccessDataServiceApi(ISuccessService sucessService) : ISuccessService { - public IEnumerable GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria) + public IEnumerable GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria) { var successesEntities = sucessService.GetSuccesses(page, number, orderCriteria); - return successesEntities.Select(e => e).ToList(); + return successesEntities.Select(e => e.FromEntityToDTO()).ToList(); } - public SuccessEntity GetSuccessByUserId(int id) => sucessService.GetSuccessByUserId(id); + public SuccessDTO GetSuccessByUserId(int id) => sucessService.GetSuccessByUserId(id).FromEntityToDTO(); - public SuccessEntity GetSuccessByInquiryId(int id) => sucessService.GetSuccessByInquiryId(id); + public SuccessDTO GetSuccessByInquiryId(int id) => sucessService.GetSuccessByInquiryId(id).FromEntityToDTO(); public bool DeleteSuccess(int id) => sucessService.DeleteSuccess(id); - public SuccessEntity UpdateSuccess(int id, SuccessEntity success) => - sucessService.UpdateSuccess(id, success); + public SuccessDTO UpdateSuccess(int id, SuccessDTO success) => + sucessService.UpdateSuccess(id, success.FromDTOToEntity()).FromEntityToDTO(); - public SuccessEntity CreateSuccess(int userId, int inquiryId, bool isFinished) => - sucessService.CreateSuccess(userId, inquiryId, isFinished); + public SuccessDTO CreateSuccess(int userId, int inquiryId, bool isFinished) => + sucessService.CreateSuccess(userId, inquiryId, isFinished).FromEntityToDTO(); } \ No newline at end of file diff --git a/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs b/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs index 4a079fa..22e3b2e 100644 --- a/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs @@ -16,43 +16,61 @@ public class SuccessDataService : ISuccessService context.Database.EnsureCreated(); } - public SuccessEntity GetSuccessByUserId(int id) + public IEnumerable GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria) { - var successEntity = DbContext.Successes.FirstOrDefault(u => u.UserId == id); - if (successEntity == null) + IQueryable query = DbContext.Successes.Skip((page - 1) * number).Take(number); + switch (orderCriteria) { - throw new ArgumentException("Impossible de trouver le succès avec l'user id", nameof(id)); + case SuccessOrderCriteria.None: + break; + case SuccessOrderCriteria.ByUserId: + query = query.OrderBy(s => s.UserId); + break; + case SuccessOrderCriteria.ByInquiryId: + query = query.OrderBy(s => s.InquiryId); + break; + case SuccessOrderCriteria.ByIsFinished: + query = query.OrderBy(s => s.IsFinished); + break; + default: + break; } - return successEntity; + var successes = query.ToList(); + return successes; } - public SuccessEntity GetSuccessByInquiryId(int id) + public SuccessEntity GetSuccessByUserId(int id) { - var successEntity = DbContext.Successes.FirstOrDefault(u => u.InquiryId == id); - if (successEntity == null) + var userEntity = DbContext.Successes.FirstOrDefault(u => u.UserId == id); + if (userEntity == null) { - throw new ArgumentException("Impossible de trouver le succès avec l'inquiry id", nameof(id)); + throw new ArgumentException("Impossible de trouver le succès", nameof(id)); } - return successEntity; + return userEntity; } - public IEnumerable GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria) + public SuccessEntity GetSuccessByInquiryId(int id) { - return DbContext.Successes.Skip((page - 1) * number).Take(number).ToList() - .Select(u => u); + var userEntity = DbContext.Successes.FirstOrDefault(u => u.InquiryId == id); + if (userEntity == null) + { + throw new ArgumentException("Impossible de trouver le succès", nameof(id)); + } + + return userEntity; } public bool DeleteSuccess(int id) { - var userEntity = DbContext.Successes.FirstOrDefault(u => u.UserId == id); - if (userEntity == null) + var successEntity = DbContext.Successes.FirstOrDefault(u => u.UserId == id); + if (successEntity == null) { return false; } - DbContext.Successes.Remove(userEntity); + DbContext.Successes.Remove(successEntity); DbContext.SaveChangesAsync(); return true; } @@ -62,14 +80,12 @@ public class SuccessDataService : ISuccessService var updatingSuccess = DbContext.Successes.FirstOrDefault(u => u.UserId == id); if (updatingSuccess == null) { - throw new ArgumentException("Impossible de trouver le succès avec l'user id", nameof(id)); + throw new ArgumentException("Impossible de trouver le succès", nameof(id)); } updatingSuccess.UserId = success.UserId; updatingSuccess.InquiryId = success.InquiryId; updatingSuccess.IsFinished = success.IsFinished; - // Permet d'indiquer en Db que l'entité a été modifiée. - DbContext.Entry(updatingSuccess).State = EntityState.Modified; DbContext.SaveChangesAsync(); return updatingSuccess; } diff --git a/API_SQLuedo/TestConsoleAPI/Program.cs b/API_SQLuedo/TestConsoleAPI/Program.cs index 6921e72..9243568 100644 --- a/API_SQLuedo/TestConsoleAPI/Program.cs +++ b/API_SQLuedo/TestConsoleAPI/Program.cs @@ -12,7 +12,7 @@ using Microsoft.Extensions.Logging; using Model.OrderCriteria; using Service_LessonDataService = DbDataManager.Service.LessonDataService; using Service_ParagraphDataService = DbDataManager.Service.ParagraphDataService; -using SuccessDataService = Shared.SuccessDataService; +using Service_SuccessDataService = DbDataManager.Service.SuccessDataService; using UserDataService = Shared.UserDataService; var connection = new SqliteConnection("DataSource=:memory:"); @@ -36,7 +36,7 @@ using (var context = new UserDbContext(options)) var paragraphController = new ParagraphsController(new ParagraphDataServiceApi(new Service_ParagraphDataService(context)), paragraphLogger); var lessonController = new LessonsController(new LessonDataServiceApi(new Service_LessonDataService(context)), lessonLogger); - var successController = new SuccessesController(new SuccessDataService(context), successLogger); + var successController = new SuccessesController(new SuccessDataServiceApi(new Service_SuccessDataService(context)), successLogger); void PrintUsers() { From 1cff605b0d557c782e3d340fb7e1c2312dcdd254 Mon Sep 17 00:00:00 2001 From: clchieu Date: Fri, 15 Mar 2024 17:11:28 +0100 Subject: [PATCH 09/15] :construction: Modification du service User --- API_SQLuedo/API/Program.cs | 4 +- API_SQLuedo/API/Service/UserDataServiceAPI.cs | 22 ++-- .../DbDataManager/Service/UserDataService.cs | 31 ++++- API_SQLuedo/Shared/UserDataService.cs | 121 ------------------ API_SQLuedo/TestConsoleAPI/Program.cs | 11 +- 5 files changed, 45 insertions(+), 144 deletions(-) delete mode 100644 API_SQLuedo/Shared/UserDataService.cs diff --git a/API_SQLuedo/API/Program.cs b/API_SQLuedo/API/Program.cs index 286d6a2..a2ef3df 100644 --- a/API_SQLuedo/API/Program.cs +++ b/API_SQLuedo/API/Program.cs @@ -19,8 +19,8 @@ builder.Services.AddControllers(); builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(); -builder.Services.AddScoped, DbDataManager.Service.UserDataService>(); -builder.Services.AddScoped, Shared.UserDataService>(); +builder.Services.AddScoped, UserDataService>(); +builder.Services.AddScoped, UserDataServiceApi>(); builder.Services.AddScoped, InquiryDataService>(); builder.Services.AddScoped, InquiryDataServiceApi>(); diff --git a/API_SQLuedo/API/Service/UserDataServiceAPI.cs b/API_SQLuedo/API/Service/UserDataServiceAPI.cs index c1d4997..482a679 100644 --- a/API_SQLuedo/API/Service/UserDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/UserDataServiceAPI.cs @@ -1,26 +1,28 @@ -using Entities; +using Dto; +using Entities; using Model.OrderCriteria; using Shared; +using Shared.Mapper; namespace API.Service; -public class UserDataServiceApi(IUserService userService) : IUserService +public class UserDataServiceApi(IUserService userService) : IUserService { - public IEnumerable GetUsers(int page, int number, UserOrderCriteria orderCriteria) + public IEnumerable GetUsers(int page, int number, UserOrderCriteria orderCriteria) { var usersEntities = userService.GetUsers(page, number, orderCriteria); - return usersEntities.Select(e => e).ToList(); + return usersEntities.Select(e => e.FromEntityToDTO()).ToList(); } - public UserEntity GetUserById(int id) => userService.GetUserById(id); + public UserDTO GetUserById(int id) => userService.GetUserById(id).FromEntityToDTO(); - public UserEntity GetUserByUsername(string username) => userService.GetUserByUsername(username); + public UserDTO GetUserByUsername(string username) => userService.GetUserByUsername(username).FromEntityToDTO(); public bool DeleteUser(int id) => userService.DeleteUser(id); - public UserEntity UpdateUser(int id, UserEntity user) => - userService.UpdateUser(id, user); + public UserDTO UpdateUser(int id, UserDTO user) => + userService.UpdateUser(id, user.FromDTOToEntity()).FromEntityToDTO(); - public UserEntity CreateUser(string username, string password, string email, bool isAdmin) => - userService.CreateUser(username, password, email, isAdmin); + public UserDTO CreateUser(string username, string password, string email, bool isAdmin) => + userService.CreateUser(username, password, email, isAdmin).FromEntityToDTO(); } \ No newline at end of file diff --git a/API_SQLuedo/DbDataManager/Service/UserDataService.cs b/API_SQLuedo/DbDataManager/Service/UserDataService.cs index b4de650..b3c30dd 100644 --- a/API_SQLuedo/DbDataManager/Service/UserDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/UserDataService.cs @@ -1,6 +1,5 @@ using DbContextLib; using Entities; -using Microsoft.EntityFrameworkCore; using Model.OrderCriteria; using Shared; @@ -8,7 +7,6 @@ namespace DbDataManager.Service; public class UserDataService : IUserService { - private UserDbContext DbContext { get; set; } public UserDataService(UserDbContext context) @@ -41,8 +39,29 @@ public class UserDataService : IUserService public IEnumerable GetUsers(int page, int number, UserOrderCriteria orderCriteria) { - return DbContext.Users.Skip((page - 1) * number).Take(number).ToList() - .Select(u => u); + IQueryable query = DbContext.Users.Skip((page - 1) * number).Take(number); + switch (orderCriteria) + { + case UserOrderCriteria.None: + break; + case UserOrderCriteria.ById: + query = query.OrderBy(s => s.Id); + break; + case UserOrderCriteria.ByUsername: + query = query.OrderBy(s => s.Username); + break; + case UserOrderCriteria.ByEmail: + query = query.OrderBy(s => s.Email); + break; + case UserOrderCriteria.ByIsAdmin: + query = query.OrderBy(s => s.IsAdmin); + break; + default: + break; + } + + var users = query.ToList(); + return users; } public bool DeleteUser(int id) @@ -70,15 +89,13 @@ public class UserDataService : IUserService updatingUser.Password = user.Password; updatingUser.Email = user.Email; updatingUser.IsAdmin = user.IsAdmin; - // Permet d'indiquer en Db que l'entité a été modifiée. - DbContext.Entry(updatingUser).State = EntityState.Modified; DbContext.SaveChangesAsync(); return updatingUser; } public UserEntity CreateUser(string username, string password, string email, bool isAdmin) { - var newUserEntity = new UserEntity() + var newUserEntity = new UserEntity { Username = username, Password = password, diff --git a/API_SQLuedo/Shared/UserDataService.cs b/API_SQLuedo/Shared/UserDataService.cs deleted file mode 100644 index a90b809..0000000 --- a/API_SQLuedo/Shared/UserDataService.cs +++ /dev/null @@ -1,121 +0,0 @@ -using Dto; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Microsoft.EntityFrameworkCore; -using Entities; -using Shared.Mapper; -using DbContextLib; -using Model.OrderCriteria; - -namespace Shared -{ - public class UserDataService : IUserDataService - { - private UserDbContext DbContext { get; set; } - - public UserDataService(UserDbContext context) - { - DbContext = context; - context.Database.EnsureCreated(); - } - - public UserDTO GetUserById(int id) - { - var userEntity = DbContext.Users.FirstOrDefault(u => u.Id == id); - if (userEntity == null) - { - throw new ArgumentException("Impossible de trouver l'utilisateur", nameof(id)); - } - - return userEntity.FromEntityToDTO(); - - } - - public UserDTO GetUserByUsername(string username) - { - var userEntity = DbContext.Users.FirstOrDefault(u => u.Username == username); - if (userEntity == null) - { - throw new ArgumentException("Impossible de trouver l'utilisateur", nameof(username)); - } - - return userEntity.FromEntityToDTO(); - - } - - public IEnumerable GetUsers(int page, int number, UserOrderCriteria orderCriteria) - { - IQueryable query = DbContext.Users.Skip((page - 1) * number).Take(number); - switch (orderCriteria) - { - case UserOrderCriteria.None: - break; - case UserOrderCriteria.ById: - query = query.OrderBy(s => s.Id); - break; - case UserOrderCriteria.ByUsername: - query = query.OrderBy(s => s.Username); - break; - case UserOrderCriteria.ByEmail: - query = query.OrderBy(s => s.Email); - break; - case UserOrderCriteria.ByIsAdmin: - query = query.OrderBy(s => s.IsAdmin); - break; - default: - break; - } - var users = query.ToList(); - return users.Select(s => s.FromEntityToDTO()); - } - - public bool DeleteUser(int id) - { - var userEntity = DbContext.Users.FirstOrDefault(u => u.Id == id); - if (userEntity == null) - { - return false; - } - - DbContext.Users.Remove(userEntity); - DbContext.SaveChangesAsync(); - return true; - - } - - public UserDTO UpdateUser(int id, UserDTO user) - { - var updatingUser = DbContext.Users.FirstOrDefault(u => u.Id == id); - if (updatingUser == null) - { - throw new ArgumentException("Impossible de trouver l'utilisateur", nameof(id)); - } - - updatingUser.Username = user.Username; - updatingUser.Password = user.Password; - updatingUser.Email = user.Email; - updatingUser.IsAdmin = user.IsAdmin; - DbContext.SaveChangesAsync(); - return updatingUser.FromEntityToDTO(); - - } - - public UserDTO CreateUser(string username, string password, string email, bool isAdmin) - { - var newUserEntity = new UserDTO - { - Username = username, - Password = password, - Email = email, - IsAdmin = isAdmin - }; - DbContext.Users.Add(newUserEntity.FromDTOToEntity()); - DbContext.SaveChangesAsync(); - return newUserEntity; - - } - } -} diff --git a/API_SQLuedo/TestConsoleAPI/Program.cs b/API_SQLuedo/TestConsoleAPI/Program.cs index 9243568..a3b4275 100644 --- a/API_SQLuedo/TestConsoleAPI/Program.cs +++ b/API_SQLuedo/TestConsoleAPI/Program.cs @@ -13,7 +13,7 @@ using Model.OrderCriteria; using Service_LessonDataService = DbDataManager.Service.LessonDataService; using Service_ParagraphDataService = DbDataManager.Service.ParagraphDataService; using Service_SuccessDataService = DbDataManager.Service.SuccessDataService; -using UserDataService = Shared.UserDataService; +using Service_UserDataService = DbDataManager.Service.UserDataService; var connection = new SqliteConnection("DataSource=:memory:"); connection.Open(); @@ -30,13 +30,16 @@ ILogger successLogger = factory.CreateLogger Date: Fri, 15 Mar 2024 17:16:01 +0100 Subject: [PATCH 10/15] =?UTF-8?q?Suppression=20d'interfaces=20typ=C3=A9s?= =?UTF-8?q?=20pour=20rien?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API_SQLuedo/Shared/IInquiryDataService.cs | 14 -------------- API_SQLuedo/Shared/ILessonDataService.cs | 15 --------------- API_SQLuedo/Shared/IParagraphDataService.cs | 14 -------------- API_SQLuedo/Shared/ISuccessDataService.cs | 14 -------------- API_SQLuedo/Shared/IUserDataService.cs | 14 -------------- 5 files changed, 71 deletions(-) delete mode 100644 API_SQLuedo/Shared/IInquiryDataService.cs delete mode 100644 API_SQLuedo/Shared/ILessonDataService.cs delete mode 100644 API_SQLuedo/Shared/IParagraphDataService.cs delete mode 100644 API_SQLuedo/Shared/ISuccessDataService.cs delete mode 100644 API_SQLuedo/Shared/IUserDataService.cs diff --git a/API_SQLuedo/Shared/IInquiryDataService.cs b/API_SQLuedo/Shared/IInquiryDataService.cs deleted file mode 100644 index 79085f6..0000000 --- a/API_SQLuedo/Shared/IInquiryDataService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Dto; -using Model.OrderCriteria; - -namespace Shared; - -public interface IInquiryDataService : IInquiryService -{ - public IEnumerable GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria); - public InquiryDTO GetInquiryById(int id); - public InquiryDTO GetInquiryByTitle(string title); - public bool DeleteInquiry(int id); - public InquiryDTO UpdateInquiry(int id, InquiryDTO inquiry); - public InquiryDTO CreateInquiry(string title, string description, bool isUser); -} \ No newline at end of file diff --git a/API_SQLuedo/Shared/ILessonDataService.cs b/API_SQLuedo/Shared/ILessonDataService.cs deleted file mode 100644 index eb16c98..0000000 --- a/API_SQLuedo/Shared/ILessonDataService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Dto; -using Model.OrderCriteria; - -namespace Shared; - -public interface ILessonDataService : ILessonService -{ - public IEnumerable GetLessons(int page, int number, LessonOrderCriteria orderCriteria); - public LessonDTO GetLessonById(int id); - public LessonDTO GetLessonByTitle(string title); - public bool DeleteLesson(int id); - public LessonDTO UpdateLesson(int id, LessonDTO lesson); - public LessonDTO CreateLesson(string title, string lastPublisher, DateOnly? lastEdit); - -} \ No newline at end of file diff --git a/API_SQLuedo/Shared/IParagraphDataService.cs b/API_SQLuedo/Shared/IParagraphDataService.cs deleted file mode 100644 index 1919860..0000000 --- a/API_SQLuedo/Shared/IParagraphDataService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Dto; -using Model.OrderCriteria; - -namespace Shared; - -public interface IParagraphDataService : IParagraphService -{ - public IEnumerable GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria); - public ParagraphDTO GetParagraphById(int id); - public ParagraphDTO GetParagraphByTitle(string title); - public bool DeleteParagraph(int id); - public ParagraphDTO UpdateParagraph(int id, ParagraphDTO paragraph); - public ParagraphDTO CreateParagraph(string title, string content, string info, string query, string comment, int lessonId); -} \ No newline at end of file diff --git a/API_SQLuedo/Shared/ISuccessDataService.cs b/API_SQLuedo/Shared/ISuccessDataService.cs deleted file mode 100644 index 701024d..0000000 --- a/API_SQLuedo/Shared/ISuccessDataService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Dto; -using Model.OrderCriteria; - -namespace Shared; - -public interface ISuccessDataService : ISuccessService -{ - public IEnumerable GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria); - public SuccessDTO GetSuccessByUserId(int id); - public SuccessDTO GetSuccessByInquiryId(int id); - public bool DeleteSuccess(int id); - public SuccessDTO UpdateSuccess(int id, SuccessDTO success); - public SuccessDTO CreateSuccess(int userId, int inquiryId, bool isFinished); -} \ No newline at end of file diff --git a/API_SQLuedo/Shared/IUserDataService.cs b/API_SQLuedo/Shared/IUserDataService.cs deleted file mode 100644 index 1e615a6..0000000 --- a/API_SQLuedo/Shared/IUserDataService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Dto; -using Model.OrderCriteria; - -namespace Shared; - -public interface IUserDataService : IUserService -{ - public IEnumerable GetUsers(int page, int number, UserOrderCriteria orderCriteria); - public UserDTO GetUserById(int id); - public UserDTO GetUserByUsername(string username); - public bool DeleteUser(int id); - public UserDTO UpdateUser(int id, UserDTO user); - public UserDTO CreateUser(string username, string password, string email, bool isAdmin); -} \ No newline at end of file From 241802f3d587d494580a5287cf0606017792c07a Mon Sep 17 00:00:00 2001 From: clchieu Date: Fri, 15 Mar 2024 17:37:30 +0100 Subject: [PATCH 11/15] Formatage du code --- .../API/Controllers/InquiriesController.cs | 17 ++++-- .../API/Controllers/LessonsController.cs | 16 ++++-- .../API/Controllers/ParagraphsController.cs | 53 ++++++++++++------- .../API/Controllers/SuccessesController.cs | 53 ++++++++++++------- API_SQLuedo/API/Controllers/UserController.cs | 2 +- .../API/Service/ParagraphDataServiceAPI.cs | 9 ++-- API_SQLuedo/API/WebAPIDbContext.cs | 6 ++- API_SQLuedo/DbContextLib/UserDbContext.cs | 9 +++- .../Service/InquiryDataService.cs | 9 ++-- .../Service/LessonDataService.cs | 9 ++-- .../Service/ParagraphDataService.cs | 13 ++--- .../Service/SuccessDataService.cs | 9 ++-- .../DbDataManager/Service/UserDataService.cs | 10 ++-- API_SQLuedo/Dto/InquiryDTO.cs | 2 +- API_SQLuedo/Dto/InquiryTableDTO.cs | 5 +- API_SQLuedo/Dto/LessonDTO.cs | 5 +- API_SQLuedo/Dto/NotepadDTO.cs | 5 +- API_SQLuedo/Dto/ParagraphDTO.cs | 12 ++--- API_SQLuedo/Dto/SolutionDTO.cs | 13 +++-- API_SQLuedo/Dto/SuccessDTO.cs | 4 +- API_SQLuedo/Dto/UserDTO.cs | 5 +- .../EntityFramework/BlackListEntity.cs | 9 ++-- .../EntityFramework/InquiryTableEntity.cs | 6 ++- API_SQLuedo/EntityFramework/LessonEntity.cs | 4 +- API_SQLuedo/EntityFramework/NotepadEntity.cs | 11 ++-- API_SQLuedo/EntityFramework/SolutionEntity.cs | 19 +++++-- API_SQLuedo/EntityFramework/SuccessEntity.cs | 10 ++-- API_SQLuedo/Model/Inquiry.cs | 4 +- API_SQLuedo/Model/InquiryTable.cs | 6 ++- API_SQLuedo/Model/Notepad.cs | 7 ++- .../OrderCriteria/InquiryOrderCriteria.cs | 5 +- .../OrderCriteria/LessonOrderCriteria.cs | 5 +- .../OrderCriteria/ParagraphOrderCriteria.cs | 7 ++- .../OrderCriteria/SuccessOrderCriteria.cs | 5 +- .../Model/OrderCriteria/UserOrderCriteria.cs | 6 ++- API_SQLuedo/Model/Solution.cs | 13 +++-- API_SQLuedo/Model/Success.cs | 4 +- API_SQLuedo/Model/User.cs | 5 +- API_SQLuedo/Shared/IParagraphService.cs | 4 +- .../StubbedContextLib/StubbedContext.cs | 4 +- API_SQLuedo/TestAPI/UnitTest1.cs | 1 - API_SQLuedo/TestConsoleEf/Program.cs | 4 +- .../TestEF/EntitiesTests/TestInquiryEntity.cs | 18 +++---- .../EntitiesTests/TestInquiryTableEntity.cs | 30 +++++------ .../TestEF/EntitiesTests/TestLessonEntity.cs | 20 +++---- .../TestEF/EntitiesTests/TestNotepadEntity.cs | 38 ++++++------- .../EntitiesTests/TestParagraphEntity.cs | 28 +++++----- .../TestEF/EntitiesTests/TestSuccessEntity.cs | 24 ++++----- .../TestEF/EntitiesTests/TestUserEntity.cs | 11 ++-- 49 files changed, 359 insertions(+), 215 deletions(-) diff --git a/API_SQLuedo/API/Controllers/InquiriesController.cs b/API_SQLuedo/API/Controllers/InquiriesController.cs index 25977ab..daa748a 100644 --- a/API_SQLuedo/API/Controllers/InquiriesController.cs +++ b/API_SQLuedo/API/Controllers/InquiriesController.cs @@ -16,6 +16,7 @@ namespace API.Controllers private readonly IInquiryService _inquiryDataService; private readonly ILogger _logger; + public InquiriesController(IInquiryService inquiryDataService, ILogger logger) { _inquiryDataService = inquiryDataService; @@ -33,6 +34,7 @@ namespace API.Controllers _logger.LogError("[ERREUR] Aucune enquête trouvée."); return StatusCode(204); } + _logger.LogInformation("[INFORMATION] {nb} Enquête(s) trouvée(s)", nbInquiry); return Ok(_inquiryDataService.GetInquiries(page, number, orderCriteria)); } @@ -87,7 +89,6 @@ namespace API.Controllers _logger.LogError("[ERREUR] Aucune enquête trouvée avec l'id {id}.", id); return NotFound(); } - } [HttpPost] @@ -99,8 +100,12 @@ namespace API.Controllers { return BadRequest(); } - _logger.LogInformation("[INFORMATION] Une enquête a été créé : title - {title}, description - {description}, isUser - {isUser}", dto.Title, dto.Description, dto.IsUser); - return Created(nameof(GetInquiries), _inquiryDataService.CreateInquiry(dto.Title, dto.Description, dto.IsUser)); + + _logger.LogInformation( + "[INFORMATION] Une enquête a été créé : title - {title}, description - {description}, isUser - {isUser}", + dto.Title, dto.Description, dto.IsUser); + return Created(nameof(GetInquiries), + _inquiryDataService.CreateInquiry(dto.Title, dto.Description, dto.IsUser)); } [HttpPut("inquiry/{id}")] @@ -114,16 +119,20 @@ namespace API.Controllers _logger.LogError("[ERREUR] Problème ID - La mise à jour de l'enquête avec l'id {id} a échouée.", id); return BadRequest(); } + if (!ModelState.IsValid) { - _logger.LogError("[ERREUR] Problème controlleur - La mise à jour de l'enquête avec l'id {id} a échouée.", id); + _logger.LogError( + "[ERREUR] Problème controlleur - La mise à jour de l'enquête avec l'id {id} a échouée.", id); return BadRequest(); } + if (inquiryDTO != null) { _logger.LogInformation("[INFORMATION] La mise à jour de l'enquête avec l'id {id} a été effectuée", id); return Ok(_inquiryDataService.UpdateInquiry(id, inquiryDTO)); } + _logger.LogError("[ERREUR] Aucune enquête trouvée avec l'id {id}.", id); return NotFound(); } diff --git a/API_SQLuedo/API/Controllers/LessonsController.cs b/API_SQLuedo/API/Controllers/LessonsController.cs index ba99163..eae7eb9 100644 --- a/API_SQLuedo/API/Controllers/LessonsController.cs +++ b/API_SQLuedo/API/Controllers/LessonsController.cs @@ -34,6 +34,7 @@ namespace API.Controllers _logger.LogError("[ERREUR] Aucune leçon trouvée."); return StatusCode(204); } + _logger.LogInformation("[INFORMATION] {nb} Leçon(s) trouvée(s)", nbLesson); return Ok(_lessonDataService.GetLessons(page, number, orderCriteria)); } @@ -88,7 +89,6 @@ namespace API.Controllers _logger.LogError("[ERREUR] Aucune leçon trouvée avec l'id {id}.", id); return NotFound(); } - } [HttpPost] @@ -100,8 +100,12 @@ namespace API.Controllers { return BadRequest(); } - _logger.LogInformation("[INFORMATION] Une leçon a été créé : title - {title}, lastPublisher - {publisher}, lastEdit - {lastEdit}", dto.Title, dto.LastPublisher, dto.LastEdit); - return Created(nameof(GetLessons), _lessonDataService.CreateLesson(dto.Title, dto.LastPublisher, dto.LastEdit)); + + _logger.LogInformation( + "[INFORMATION] Une leçon a été créé : title - {title}, lastPublisher - {publisher}, lastEdit - {lastEdit}", + dto.Title, dto.LastPublisher, dto.LastEdit); + return Created(nameof(GetLessons), + _lessonDataService.CreateLesson(dto.Title, dto.LastPublisher, dto.LastEdit)); } [HttpPut("lesson/{id}")] @@ -115,16 +119,20 @@ namespace API.Controllers _logger.LogError("[ERREUR] Problème ID - La mise à jour de la leçon avec l'id {id} a échouée.", id); return BadRequest(); } + if (!ModelState.IsValid) { - _logger.LogError("[ERREUR] Problème controlleur - La mise à jour de la leçon avec l'id {id} a échouée.", id); + _logger.LogError("[ERREUR] Problème controlleur - La mise à jour de la leçon avec l'id {id} a échouée.", + id); return BadRequest(); } + if (lessonDTO != null) { _logger.LogInformation("[INFORMATION] La mise à jour de la leçon avec l'id {id} a été effectuée", id); return Ok(_lessonDataService.UpdateLesson(id, lessonDTO)); } + _logger.LogError("[ERREUR] Aucune leçon trouvée avec l'id {id}.", id); return NotFound(); } diff --git a/API_SQLuedo/API/Controllers/ParagraphsController.cs b/API_SQLuedo/API/Controllers/ParagraphsController.cs index 9be8fd9..7d648ea 100644 --- a/API_SQLuedo/API/Controllers/ParagraphsController.cs +++ b/API_SQLuedo/API/Controllers/ParagraphsController.cs @@ -17,7 +17,8 @@ namespace API.Controllers private readonly ILogger _logger; - public ParagraphsController(IParagraphService paragraphDataService, ILogger logger) + public ParagraphsController(IParagraphService paragraphDataService, + ILogger logger) { _paragraphDataService = paragraphDataService; _logger = logger; @@ -26,14 +27,15 @@ namespace API.Controllers [HttpGet("paragraphs/{page}/{number}/{orderCriteria}")] [ProducesResponseType(typeof(ParagraphDTO), 200)] [ProducesResponseType(typeof(string), 204)] - public IActionResult GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria) + public IActionResult GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria) { - var nbParagraph = ( _paragraphDataService.GetParagraphs(page, number, orderCriteria)).ToList().Count(); - if(nbParagraph == 0) + var nbParagraph = (_paragraphDataService.GetParagraphs(page, number, orderCriteria)).ToList().Count(); + if (nbParagraph == 0) { _logger.LogError("[ERREUR] Aucun paragraphe trouvé."); return StatusCode(204); } + _logger.LogInformation("[INFORMATION] {nb} Paragraphe(s) trouvé(s)", nbParagraph); return Ok(_paragraphDataService.GetParagraphs(page, number, orderCriteria)); } @@ -47,7 +49,8 @@ namespace API.Controllers { _logger.LogInformation("[INFORMATION] Le paragraphe avec l'id {id} a été trouvé.", id); return Ok(_paragraphDataService.GetParagraphById(id)); - } catch (ArgumentException) + } + catch (ArgumentException) { _logger.LogError("[ERREUR] Aucun paragraphe trouvé avec l'id {id}.", id); return NotFound(); @@ -63,12 +66,12 @@ namespace API.Controllers { _logger.LogInformation("[INFORMATION] Le paragraphe avec le titre {title} a été trouvé.", title); return Ok(_paragraphDataService.GetParagraphByTitle(title)); - }catch (ArgumentException) + } + catch (ArgumentException) { _logger.LogError("[ERREUR] Aucun paragraphe trouvé avec le titre {title}.", title); return NotFound(); } - } [HttpDelete("paragraph/{id}")] @@ -77,16 +80,16 @@ namespace API.Controllers public IActionResult DeleteParagraph(int id) { var success = _paragraphDataService.DeleteParagraph(id); - if(success) + if (success) { _logger.LogInformation("[INFORMATION] Le paragraphe avec l'id {id} a été supprimé.", id); return Ok(_paragraphDataService.DeleteParagraph(id)); - } else + } + else { _logger.LogError("[ERREUR] Aucun paragraphe trouvé avec l'id {id}.", id); - return NotFound(); + return NotFound(); } - } [HttpPost] @@ -94,12 +97,18 @@ namespace API.Controllers [ProducesResponseType(typeof(string), 400)] public IActionResult CreateParagraph([FromBody] ParagraphDTO dto) { - if (dto.Title == null || dto.Content == null || dto.Info == null || dto.Query == null || dto.Comment == null) + if (dto.Title == null || dto.Content == null || dto.Info == null || dto.Query == null || + dto.Comment == null) { return BadRequest(); } - _logger.LogInformation("[INFORMATION] Un paragraphe a été créé : title - {title}, content - {content}, info - {info}, query - {query}, comment - {comment}", dto.Title, dto.Content, dto.Info, dto.Query, dto.Comment); - return Created(nameof(GetParagraphs), _paragraphDataService.CreateParagraph(dto.Title, dto.Content, dto.Info, dto.Query, dto.Comment, dto.LessonId)); + + _logger.LogInformation( + "[INFORMATION] Un paragraphe a été créé : title - {title}, content - {content}, info - {info}, query - {query}, comment - {comment}", + dto.Title, dto.Content, dto.Info, dto.Query, dto.Comment); + return Created(nameof(GetParagraphs), + _paragraphDataService.CreateParagraph(dto.Title, dto.Content, dto.Info, dto.Query, dto.Comment, + dto.LessonId)); } [HttpPut("paragraph/{id}")] @@ -108,23 +117,27 @@ namespace API.Controllers [ProducesResponseType(typeof(string), 404)] public IActionResult UpdateParagraph(int id, [FromBody] ParagraphDTO paragraphDTO) { - if(id != paragraphDTO.Id) + if (id != paragraphDTO.Id) { _logger.LogError("[ERREUR] Problème ID - La mise à jour du paragraphe avec l'id {id} a échouée.", id); return BadRequest(); } - if(!ModelState.IsValid) + + if (!ModelState.IsValid) { - _logger.LogError("[ERREUR] Problème controlleur - La mise à jour du paragraphe avec l'id {id} a échouée.", id); + _logger.LogError( + "[ERREUR] Problème controlleur - La mise à jour du paragraphe avec l'id {id} a échouée.", id); return BadRequest(); } - if(paragraphDTO != null) + + if (paragraphDTO != null) { _logger.LogInformation("[INFORMATION] La mise à jour du paragraphe avec l'id {id} a été effectuée", id); return Ok(_paragraphDataService.UpdateParagraph(id, paragraphDTO)); } + _logger.LogError("[ERREUR] Aucun paragraphe trouvé avec l'id {id}.", id); - return NotFound(); + return NotFound(); } } -} +} \ No newline at end of file diff --git a/API_SQLuedo/API/Controllers/SuccessesController.cs b/API_SQLuedo/API/Controllers/SuccessesController.cs index a399979..28b0ddc 100644 --- a/API_SQLuedo/API/Controllers/SuccessesController.cs +++ b/API_SQLuedo/API/Controllers/SuccessesController.cs @@ -26,14 +26,15 @@ namespace API.Controllers [HttpGet("successes/{page}/{number}/{orderCriteria}")] [ProducesResponseType(typeof(SuccessDTO), 200)] [ProducesResponseType(typeof(string), 204)] - public IActionResult GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria) + public IActionResult GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria) { var nbUser = (_successDataService.GetSuccesses(page, number, orderCriteria)).ToList().Count(); - if(nbUser == 0) + if (nbUser == 0) { _logger.LogError("[ERREUR] Aucun utilisateur trouvé."); return StatusCode(204); } + _logger.LogInformation("[INFORMATION] {nb} Utilisateur(s) trouvé(s)", nbUser); return Ok(_successDataService.GetSuccesses(page, number, orderCriteria)); } @@ -47,7 +48,8 @@ namespace API.Controllers { _logger.LogInformation("[INFORMATION] Le succès avec l'id de l'utilisateur {id} a été trouvé.", userId); return Ok(_successDataService.GetSuccessByUserId(userId)); - } catch (ArgumentException) + } + catch (ArgumentException) { _logger.LogError("[ERREUR] Aucun utilisateur trouvé avec l'id de l'utilisateur {id}.", userId); return NotFound(); @@ -61,14 +63,15 @@ namespace API.Controllers { try { - _logger.LogInformation("[INFORMATION] Utilisateur avec l'id de l'enquête {inquiryId} a été trouvé.", inquiryId); + _logger.LogInformation("[INFORMATION] Utilisateur avec l'id de l'enquête {inquiryId} a été trouvé.", + inquiryId); return Ok(_successDataService.GetSuccessByInquiryId(inquiryId)); - }catch (ArgumentException) + } + catch (ArgumentException) { _logger.LogError("[ERREUR] Aucun utilisateur trouvé avec l'id de l'enquête {inquiryId}.", inquiryId); return NotFound(); } - } [HttpDelete("success/{id}")] @@ -77,16 +80,16 @@ namespace API.Controllers public IActionResult DeleteSuccess(int id) { var success = _successDataService.DeleteSuccess(id); - if(success) + if (success) { _logger.LogInformation("[INFORMATION] Le succès avec l'id {id} a été supprimé.", id); return Ok(_successDataService.DeleteSuccess(id)); - } else + } + else { _logger.LogError("[ERREUR] Aucun succès trouvé avec l'id {id}.", id); - return NotFound(); + return NotFound(); } - } [HttpPost] @@ -98,8 +101,11 @@ namespace API.Controllers { return BadRequest(); }*/ - _logger.LogInformation("[INFORMATION] Un succès a été créé : userId - {userId}, inquiryId - {inquiryId}, isFinished - {isFinished}", dto.UserId, dto.InquiryId, dto.IsFinished); - return Created(nameof(GetSuccesses), _successDataService.CreateSuccess(dto.UserId, dto.InquiryId, dto.IsFinished)); + _logger.LogInformation( + "[INFORMATION] Un succès a été créé : userId - {userId}, inquiryId - {inquiryId}, isFinished - {isFinished}", + dto.UserId, dto.InquiryId, dto.IsFinished); + return Created(nameof(GetSuccesses), + _successDataService.CreateSuccess(dto.UserId, dto.InquiryId, dto.IsFinished)); } [HttpPut("success/{id}")] @@ -108,23 +114,30 @@ namespace API.Controllers [ProducesResponseType(typeof(string), 404)] public IActionResult UpdateSuccess(int id, [FromBody] SuccessDTO successDTO) { - if(id != successDTO.UserId) + if (id != successDTO.UserId) { - _logger.LogError("[ERREUR] Problème ID - La mise à jour du succès avec l'id de l'utilisateur {id} a échouée.", id); + _logger.LogError( + "[ERREUR] Problème ID - La mise à jour du succès avec l'id de l'utilisateur {id} a échouée.", id); return BadRequest(); } - if(!ModelState.IsValid) + + if (!ModelState.IsValid) { - _logger.LogError("[ERREUR] Problème controlleur - La mise à jour du succès avec l'id de l'utilisateur {id} a échouée.", id); + _logger.LogError( + "[ERREUR] Problème controlleur - La mise à jour du succès avec l'id de l'utilisateur {id} a échouée.", + id); return BadRequest(); } - if(successDTO != null) + + if (successDTO != null) { - _logger.LogInformation("[INFORMATION] La mise à jour du succès avec l'id de l'utilisateur {id} a été effectuée", id); + _logger.LogInformation( + "[INFORMATION] La mise à jour du succès avec l'id de l'utilisateur {id} a été effectuée", id); return Ok(_successDataService.UpdateSuccess(id, successDTO)); } + _logger.LogError("[ERREUR] Aucun succès trouvé avec l'id de l'utilisateur {id}.", id); - return NotFound(); + return NotFound(); } } -} +} \ No newline at end of file diff --git a/API_SQLuedo/API/Controllers/UserController.cs b/API_SQLuedo/API/Controllers/UserController.cs index 32dbe70..11717a9 100644 --- a/API_SQLuedo/API/Controllers/UserController.cs +++ b/API_SQLuedo/API/Controllers/UserController.cs @@ -72,7 +72,7 @@ namespace API.Controllers if (success) { logger.LogInformation("[INFORMATION] L'utilisateur avec l'id {id} a été supprimé.", id); - return Ok(userService.DeleteUser(id)); + return Ok(); } else { diff --git a/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs b/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs index af09a6b..3892c65 100644 --- a/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/ParagraphDataServiceAPI.cs @@ -6,7 +6,8 @@ using Shared.Mapper; namespace API.Service; -public class ParagraphDataServiceApi(IParagraphService paragraphService) : IParagraphService +public class ParagraphDataServiceApi(IParagraphService paragraphService) + : IParagraphService { public IEnumerable GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria) { @@ -16,13 +17,15 @@ public class ParagraphDataServiceApi(IParagraphService paragrap public ParagraphDTO GetParagraphById(int id) => paragraphService.GetParagraphById(id).FromEntityToDTO(); - public ParagraphDTO GetParagraphByTitle(string title) => paragraphService.GetParagraphByTitle(title).FromEntityToDTO(); + public ParagraphDTO GetParagraphByTitle(string title) => + 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(); - public ParagraphDTO CreateParagraph(string title, string content, string info, string query, string comment, int lessonId) => + public ParagraphDTO CreateParagraph(string title, string content, string info, string query, string comment, + int lessonId) => paragraphService.CreateParagraph(title, content, info, query, comment, lessonId).FromEntityToDTO(); } \ No newline at end of file diff --git a/API_SQLuedo/API/WebAPIDbContext.cs b/API_SQLuedo/API/WebAPIDbContext.cs index afc8996..9a060e7 100644 --- a/API_SQLuedo/API/WebAPIDbContext.cs +++ b/API_SQLuedo/API/WebAPIDbContext.cs @@ -6,6 +6,8 @@ namespace API { public class WebAPIDbContext : IdentityDbContext { - public WebAPIDbContext(DbContextOptions options) : base(options) { } + public WebAPIDbContext(DbContextOptions options) : base(options) + { + } } -} +} \ No newline at end of file diff --git a/API_SQLuedo/DbContextLib/UserDbContext.cs b/API_SQLuedo/DbContextLib/UserDbContext.cs index 0bcf02a..7b48173 100644 --- a/API_SQLuedo/DbContextLib/UserDbContext.cs +++ b/API_SQLuedo/DbContextLib/UserDbContext.cs @@ -17,13 +17,18 @@ namespace DbContextLib public DbSet Solutions { get; set; } public DbSet Successes { get; set; } public DbSet Notepads { get; set; } - public UserDbContext(DbContextOptions options) : base(options) { } + + public UserDbContext(DbContextOptions options) : base(options) + { + } + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { if (!optionsBuilder.IsConfigured) { optionsBuilder.UseNpgsql("Host=localhost;Database=SQLuedo;Username=admin;Password=motdepasse"); } + base.OnConfiguring(optionsBuilder); } @@ -36,4 +41,4 @@ namespace DbContextLib base.OnModelCreating(modelBuilder); } } -} +} \ No newline at end of file diff --git a/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs b/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs index 8244c63..f682367 100644 --- a/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs @@ -91,9 +91,12 @@ public class InquiryDataService : IInquiryService throw new ArgumentException("Impossible de trouver l'enquête", nameof(id)); } - updatingInquiry.Title = inquiry.Title; - updatingInquiry.Description = inquiry.Description; - updatingInquiry.IsUser = inquiry.IsUser; + foreach (var pptt in typeof(InquiryEntity).GetProperties() + .Where(p => p.CanWrite && p.Name != nameof(InquiryEntity.Id))) + { + pptt.SetValue(updatingInquiry, pptt.GetValue(inquiry)); + } + DbContext.SaveChangesAsync(); return updatingInquiry; } diff --git a/API_SQLuedo/DbDataManager/Service/LessonDataService.cs b/API_SQLuedo/DbDataManager/Service/LessonDataService.cs index 41838ad..024096b 100644 --- a/API_SQLuedo/DbDataManager/Service/LessonDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/LessonDataService.cs @@ -83,9 +83,12 @@ public class LessonDataService : ILessonService throw new ArgumentException("Impossible de trouver la leçon", nameof(id)); } - updatingLesson.Title = lesson.Title; - updatingLesson.LastPublisher = lesson.LastPublisher; - updatingLesson.LastEdit = lesson.LastEdit; + foreach (var pptt in typeof(LessonEntity).GetProperties() + .Where(p => p.CanWrite && p.Name != nameof(LessonEntity.Id))) + { + pptt.SetValue(updatingLesson, pptt.GetValue(lesson)); + } + DbContext.SaveChangesAsync(); return updatingLesson; } diff --git a/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs b/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs index d50e0fb..ddf2d34 100644 --- a/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/ParagraphDataService.cs @@ -81,7 +81,7 @@ public class ParagraphDataService : IParagraphService return true; } - public ParagraphEntity UpdateParagraph(int id, ParagraphEntity paragraphDTO) + public ParagraphEntity UpdateParagraph(int id, ParagraphEntity paragraph) { var updatingParagraph = DbContext.Paragraphs.FirstOrDefault(p => p.Id == id); if (updatingParagraph == null) @@ -89,11 +89,12 @@ public class ParagraphDataService : IParagraphService throw new ArgumentException("Impossible de trouver le paragraphe", nameof(id)); } - updatingParagraph.Title = paragraphDTO.Title; - updatingParagraph.Content = paragraphDTO.Content; - updatingParagraph.Info = paragraphDTO.Info; - updatingParagraph.Query = paragraphDTO.Query; - updatingParagraph.Comment = paragraphDTO.Comment; + foreach (var pptt in typeof(ParagraphEntity).GetProperties().Where(p => + p.CanWrite && p.Name != nameof(ParagraphEntity.Id) && p.Name != nameof(ParagraphEntity.LessonId))) + { + pptt.SetValue(updatingParagraph, pptt.GetValue(paragraph)); + } + DbContext.SaveChangesAsync(); return updatingParagraph; } diff --git a/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs b/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs index 22e3b2e..36335d3 100644 --- a/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs @@ -83,9 +83,12 @@ public class SuccessDataService : ISuccessService throw new ArgumentException("Impossible de trouver le succès", nameof(id)); } - updatingSuccess.UserId = success.UserId; - updatingSuccess.InquiryId = success.InquiryId; - updatingSuccess.IsFinished = success.IsFinished; + foreach (var pptt in typeof(SuccessEntity).GetProperties().Where(p => + p.CanWrite && p.Name != nameof(SuccessEntity.UserId) && p.Name != nameof(SuccessEntity.InquiryId))) + { + pptt.SetValue(updatingSuccess, pptt.GetValue(success)); + } + DbContext.SaveChangesAsync(); return updatingSuccess; } diff --git a/API_SQLuedo/DbDataManager/Service/UserDataService.cs b/API_SQLuedo/DbDataManager/Service/UserDataService.cs index b3c30dd..0162348 100644 --- a/API_SQLuedo/DbDataManager/Service/UserDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/UserDataService.cs @@ -85,10 +85,12 @@ public class UserDataService : IUserService throw new ArgumentException("Impossible de trouver l'utilisateur", nameof(id)); } - updatingUser.Username = user.Username; - updatingUser.Password = user.Password; - updatingUser.Email = user.Email; - updatingUser.IsAdmin = user.IsAdmin; + foreach (var pptt in typeof(UserEntity).GetProperties() + .Where(p => p.CanWrite && p.Name != nameof(UserEntity.Id))) + { + pptt.SetValue(updatingUser, pptt.GetValue(user)); + } + DbContext.SaveChangesAsync(); return updatingUser; } diff --git a/API_SQLuedo/Dto/InquiryDTO.cs b/API_SQLuedo/Dto/InquiryDTO.cs index 5a436ed..f3df8a3 100644 --- a/API_SQLuedo/Dto/InquiryDTO.cs +++ b/API_SQLuedo/Dto/InquiryDTO.cs @@ -2,7 +2,7 @@ public class InquiryDTO { - public int Id { get;} + public int Id { get; } public string Title { get; set; } diff --git a/API_SQLuedo/Dto/InquiryTableDTO.cs b/API_SQLuedo/Dto/InquiryTableDTO.cs index a636053..6c28790 100644 --- a/API_SQLuedo/Dto/InquiryTableDTO.cs +++ b/API_SQLuedo/Dto/InquiryTableDTO.cs @@ -2,12 +2,13 @@ public class InquiryTableDTO { - public int OwnerId { get; set; } public string DatabaseName { get; set; } public string ConnectionInfo { get; set; } - public InquiryTableDTO() { } + public InquiryTableDTO() + { + } public InquiryTableDTO(int ownerId, string databaseName, string connectionInfo) { diff --git a/API_SQLuedo/Dto/LessonDTO.cs b/API_SQLuedo/Dto/LessonDTO.cs index 8e70b4f..ab8008f 100644 --- a/API_SQLuedo/Dto/LessonDTO.cs +++ b/API_SQLuedo/Dto/LessonDTO.cs @@ -8,7 +8,10 @@ public class LessonDTO public DateOnly? LastEdit { get; set; } public ICollection Content { get; set; } = new List(); - public LessonDTO() { } + public LessonDTO() + { + } + public LessonDTO(int id, string title, string lastPublisher, DateOnly? lastEdit) { Id = id; diff --git a/API_SQLuedo/Dto/NotepadDTO.cs b/API_SQLuedo/Dto/NotepadDTO.cs index c49e155..0c14762 100644 --- a/API_SQLuedo/Dto/NotepadDTO.cs +++ b/API_SQLuedo/Dto/NotepadDTO.cs @@ -7,7 +7,9 @@ public class NotepadDTO public int InquiryId { get; set; } public string Notes { get; set; } - public NotepadDTO() { } + public NotepadDTO() + { + } public NotepadDTO(int id, int userId, int inquiryId, string notes) { @@ -16,6 +18,7 @@ public class NotepadDTO InquiryId = inquiryId; Notes = notes; } + public NotepadDTO(int userId, int inquiryId, string notes) { UserId = userId; diff --git a/API_SQLuedo/Dto/ParagraphDTO.cs b/API_SQLuedo/Dto/ParagraphDTO.cs index f6925dd..9e08d8f 100644 --- a/API_SQLuedo/Dto/ParagraphDTO.cs +++ b/API_SQLuedo/Dto/ParagraphDTO.cs @@ -19,7 +19,7 @@ public class ParagraphDTO : ContentLessonDTO Comment = comment; } - public ParagraphDTO(int id, string title, string content, string info, string query, string comment, int lessonId) : + public ParagraphDTO(int id, string title, string content, string info, string query, string comment, int lessonId) : base(id, content, title, lessonId) { @@ -29,9 +29,9 @@ public class ParagraphDTO : ContentLessonDTO Info = info; Query = query; Comment = comment; - } - - public ParagraphDTO() : base() - { - } + } + + public ParagraphDTO() : base() + { + } } \ No newline at end of file diff --git a/API_SQLuedo/Dto/SolutionDTO.cs b/API_SQLuedo/Dto/SolutionDTO.cs index b13daf6..e5087c2 100644 --- a/API_SQLuedo/Dto/SolutionDTO.cs +++ b/API_SQLuedo/Dto/SolutionDTO.cs @@ -8,8 +8,13 @@ public class SolutionDTO public string MurderPlace { get; set; } public string MurderWeapon { get; set; } public string Explanation { get; set; } - public SolutionDTO() { } - public SolutionDTO(int ownerId, string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation) + + public SolutionDTO() + { + } + + public SolutionDTO(int ownerId, string murdererFirstName, string murdererLastName, string murderPlace, + string murderWeapon, string explanation) { OwnerId = ownerId; MurdererFirstName = murdererFirstName; @@ -18,7 +23,9 @@ public class SolutionDTO MurderWeapon = murderWeapon; Explanation = explanation; } - public SolutionDTO(string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation) + + public SolutionDTO(string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, + string explanation) { MurdererFirstName = murdererFirstName; MurdererLastName = murdererLastName; diff --git a/API_SQLuedo/Dto/SuccessDTO.cs b/API_SQLuedo/Dto/SuccessDTO.cs index 87c26a3..579f209 100644 --- a/API_SQLuedo/Dto/SuccessDTO.cs +++ b/API_SQLuedo/Dto/SuccessDTO.cs @@ -6,7 +6,9 @@ public class SuccessDTO public int InquiryId { get; set; } public bool IsFinished { get; set; } - public SuccessDTO() { } + public SuccessDTO() + { + } public SuccessDTO(int userId, int inquiryId, bool isFinished) { diff --git a/API_SQLuedo/Dto/UserDTO.cs b/API_SQLuedo/Dto/UserDTO.cs index b2553f5..85d6ac7 100644 --- a/API_SQLuedo/Dto/UserDTO.cs +++ b/API_SQLuedo/Dto/UserDTO.cs @@ -8,7 +8,10 @@ public class UserDTO public string Email { get; set; } public bool IsAdmin { get; set; } - public UserDTO() { } + public UserDTO() + { + } + public UserDTO(int id, string username, string password, string email, bool isAdmin) { Id = id; diff --git a/API_SQLuedo/EntityFramework/BlackListEntity.cs b/API_SQLuedo/EntityFramework/BlackListEntity.cs index e4b744b..8a2ce16 100644 --- a/API_SQLuedo/EntityFramework/BlackListEntity.cs +++ b/API_SQLuedo/EntityFramework/BlackListEntity.cs @@ -6,10 +6,13 @@ namespace Entities; [Table("BlackList")] public class BlackListEntity { - [Key] - public string Email { get; set; } + [Key] public string Email { get; set; } public DateOnly ExpirationDate { get; set; } - public BlackListEntity() { } + + public BlackListEntity() + { + } + public BlackListEntity(string email, DateOnly expirationDate) { Email = email; diff --git a/API_SQLuedo/EntityFramework/InquiryTableEntity.cs b/API_SQLuedo/EntityFramework/InquiryTableEntity.cs index c8798b9..3fe43db 100644 --- a/API_SQLuedo/EntityFramework/InquiryTableEntity.cs +++ b/API_SQLuedo/EntityFramework/InquiryTableEntity.cs @@ -11,16 +11,20 @@ public class InquiryTableEntity [DatabaseGenerated(DatabaseGeneratedOption.Identity)] [Required] public int OwnerId { get; set; } + public InquiryEntity Owner { get; set; } public string DatabaseName { get; set; } public string ConnectionInfo { get; set; } - public InquiryTableEntity() { } + public InquiryTableEntity() + { + } public InquiryTableEntity(int inquiryId) { OwnerId = inquiryId; } + public InquiryTableEntity(int inquiryId, string databaseName, string connectionInfo) { OwnerId = inquiryId; diff --git a/API_SQLuedo/EntityFramework/LessonEntity.cs b/API_SQLuedo/EntityFramework/LessonEntity.cs index 902465e..6bf5436 100644 --- a/API_SQLuedo/EntityFramework/LessonEntity.cs +++ b/API_SQLuedo/EntityFramework/LessonEntity.cs @@ -11,7 +11,9 @@ public class LessonEntity public DateOnly? LastEdit { get; set; } public ICollection Content { get; set; } = new List(); - public LessonEntity() { } + public LessonEntity() + { + } public LessonEntity(int id, string title, string lastPublisher, DateOnly? lastEdit) { diff --git a/API_SQLuedo/EntityFramework/NotepadEntity.cs b/API_SQLuedo/EntityFramework/NotepadEntity.cs index 0a3f9c9..da47cd9 100644 --- a/API_SQLuedo/EntityFramework/NotepadEntity.cs +++ b/API_SQLuedo/EntityFramework/NotepadEntity.cs @@ -7,16 +7,16 @@ public class NotepadEntity { public int Id { get; set; } - [ForeignKey(nameof(User))] - public int UserId { get; set; } + [ForeignKey(nameof(User))] public int UserId { get; set; } public UserEntity User { get; set; } - [ForeignKey(nameof(Inquiry))] - public int InquiryId { get; set; } + [ForeignKey(nameof(Inquiry))] public int InquiryId { get; set; } public InquiryEntity Inquiry { get; set; } public string Notes { get; set; } - public NotepadEntity() { } + public NotepadEntity() + { + } public NotepadEntity(int id, int userId, UserEntity user, int inquiryId, InquiryEntity inquiry, string notes) { @@ -27,6 +27,7 @@ public class NotepadEntity Inquiry = inquiry; Notes = notes; } + public NotepadEntity(int userId, UserEntity user, int inquiryId, InquiryEntity inquiry, string notes) { UserId = userId; diff --git a/API_SQLuedo/EntityFramework/SolutionEntity.cs b/API_SQLuedo/EntityFramework/SolutionEntity.cs index 8b57c1a..9f10225 100644 --- a/API_SQLuedo/EntityFramework/SolutionEntity.cs +++ b/API_SQLuedo/EntityFramework/SolutionEntity.cs @@ -11,18 +11,25 @@ public class SolutionEntity [DatabaseGenerated(DatabaseGeneratedOption.Identity)] [Required] 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() + { + } + public SolutionEntity(int ownerId) { OwnerId = ownerId; } - public SolutionEntity(int ownerId, InquiryEntity? owner, string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explaination) + + public SolutionEntity(int ownerId, InquiryEntity? owner, string murdererFirstName, string murdererLastName, + string murderPlace, string murderWeapon, string explaination) { OwnerId = ownerId; Owner = owner; @@ -32,7 +39,9 @@ public class SolutionEntity MurderWeapon = murderWeapon; Explaination = explaination; } - public SolutionEntity(InquiryEntity? owner, string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explaination) + + public SolutionEntity(InquiryEntity? owner, string murdererFirstName, string murdererLastName, string murderPlace, + string murderWeapon, string explaination) { Owner = owner; MurdererFirstName = murdererFirstName; @@ -41,7 +50,9 @@ public class SolutionEntity MurderWeapon = murderWeapon; Explaination = explaination; } - public SolutionEntity(int ownerId, string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation) + + public SolutionEntity(int ownerId, string murdererFirstName, string murdererLastName, string murderPlace, + string murderWeapon, string explanation) { OwnerId = ownerId; MurdererFirstName = murdererFirstName; diff --git a/API_SQLuedo/EntityFramework/SuccessEntity.cs b/API_SQLuedo/EntityFramework/SuccessEntity.cs index 10f21a9..4a69b11 100644 --- a/API_SQLuedo/EntityFramework/SuccessEntity.cs +++ b/API_SQLuedo/EntityFramework/SuccessEntity.cs @@ -5,16 +5,16 @@ namespace Entities; [Table("Success")] public class SuccessEntity { - [ForeignKey(nameof(User))] - public int UserId { get; set; } + [ForeignKey(nameof(User))] public int UserId { get; set; } public UserEntity User { get; set; } - [ForeignKey(nameof(Inquiry))] - public int InquiryId { get; set; } + [ForeignKey(nameof(Inquiry))] public int InquiryId { get; set; } public InquiryEntity Inquiry { get; set; } public bool IsFinished { get; set; } - public SuccessEntity() { } + public SuccessEntity() + { + } public SuccessEntity(int userId, UserEntity user, int inquiryId, InquiryEntity inquiry, bool isFinished) { diff --git a/API_SQLuedo/Model/Inquiry.cs b/API_SQLuedo/Model/Inquiry.cs index d2a805f..464d7df 100644 --- a/API_SQLuedo/Model/Inquiry.cs +++ b/API_SQLuedo/Model/Inquiry.cs @@ -7,7 +7,9 @@ public class Inquiry public string Description { get; set; } public bool IsUser { get; set; } - public Inquiry() { } + public Inquiry() + { + } public Inquiry(int id, string title, string description, bool isUser) { diff --git a/API_SQLuedo/Model/InquiryTable.cs b/API_SQLuedo/Model/InquiryTable.cs index 060702a..ecca3f4 100644 --- a/API_SQLuedo/Model/InquiryTable.cs +++ b/API_SQLuedo/Model/InquiryTable.cs @@ -6,12 +6,14 @@ public class InquiryTable public string DatabaseName { get; set; } public string ConnectionInfo { get; set; } - public InquiryTable() { } + public InquiryTable() + { + } + public InquiryTable(int inquiryId, string databaseName, string connectionInfo) { OwnerId = inquiryId; DatabaseName = databaseName; ConnectionInfo = connectionInfo; } - } \ No newline at end of file diff --git a/API_SQLuedo/Model/Notepad.cs b/API_SQLuedo/Model/Notepad.cs index ce91168..989990d 100644 --- a/API_SQLuedo/Model/Notepad.cs +++ b/API_SQLuedo/Model/Notepad.cs @@ -7,7 +7,9 @@ public class Notepad public int InquiryId { get; set; } public string Notes { get; set; } - public Notepad() { } + public Notepad() + { + } public Notepad(int id, int userId, int inquiryId, string notes) { @@ -16,7 +18,8 @@ public class Notepad InquiryId = inquiryId; Notes = notes; } - public Notepad(int userId, int inquiryId, string notes) + + public Notepad(int userId, int inquiryId, string notes) { UserId = userId; InquiryId = inquiryId; diff --git a/API_SQLuedo/Model/OrderCriteria/InquiryOrderCriteria.cs b/API_SQLuedo/Model/OrderCriteria/InquiryOrderCriteria.cs index bc40b5d..f800b0e 100644 --- a/API_SQLuedo/Model/OrderCriteria/InquiryOrderCriteria.cs +++ b/API_SQLuedo/Model/OrderCriteria/InquiryOrderCriteria.cs @@ -2,5 +2,8 @@ namespace Model.OrderCriteria; public enum InquiryOrderCriteria { - None, ByTitle, ByDescription, ByIsUser + None, + ByTitle, + ByDescription, + ByIsUser } \ No newline at end of file diff --git a/API_SQLuedo/Model/OrderCriteria/LessonOrderCriteria.cs b/API_SQLuedo/Model/OrderCriteria/LessonOrderCriteria.cs index 004879c..db06097 100644 --- a/API_SQLuedo/Model/OrderCriteria/LessonOrderCriteria.cs +++ b/API_SQLuedo/Model/OrderCriteria/LessonOrderCriteria.cs @@ -2,5 +2,8 @@ namespace Model.OrderCriteria; public enum LessonOrderCriteria { - None, ByTitle, ByLastPublisher, ByLastEdit + None, + ByTitle, + ByLastPublisher, + ByLastEdit } \ No newline at end of file diff --git a/API_SQLuedo/Model/OrderCriteria/ParagraphOrderCriteria.cs b/API_SQLuedo/Model/OrderCriteria/ParagraphOrderCriteria.cs index bd9cc93..5cdf11d 100644 --- a/API_SQLuedo/Model/OrderCriteria/ParagraphOrderCriteria.cs +++ b/API_SQLuedo/Model/OrderCriteria/ParagraphOrderCriteria.cs @@ -2,5 +2,10 @@ namespace Model.OrderCriteria; public enum ParagraphOrderCriteria { - None, ByTitle, ByContent, ByInfo, ByQuery, ByComment + None, + ByTitle, + ByContent, + ByInfo, + ByQuery, + ByComment } \ No newline at end of file diff --git a/API_SQLuedo/Model/OrderCriteria/SuccessOrderCriteria.cs b/API_SQLuedo/Model/OrderCriteria/SuccessOrderCriteria.cs index a2c8d76..34c8b46 100644 --- a/API_SQLuedo/Model/OrderCriteria/SuccessOrderCriteria.cs +++ b/API_SQLuedo/Model/OrderCriteria/SuccessOrderCriteria.cs @@ -2,5 +2,8 @@ namespace Model.OrderCriteria; public enum SuccessOrderCriteria { - None, ByUserId, ByInquiryId, ByIsFinished + None, + ByUserId, + ByInquiryId, + ByIsFinished } \ No newline at end of file diff --git a/API_SQLuedo/Model/OrderCriteria/UserOrderCriteria.cs b/API_SQLuedo/Model/OrderCriteria/UserOrderCriteria.cs index 42ab10c..c5b35b9 100644 --- a/API_SQLuedo/Model/OrderCriteria/UserOrderCriteria.cs +++ b/API_SQLuedo/Model/OrderCriteria/UserOrderCriteria.cs @@ -2,5 +2,9 @@ namespace Model.OrderCriteria; public enum UserOrderCriteria { - None, ById, ByUsername, ByEmail, ByIsAdmin + None, + ById, + ByUsername, + ByEmail, + ByIsAdmin } \ No newline at end of file diff --git a/API_SQLuedo/Model/Solution.cs b/API_SQLuedo/Model/Solution.cs index bee801b..8d167f8 100644 --- a/API_SQLuedo/Model/Solution.cs +++ b/API_SQLuedo/Model/Solution.cs @@ -8,8 +8,13 @@ public class Solution public string MurderPlace { get; set; } public string MurderWeapon { get; set; } public string Explanation { get; set; } - public Solution() { } - public Solution(int ownerId, string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation) + + public Solution() + { + } + + public Solution(int ownerId, string murdererFirstName, string murdererLastName, string murderPlace, + string murderWeapon, string explanation) { OwnerId = ownerId; MurdererFirstName = murdererFirstName; @@ -18,7 +23,9 @@ public class Solution MurderWeapon = murderWeapon; Explanation = explanation; } - public Solution(string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation) + + public Solution(string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, + string explanation) { MurdererFirstName = murdererFirstName; MurdererLastName = murdererLastName; diff --git a/API_SQLuedo/Model/Success.cs b/API_SQLuedo/Model/Success.cs index 1301b0f..4d4cc09 100644 --- a/API_SQLuedo/Model/Success.cs +++ b/API_SQLuedo/Model/Success.cs @@ -6,7 +6,9 @@ public class Success public int InquiryId { get; set; } public bool IsFinished { get; set; } - public Success() { } + public Success() + { + } public Success(int userId, int inquiryId, bool isFinished) { diff --git a/API_SQLuedo/Model/User.cs b/API_SQLuedo/Model/User.cs index 8031378..88dff7f 100644 --- a/API_SQLuedo/Model/User.cs +++ b/API_SQLuedo/Model/User.cs @@ -8,7 +8,10 @@ public class User public string Email { get; set; } public bool IsAdmin { get; set; } - public User() { } + public User() + { + } + public User(int id, string username, string password, string email, bool isAdmin) { Id = id; diff --git a/API_SQLuedo/Shared/IParagraphService.cs b/API_SQLuedo/Shared/IParagraphService.cs index 7b59ede..aa2fe7a 100644 --- a/API_SQLuedo/Shared/IParagraphService.cs +++ b/API_SQLuedo/Shared/IParagraphService.cs @@ -9,6 +9,8 @@ namespace Shared public TParagraph GetParagraphByTitle(string title); public bool DeleteParagraph(int id); public TParagraph UpdateParagraph(int id, TParagraph paragraph); - public TParagraph CreateParagraph(string title, string content, string info, string query, string comment, int lessonId); + + public TParagraph CreateParagraph(string title, string content, string info, string query, string comment, + int lessonId); } } \ No newline at end of file diff --git a/API_SQLuedo/StubbedContextLib/StubbedContext.cs b/API_SQLuedo/StubbedContextLib/StubbedContext.cs index 925eb10..fec0d75 100644 --- a/API_SQLuedo/StubbedContextLib/StubbedContext.cs +++ b/API_SQLuedo/StubbedContextLib/StubbedContext.cs @@ -47,7 +47,7 @@ public class StubbedContext : UserDbContext prf: KeyDerivationPrf.HMACSHA256, iterationCount: 100000, numBytesRequested: 256 / 8)), "Victor.GABORIT@etu.uca.fr", true)); - + modelBuilder.Entity().HasData( new InquiryTableEntity(1, "Inquiry1", "Server=localhost;Database=Inquiry1;Trusted_Connection=True;MultipleActiveResultSets=true"), @@ -60,7 +60,7 @@ public class StubbedContext : UserDbContext 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 ra****"), new SolutionEntity(3, "Erwan", "Menager", "La salle de bain", "L'arachide", "Parce que c'est Erwan")); - + modelBuilder.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), diff --git a/API_SQLuedo/TestAPI/UnitTest1.cs b/API_SQLuedo/TestAPI/UnitTest1.cs index c22e82f..161aaab 100644 --- a/API_SQLuedo/TestAPI/UnitTest1.cs +++ b/API_SQLuedo/TestAPI/UnitTest1.cs @@ -5,7 +5,6 @@ namespace TestAPI [Fact] public void Test1() { - } } } \ No newline at end of file diff --git a/API_SQLuedo/TestConsoleEf/Program.cs b/API_SQLuedo/TestConsoleEf/Program.cs index fb63a8f..7921b88 100644 --- a/API_SQLuedo/TestConsoleEf/Program.cs +++ b/API_SQLuedo/TestConsoleEf/Program.cs @@ -159,10 +159,10 @@ 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; foreach (var pptt in typeof(SolutionEntity).GetProperties() diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestInquiryEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestInquiryEntity.cs index bee3d00..8b54d26 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestInquiryEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestInquiryEntity.cs @@ -18,7 +18,7 @@ public class TestInquiryEntity Assert.Null(inquiry.Description); Assert.False(inquiry.IsUser); } - + [Fact] public void TestConstructorWithOnlyId() { @@ -28,24 +28,24 @@ public class TestInquiryEntity Assert.Null(inquiry.Description); Assert.False(inquiry.IsUser); } - + [Fact] public void TestConstructorWithoutId() { - InquiryEntity inquiry = new InquiryEntity(_title,_description,_isUser); + InquiryEntity inquiry = new InquiryEntity(_title, _description, _isUser); Assert.Equal(0, inquiry.Id); - Assert.Equal(_title,inquiry.Title); - Assert.Equal(_description,inquiry.Description); + Assert.Equal(_title, inquiry.Title); + Assert.Equal(_description, inquiry.Description); Assert.True(inquiry.IsUser); } - + [Fact] public void TestConstructorWithAllAttributes() { - InquiryEntity inquiry = new InquiryEntity(_id,_title,_description,_isUser); + InquiryEntity inquiry = new InquiryEntity(_id, _title, _description, _isUser); Assert.Equal(_id, inquiry.Id); - Assert.Equal(_title,inquiry.Title); - Assert.Equal(_description,inquiry.Description); + Assert.Equal(_title, inquiry.Title); + Assert.Equal(_description, inquiry.Description); Assert.True(inquiry.IsUser); } } \ No newline at end of file diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestInquiryTableEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestInquiryTableEntity.cs index 7751046..72d4d23 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestInquiryTableEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestInquiryTableEntity.cs @@ -13,40 +13,40 @@ public class TestInquiryTableEntity public void TestDefaultConstructor() { InquiryTableEntity tableEntity = new InquiryTableEntity(); - Assert.Equal(0,tableEntity.OwnerId); + Assert.Equal(0, tableEntity.OwnerId); Assert.Null(tableEntity.Owner); Assert.Null(tableEntity.DatabaseName); Assert.Null(tableEntity.ConnectionInfo); } - + [Fact] public void TestConstructorWithOnlyId() { InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiryId); - Assert.Equal(_inquiryId,tableEntity.OwnerId); + Assert.Equal(_inquiryId, tableEntity.OwnerId); Assert.Null(tableEntity.Owner); Assert.Null(tableEntity.DatabaseName); Assert.Null(tableEntity.ConnectionInfo); } - - + + [Fact] public void TestConstructorWithoutId() { - InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiry,_databaseName,_connectionInfo); - Assert.Equal(0,tableEntity.OwnerId); - Assert.Equal(_inquiry,tableEntity.Owner); - Assert.Equal(_databaseName,tableEntity.DatabaseName); - Assert.Equal(_connectionInfo,tableEntity.ConnectionInfo); + InquiryTableEntity tableEntity = new InquiryTableEntity(_inquiry, _databaseName, _connectionInfo); + Assert.Equal(0, tableEntity.OwnerId); + 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(_inquiryId, _databaseName, _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 42a02d1..4566dad 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestLessonEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestLessonEntity.cs @@ -19,24 +19,24 @@ public class TestLessonEntity Assert.Null(lesson.LastPublisher); Assert.Null(lesson.LastEdit); } - + [Fact] public void TestConstructorWithoutId() { - LessonEntity lesson = new LessonEntity(_title,_lastPublisher,_lastEdit); + LessonEntity lesson = new LessonEntity(_title, _lastPublisher, _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); + 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); + 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 4d3ba35..09e5807 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestNotepadEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestNotepadEntity.cs @@ -15,35 +15,35 @@ public class TestNotepadEntity public void TestDefaultConstructor() { NotepadEntity notepad = new NotepadEntity(); - Assert.Equal(0,notepad.Id); - Assert.Equal(0,notepad.UserId); + Assert.Equal(0, notepad.Id); + Assert.Equal(0, notepad.UserId); Assert.Null(notepad.User); - Assert.Equal(0,notepad.InquiryId); + Assert.Equal(0, notepad.InquiryId); Assert.Null(notepad.Inquiry); Assert.Null(notepad.Notes); } - + [Fact] public void TestConstructorWithoutId() { - NotepadEntity notepad = new NotepadEntity(_userId,_userEntity,_inquiryId,_inquiryEntity,_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); + NotepadEntity notepad = new NotepadEntity(_userId, _userEntity, _inquiryId, _inquiryEntity, _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); } - + [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, _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); } } \ No newline at end of file diff --git a/API_SQLuedo/TestEF/EntitiesTests/TestParagraphEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestParagraphEntity.cs index 1f2228d..227a06a 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestParagraphEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestParagraphEntity.cs @@ -22,29 +22,29 @@ public class TestParagraphEntity Assert.Null(paragraph.Query); Assert.Null(paragraph.Comment); } - + [Fact] public void TestConstructorWithoutId() { - ParagraphEntity paragraph = new ParagraphEntity(_title,_content,_info,_query,_comment); + ParagraphEntity paragraph = new ParagraphEntity(_title, _content, _info, _query, _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); + 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); + 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/TestSuccessEntity.cs b/API_SQLuedo/TestEF/EntitiesTests/TestSuccessEntity.cs index 251a00a..e5a7d50 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestSuccessEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestSuccessEntity.cs @@ -12,46 +12,46 @@ public class TestSuccessEntity public void TestDefaultConstructor() { SuccessEntity success = new SuccessEntity(); - Assert.Equal(0,success.UserId); + Assert.Equal(0, success.UserId); Assert.Null(success.User); - Assert.Equal(0,success.InquiryId); + Assert.Equal(0, success.InquiryId); Assert.Null(success.Inquiry); Assert.False(success.IsFinished); } - + [Fact] public void TestConstructorWithIds() { SuccessEntity success = new SuccessEntity(_userId, _inquiryId, _isFinished); - Assert.Equal(_userId,success.UserId); + 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); } - + [Fact] public void TestConstructorWithNavigationProperties() { UserEntity user = new UserEntity(); InquiryEntity inquiry = new InquiryEntity(); SuccessEntity success = new SuccessEntity(user, inquiry, _isFinished); - Assert.Equal(0,success.UserId); + Assert.Equal(0, success.UserId); Assert.NotNull(success.User); - Assert.Equal(0,success.InquiryId); + Assert.Equal(0, success.InquiryId); Assert.NotNull(success.Inquiry); Assert.True(success.IsFinished); } - + [Fact] public void TestConstructorWithAllAttributes() { 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, user, _inquiryId, inquiry, _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 8f99022..7e07927 100644 --- a/API_SQLuedo/TestEF/EntitiesTests/TestUserEntity.cs +++ b/API_SQLuedo/TestEF/EntitiesTests/TestUserEntity.cs @@ -9,11 +9,12 @@ namespace TestEF 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.Equal(0, user.Id); Assert.Null(user.Username); Assert.Null(user.Email); Assert.Null(user.Password); @@ -24,7 +25,7 @@ namespace TestEF public void TestConstructorWithOnlyId() { UserEntity user = new UserEntity(_id); - Assert.Equal(_id,user.Id); + Assert.Equal(_id, user.Id); Assert.Null(user.Username); Assert.Null(user.Email); Assert.Null(user.Password); @@ -35,18 +36,18 @@ namespace TestEF public void TestConstructorWithoutId() { UserEntity user = new UserEntity(_username, _password, _email, _isAdmin); - Assert.Equal(0,user.Id); + Assert.Equal(0, user.Id); Assert.Equal(_username, user.Username); Assert.Equal(_email, user.Email); Assert.Equal(_password, user.Password); Assert.True(user.IsAdmin); } - + [Fact] public void TestConstructorWithoutAllAttributes() { UserEntity user = new UserEntity(_id, _username, _password, _email, _isAdmin); - Assert.Equal(_id,user.Id); + Assert.Equal(_id, user.Id); Assert.Equal(_username, user.Username); Assert.Equal(_email, user.Email); Assert.Equal(_password, user.Password); From bbf5448dabea0bd449e58b2cadbe5f0b33d3c3b9 Mon Sep 17 00:00:00 2001 From: clchieu Date: Fri, 15 Mar 2024 17:44:00 +0100 Subject: [PATCH 12/15] =?UTF-8?q?Ajout=20de=20contraintes=20sur=20les=20pa?= =?UTF-8?q?ram=C3=A8tres=20donn=C3=A9s=20dans=20les=20controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/Controllers/InquiriesController.cs | 6 ++--- .../API/Controllers/LessonsController.cs | 4 +-- .../API/Controllers/ParagraphsController.cs | 6 ++--- .../API/Controllers/SuccessesController.cs | 26 +++++++++---------- API_SQLuedo/API/Controllers/UserController.cs | 6 ++--- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/API_SQLuedo/API/Controllers/InquiriesController.cs b/API_SQLuedo/API/Controllers/InquiriesController.cs index daa748a..d35db6d 100644 --- a/API_SQLuedo/API/Controllers/InquiriesController.cs +++ b/API_SQLuedo/API/Controllers/InquiriesController.cs @@ -23,7 +23,7 @@ namespace API.Controllers _logger = logger; } - [HttpGet("inquiries/{page}/{number}/{orderCriteria}")] + [HttpGet("inquiries/{page:int}/{number:int}/{orderCriteria}")] [ProducesResponseType(typeof(InquiryDTO), 200)] [ProducesResponseType(typeof(string), 204)] public IActionResult GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria) @@ -73,7 +73,7 @@ namespace API.Controllers } } - [HttpDelete("inquiry/{id}")] + [HttpDelete("inquiry/{id:int}")] [ProducesResponseType(typeof(InquiryDTO), 200)] [ProducesResponseType(typeof(string), 404)] public IActionResult DeleteInquiry(int id) @@ -108,7 +108,7 @@ namespace API.Controllers _inquiryDataService.CreateInquiry(dto.Title, dto.Description, dto.IsUser)); } - [HttpPut("inquiry/{id}")] + [HttpPut("inquiry/{id:int}")] [ProducesResponseType(typeof(InquiryDTO), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] diff --git a/API_SQLuedo/API/Controllers/LessonsController.cs b/API_SQLuedo/API/Controllers/LessonsController.cs index eae7eb9..bfb0738 100644 --- a/API_SQLuedo/API/Controllers/LessonsController.cs +++ b/API_SQLuedo/API/Controllers/LessonsController.cs @@ -73,7 +73,7 @@ namespace API.Controllers } } - [HttpDelete("lesson/{id}")] + [HttpDelete("lesson/{id:int}")] [ProducesResponseType(typeof(LessonDTO), 200)] [ProducesResponseType(typeof(string), 404)] public IActionResult DeleteLesson(int id) @@ -108,7 +108,7 @@ namespace API.Controllers _lessonDataService.CreateLesson(dto.Title, dto.LastPublisher, dto.LastEdit)); } - [HttpPut("lesson/{id}")] + [HttpPut("lesson/{id:int}")] [ProducesResponseType(typeof(LessonDTO), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] diff --git a/API_SQLuedo/API/Controllers/ParagraphsController.cs b/API_SQLuedo/API/Controllers/ParagraphsController.cs index 7d648ea..df0bfff 100644 --- a/API_SQLuedo/API/Controllers/ParagraphsController.cs +++ b/API_SQLuedo/API/Controllers/ParagraphsController.cs @@ -24,7 +24,7 @@ namespace API.Controllers _logger = logger; } - [HttpGet("paragraphs/{page}/{number}/{orderCriteria}")] + [HttpGet("paragraphs/{page:int}/{number:int}/{orderCriteria}")] [ProducesResponseType(typeof(ParagraphDTO), 200)] [ProducesResponseType(typeof(string), 204)] public IActionResult GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria) @@ -74,7 +74,7 @@ namespace API.Controllers } } - [HttpDelete("paragraph/{id}")] + [HttpDelete("paragraph/{id:int}")] [ProducesResponseType(typeof(ParagraphDTO), 200)] [ProducesResponseType(typeof(string), 404)] public IActionResult DeleteParagraph(int id) @@ -111,7 +111,7 @@ namespace API.Controllers dto.LessonId)); } - [HttpPut("paragraph/{id}")] + [HttpPut("paragraph/{id:int}")] [ProducesResponseType(typeof(ParagraphDTO), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] diff --git a/API_SQLuedo/API/Controllers/SuccessesController.cs b/API_SQLuedo/API/Controllers/SuccessesController.cs index 28b0ddc..ca9a8a6 100644 --- a/API_SQLuedo/API/Controllers/SuccessesController.cs +++ b/API_SQLuedo/API/Controllers/SuccessesController.cs @@ -23,12 +23,12 @@ namespace API.Controllers _logger = logger; } - [HttpGet("successes/{page}/{number}/{orderCriteria}")] + [HttpGet("successes/{page:int}/{number:int}/{orderCriteria}")] [ProducesResponseType(typeof(SuccessDTO), 200)] [ProducesResponseType(typeof(string), 204)] public IActionResult GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria) { - var nbUser = (_successDataService.GetSuccesses(page, number, orderCriteria)).ToList().Count(); + var nbUser = _successDataService.GetSuccesses(page, number, orderCriteria).ToList().Count; if (nbUser == 0) { _logger.LogError("[ERREUR] Aucun utilisateur trouvé."); @@ -42,39 +42,39 @@ namespace API.Controllers [HttpGet("success/user/{id:int}")] [ProducesResponseType(typeof(SuccessDTO), 200)] [ProducesResponseType(typeof(string), 404)] - public IActionResult GetSuccessByUserId(int userId) + public IActionResult GetSuccessByUserId(int id) { try { - _logger.LogInformation("[INFORMATION] Le succès avec l'id de l'utilisateur {id} a été trouvé.", userId); - return Ok(_successDataService.GetSuccessByUserId(userId)); + _logger.LogInformation("[INFORMATION] Le succès avec l'id de l'utilisateur {id} a été trouvé.", id); + return Ok(_successDataService.GetSuccessByUserId(id)); } catch (ArgumentException) { - _logger.LogError("[ERREUR] Aucun utilisateur trouvé avec l'id de l'utilisateur {id}.", userId); + _logger.LogError("[ERREUR] Aucun utilisateur trouvé avec l'id de l'utilisateur {id}.", id); return NotFound(); } } - [HttpGet("success/inquiry/{inquiryId:int}")] + [HttpGet("success/inquiry/{id:int}")] [ProducesResponseType(typeof(SuccessDTO), 200)] [ProducesResponseType(typeof(string), 404)] - public IActionResult GetSuccessByInquiryId(int inquiryId) + public IActionResult GetSuccessByInquiryId(int id) { try { _logger.LogInformation("[INFORMATION] Utilisateur avec l'id de l'enquête {inquiryId} a été trouvé.", - inquiryId); - return Ok(_successDataService.GetSuccessByInquiryId(inquiryId)); + id); + return Ok(_successDataService.GetSuccessByInquiryId(id)); } catch (ArgumentException) { - _logger.LogError("[ERREUR] Aucun utilisateur trouvé avec l'id de l'enquête {inquiryId}.", inquiryId); + _logger.LogError("[ERREUR] Aucun utilisateur trouvé avec l'id de l'enquête {inquiryId}.", id); return NotFound(); } } - [HttpDelete("success/{id}")] + [HttpDelete("success/{id:int}")] [ProducesResponseType(typeof(SuccessDTO), 200)] [ProducesResponseType(typeof(string), 404)] public IActionResult DeleteSuccess(int id) @@ -108,7 +108,7 @@ namespace API.Controllers _successDataService.CreateSuccess(dto.UserId, dto.InquiryId, dto.IsFinished)); } - [HttpPut("success/{id}")] + [HttpPut("success/{id:int}")] [ProducesResponseType(typeof(SuccessDTO), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] diff --git a/API_SQLuedo/API/Controllers/UserController.cs b/API_SQLuedo/API/Controllers/UserController.cs index 11717a9..63fe068 100644 --- a/API_SQLuedo/API/Controllers/UserController.cs +++ b/API_SQLuedo/API/Controllers/UserController.cs @@ -13,7 +13,7 @@ namespace API.Controllers [ApiController] public class UsersController(ILogger logger, IUserService userService) : ControllerBase { - [HttpGet("users/{page}/{number}")] + [HttpGet("users/{page:int}/{number:int}")] [ProducesResponseType(typeof(UserDTO), 200)] [ProducesResponseType(typeof(string), 204)] public IActionResult GetUsers(int page, int number, UserOrderCriteria orderCriteria) @@ -63,7 +63,7 @@ namespace API.Controllers } } - [HttpDelete("user/{id}")] + [HttpDelete("user/{id:int}")] [ProducesResponseType(typeof(UserDTO), 200)] [ProducesResponseType(typeof(string), 404)] public IActionResult DeleteUser(int id) @@ -99,7 +99,7 @@ namespace API.Controllers userService.CreateUser(dto.Username, dto.Password, dto.Email, dto.IsAdmin)); } - [HttpPut("user/{id}")] + [HttpPut("user/{id:int}")] [ProducesResponseType(typeof(UserDTO), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] From 3f7e5be073f92fb4a944a4bc7fa2a0d86347a87b Mon Sep 17 00:00:00 2001 From: clchieu Date: Fri, 15 Mar 2024 17:48:24 +0100 Subject: [PATCH 13/15] Ajout de contraintes dans les controllers --- API_SQLuedo/API/Controllers/LessonsController.cs | 2 +- API_SQLuedo/API/Controllers/ParagraphsController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/API_SQLuedo/API/Controllers/LessonsController.cs b/API_SQLuedo/API/Controllers/LessonsController.cs index bfb0738..dfbbd14 100644 --- a/API_SQLuedo/API/Controllers/LessonsController.cs +++ b/API_SQLuedo/API/Controllers/LessonsController.cs @@ -23,7 +23,7 @@ namespace API.Controllers _logger = logger; } - [HttpGet("lessons/{page}/{number}/{orderCriteria}")] + [HttpGet("lessons/{page:int}/{number:int}/{orderCriteria}")] [ProducesResponseType(typeof(LessonDTO), 200)] [ProducesResponseType(typeof(string), 204)] public IActionResult GetLessons(int page, int number, LessonOrderCriteria orderCriteria) diff --git a/API_SQLuedo/API/Controllers/ParagraphsController.cs b/API_SQLuedo/API/Controllers/ParagraphsController.cs index df0bfff..c6d64a5 100644 --- a/API_SQLuedo/API/Controllers/ParagraphsController.cs +++ b/API_SQLuedo/API/Controllers/ParagraphsController.cs @@ -29,7 +29,7 @@ namespace API.Controllers [ProducesResponseType(typeof(string), 204)] public IActionResult GetParagraphs(int page, int number, ParagraphOrderCriteria orderCriteria) { - var nbParagraph = (_paragraphDataService.GetParagraphs(page, number, orderCriteria)).ToList().Count(); + var nbParagraph = _paragraphDataService.GetParagraphs(page, number, orderCriteria).ToList().Count; if (nbParagraph == 0) { _logger.LogError("[ERREUR] Aucun paragraphe trouvé."); From 231f9bd878700aebdcf8adc4a45959072c37fbe3 Mon Sep 17 00:00:00 2001 From: "Johnny.Ratton" Date: Fri, 15 Mar 2024 17:53:48 +0100 Subject: [PATCH 14/15] Ajout de constructeur vide pour les DTO qui n'en avaient pas --- API_SQLuedo/Dto/BlackListDTO.cs | 1 + API_SQLuedo/Dto/InquiryDTO.cs | 1 + API_SQLuedo/Dto/ParagraphDTO.cs | 10 +++++----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/API_SQLuedo/Dto/BlackListDTO.cs b/API_SQLuedo/Dto/BlackListDTO.cs index 913aaa0..a8a5a63 100644 --- a/API_SQLuedo/Dto/BlackListDTO.cs +++ b/API_SQLuedo/Dto/BlackListDTO.cs @@ -5,6 +5,7 @@ public class BlackListDTO public string Email { get; set; } public DateOnly ExpirationDate { get; set; } + public BlackListDTO() {} public BlackListDTO(string email, DateOnly expirationDate) { Email = email; diff --git a/API_SQLuedo/Dto/InquiryDTO.cs b/API_SQLuedo/Dto/InquiryDTO.cs index 5a436ed..f734ce7 100644 --- a/API_SQLuedo/Dto/InquiryDTO.cs +++ b/API_SQLuedo/Dto/InquiryDTO.cs @@ -10,6 +10,7 @@ public class InquiryDTO public bool IsUser { get; set; } + public InquiryDTO(){} public InquiryDTO(int id, string title, string description, bool isUser) { Id = id; diff --git a/API_SQLuedo/Dto/ParagraphDTO.cs b/API_SQLuedo/Dto/ParagraphDTO.cs index f6925dd..13c702f 100644 --- a/API_SQLuedo/Dto/ParagraphDTO.cs +++ b/API_SQLuedo/Dto/ParagraphDTO.cs @@ -29,9 +29,9 @@ public class ParagraphDTO : ContentLessonDTO Info = info; Query = query; Comment = comment; - } - - public ParagraphDTO() : base() - { - } + } + + public ParagraphDTO() : base() + { + } } \ No newline at end of file From 5a8d8fe4e9f9f72b56f8b2a9cd8e528323c572d9 Mon Sep 17 00:00:00 2001 From: "Johnny.Ratton" Date: Fri, 15 Mar 2024 19:30:07 +0100 Subject: [PATCH 15/15] =?UTF-8?q?R=C3=A9glage=20de=20diff=C3=A9rents=20bug?= =?UTF-8?q?s=20et=20incoh=C3=A9rences=20li=C3=A9s=20aux=20succ=C3=A8s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/Controllers/SuccessesController.cs | 33 +++++++-------- .../API/Service/SuccessDataServiceAPI.cs | 10 ++--- .../Service/SuccessDataService.cs | 42 ++++++++++--------- API_SQLuedo/Shared/ISuccessService.cs | 8 ++-- API_SQLuedo/TestConsoleAPI/Program.cs | 14 ++++--- 5 files changed, 55 insertions(+), 52 deletions(-) diff --git a/API_SQLuedo/API/Controllers/SuccessesController.cs b/API_SQLuedo/API/Controllers/SuccessesController.cs index ca9a8a6..0a48938 100644 --- a/API_SQLuedo/API/Controllers/SuccessesController.cs +++ b/API_SQLuedo/API/Controllers/SuccessesController.cs @@ -47,7 +47,7 @@ namespace API.Controllers try { _logger.LogInformation("[INFORMATION] Le succès avec l'id de l'utilisateur {id} a été trouvé.", id); - return Ok(_successDataService.GetSuccessByUserId(id)); + return Ok(_successDataService.GetSuccessesByUserId(id)); } catch (ArgumentException) { @@ -65,7 +65,7 @@ namespace API.Controllers { _logger.LogInformation("[INFORMATION] Utilisateur avec l'id de l'enquête {inquiryId} a été trouvé.", id); - return Ok(_successDataService.GetSuccessByInquiryId(id)); + return Ok(_successDataService.GetSuccessesByInquiryId(id)); } catch (ArgumentException) { @@ -74,20 +74,20 @@ namespace API.Controllers } } - [HttpDelete("success/{id:int}")] + [HttpDelete("success/{idUser:int}/{idInquiry:int}")] [ProducesResponseType(typeof(SuccessDTO), 200)] [ProducesResponseType(typeof(string), 404)] - public IActionResult DeleteSuccess(int id) + public IActionResult DeleteSuccess(int idUser, int idInquiry) { - var success = _successDataService.DeleteSuccess(id); + var success = _successDataService.DeleteSuccess(idUser, idInquiry); if (success) { - _logger.LogInformation("[INFORMATION] Le succès avec l'id {id} a été supprimé.", id); - return Ok(_successDataService.DeleteSuccess(id)); + _logger.LogInformation("[INFORMATION] Le succès avec l'id {id} a été supprimé.", idUser); + return Ok(success); } else { - _logger.LogError("[ERREUR] Aucun succès trouvé avec l'id {id}.", id); + _logger.LogError("[ERREUR] Aucun succès trouvé avec l'id {id}.", idUser); return NotFound(); } } @@ -108,35 +108,34 @@ namespace API.Controllers _successDataService.CreateSuccess(dto.UserId, dto.InquiryId, dto.IsFinished)); } - [HttpPut("success/{id:int}")] + [HttpPut("success/{idUser:int}/{idInquiry:int}")] [ProducesResponseType(typeof(SuccessDTO), 200)] [ProducesResponseType(typeof(string), 400)] [ProducesResponseType(typeof(string), 404)] - public IActionResult UpdateSuccess(int id, [FromBody] SuccessDTO successDTO) + public IActionResult UpdateSuccess(int idUser, int idInquiry, [FromBody] SuccessDTO successDTO) { - if (id != successDTO.UserId) + if (idUser != successDTO.UserId || idInquiry != successDTO.InquiryId) { _logger.LogError( - "[ERREUR] Problème ID - La mise à jour du succès avec l'id de l'utilisateur {id} a échouée.", id); + "[ERREUR] Problème ID - La mise à jour du succès avec l'id de l'utilisateur {id} a échouée.", idUser); return BadRequest(); } - if (!ModelState.IsValid) { _logger.LogError( "[ERREUR] Problème controlleur - La mise à jour du succès avec l'id de l'utilisateur {id} a échouée.", - id); + idUser); return BadRequest(); } if (successDTO != null) { _logger.LogInformation( - "[INFORMATION] La mise à jour du succès avec l'id de l'utilisateur {id} a été effectuée", id); - return Ok(_successDataService.UpdateSuccess(id, successDTO)); + "[INFORMATION] La mise à jour du succès avec l'id de l'utilisateur {id} a été effectuée", idUser); + return Ok(_successDataService.UpdateSuccess(idUser,idInquiry, successDTO)); } - _logger.LogError("[ERREUR] Aucun succès trouvé avec l'id de l'utilisateur {id}.", id); + _logger.LogError("[ERREUR] Aucun succès trouvé avec l'id de l'utilisateur {id}.", idUser); return NotFound(); } } diff --git a/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs b/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs index af403c5..047203d 100644 --- a/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/SuccessDataServiceAPI.cs @@ -14,14 +14,14 @@ public class SuccessDataServiceApi(ISuccessService sucessService) return successesEntities.Select(e => e.FromEntityToDTO()).ToList(); } - public SuccessDTO GetSuccessByUserId(int id) => sucessService.GetSuccessByUserId(id).FromEntityToDTO(); + public IEnumerable GetSuccessesByUserId(int id) => sucessService.GetSuccessesByUserId(id).Select(s => s.FromEntityToDTO()); - public SuccessDTO GetSuccessByInquiryId(int id) => sucessService.GetSuccessByInquiryId(id).FromEntityToDTO(); + public IEnumerable GetSuccessesByInquiryId(int id) => sucessService.GetSuccessesByInquiryId(id).Select(s => s.FromEntityToDTO()); - public bool DeleteSuccess(int id) => sucessService.DeleteSuccess(id); + public bool DeleteSuccess(int idUser, int idInquiry) => sucessService.DeleteSuccess(idUser, idInquiry); - public SuccessDTO UpdateSuccess(int id, SuccessDTO success) => - sucessService.UpdateSuccess(id, success.FromDTOToEntity()).FromEntityToDTO(); + public SuccessDTO UpdateSuccess(int idUser, int idInquiry, SuccessDTO success) => + sucessService.UpdateSuccess(idUser, idInquiry, success.FromDTOToEntity()).FromEntityToDTO(); public SuccessDTO CreateSuccess(int userId, int inquiryId, bool isFinished) => sucessService.CreateSuccess(userId, inquiryId, isFinished).FromEntityToDTO(); diff --git a/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs b/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs index 36335d3..a247a24 100644 --- a/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/SuccessDataService.cs @@ -40,55 +40,53 @@ public class SuccessDataService : ISuccessService return successes; } - public SuccessEntity GetSuccessByUserId(int id) + public IEnumerable GetSuccessesByUserId(int id) { - var userEntity = DbContext.Successes.FirstOrDefault(u => u.UserId == id); - if (userEntity == null) + var successes = DbContext.Successes.Where(u => u.UserId == id); + if (successes == null) { throw new ArgumentException("Impossible de trouver le succès", nameof(id)); } - return userEntity; + return successes; } - public SuccessEntity GetSuccessByInquiryId(int id) + public IEnumerable GetSuccessesByInquiryId(int id) { - var userEntity = DbContext.Successes.FirstOrDefault(u => u.InquiryId == id); - if (userEntity == null) + var successes = DbContext.Successes.Where(u => u.InquiryId == id); + if (successes == null) { throw new ArgumentException("Impossible de trouver le succès", nameof(id)); } - return userEntity; + return successes; } - public bool DeleteSuccess(int id) + public bool DeleteSuccess(int idUser, int idInquiry) { - var successEntity = DbContext.Successes.FirstOrDefault(u => u.UserId == id); + var successEntity = DbContext.Successes.FirstOrDefault(u => u.UserId == idUser && u.InquiryId == idInquiry); if (successEntity == null) { return false; } - DbContext.Successes.Remove(successEntity); DbContext.SaveChangesAsync(); return true; } - public SuccessEntity UpdateSuccess(int id, SuccessEntity success) + public SuccessEntity UpdateSuccess(int idUser, int idInquiry, SuccessEntity success) { - var updatingSuccess = DbContext.Successes.FirstOrDefault(u => u.UserId == id); + var updatingSuccess = DbContext.Successes.FirstOrDefault(u => u.UserId == idUser && u.InquiryId == idInquiry); if (updatingSuccess == null) { - throw new ArgumentException("Impossible de trouver le succès", nameof(id)); + throw new ArgumentException("Impossible de trouver le succès", nameof(idUser)); } - - foreach (var pptt in typeof(SuccessEntity).GetProperties().Where(p => + /*foreach (var pptt in typeof(SuccessEntity).GetProperties().Where(p => p.CanWrite && p.Name != nameof(SuccessEntity.UserId) && p.Name != nameof(SuccessEntity.InquiryId))) { pptt.SetValue(updatingSuccess, pptt.GetValue(success)); - } - + }*/ + updatingSuccess.IsFinished = success.IsFinished; DbContext.SaveChangesAsync(); return updatingSuccess; } @@ -101,8 +99,12 @@ public class SuccessDataService : ISuccessService InquiryId = inquiryId, IsFinished = isFinished, }; - DbContext.Successes.Add(newSuccessEntity); - DbContext.SaveChangesAsync(); + var success = DbContext.Successes.Where(s => s.UserId == userId && s.InquiryId == inquiryId); + if (success == null) + { + DbContext.Successes.Add(newSuccessEntity); + DbContext.SaveChangesAsync(); + } return newSuccessEntity; } } \ No newline at end of file diff --git a/API_SQLuedo/Shared/ISuccessService.cs b/API_SQLuedo/Shared/ISuccessService.cs index 07e5f9c..29932ff 100644 --- a/API_SQLuedo/Shared/ISuccessService.cs +++ b/API_SQLuedo/Shared/ISuccessService.cs @@ -5,10 +5,10 @@ namespace Shared public interface ISuccessService { public IEnumerable GetSuccesses(int page, int number, SuccessOrderCriteria orderCriteria); - public TSuccess GetSuccessByUserId(int id); - public TSuccess GetSuccessByInquiryId(int id); - public bool DeleteSuccess(int id); - public TSuccess UpdateSuccess(int id, TSuccess success); + public IEnumerable GetSuccessesByUserId(int id); + public IEnumerable GetSuccessesByInquiryId(int id); + public bool DeleteSuccess(int idUser, int idInquiry); + public TSuccess UpdateSuccess(int idUser, int idInquiry, TSuccess success); public TSuccess CreateSuccess(int userId, int inquiryId, bool isFinished); } } \ No newline at end of file diff --git a/API_SQLuedo/TestConsoleAPI/Program.cs b/API_SQLuedo/TestConsoleAPI/Program.cs index a3b4275..6622ca8 100644 --- a/API_SQLuedo/TestConsoleAPI/Program.cs +++ b/API_SQLuedo/TestConsoleAPI/Program.cs @@ -519,13 +519,13 @@ using (var context = new UserDbContext(options)) { Console.WriteLine("Succès trouvé !\n"); Console.WriteLine("Veuillez saisir l'identifiant de l'utilisateur lié au succès :"); - var userId = Console.ReadLine(); + var userId = int.Parse(Console.ReadLine()); Console.WriteLine("Veuillez saisir l'identifiant de l'enquête lié au succès :"); - var inquiryId = Console.ReadLine(); + var inquiryId = int.Parse(Console.ReadLine()); Console.WriteLine("Veuillez saisir si l'enquête est terminée (0/1) :"); var isFinished = Console.ReadLine(); - var retour = successController.UpdateSuccess(id, - new SuccessDTO(int.Parse(userId), int.Parse(inquiryId), bool.Parse(isFinished))); + var retour = successController.UpdateSuccess(userId, inquiryId, + new SuccessDTO(userId, inquiryId, bool.Parse(isFinished))); if (retour.GetType() == typeof(OkObjectResult)) { Console.WriteLine("Mise à jour effectué avec succès !"); @@ -605,8 +605,10 @@ using (var context = new UserDbContext(options)) void DeleteSuccess() { Console.WriteLine("Quel est l'identifiant de l'utilisateur lié au succès à supprimer ?"); - var id = int.Parse(Console.ReadLine()); - var res = successController.DeleteSuccess(id); + var idUser = int.Parse(Console.ReadLine()); + Console.WriteLine("Quel est l'identifiant de l'enquête lié au succès à supprimer ?"); + var idInquiry = int.Parse(Console.ReadLine()); + var res = successController.DeleteSuccess(idUser,idInquiry); if (res.GetType() == typeof(OkObjectResult)) { Console.WriteLine("La suppression a été effectuée avec succès !");