From c8d4c6a6be4d80dd14dbf336f32988545c99f92f Mon Sep 17 00:00:00 2001 From: Erwan MENAGER Date: Tue, 12 Mar 2024 15:51:32 +0100 Subject: [PATCH] =?UTF-8?q?Suppressions=20de=20certaines=20lignes=20inutil?= =?UTF-8?q?es=20(state),=20modification=20de=20certaines=20utilisations=20?= =?UTF-8?q?des=20m=C3=A9thodes=20d'extensions,=20correction=20d'un=20bug?= =?UTF-8?q?=20li=C3=A9=20=C3=A0=20l'update=20d'un=20objet=20inquiry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/Service/InquiryDataServiceAPI.cs | 30 +++++++++---------- .../Service/InquiryDataService.cs | 16 +++++----- API_SQLuedo/Shared/InquiryDataService.cs | 8 ++--- API_SQLuedo/Shared/LessonDataService.cs | 8 ++--- API_SQLuedo/Shared/ParagraphDataService.cs | 2 -- API_SQLuedo/Shared/SuccessDataService.cs | 2 -- API_SQLuedo/Shared/UserDataService.cs | 12 ++++---- 7 files changed, 34 insertions(+), 44 deletions(-) diff --git a/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs b/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs index fc260f6..6248d48 100644 --- a/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/InquiryDataServiceAPI.cs @@ -1,10 +1,10 @@ -using Entities; -using Model.OrderCriteria; -using Shared; - -namespace API.Service; - -public class InquiryDataServiceApi(IInquiryService inquiryService) : IInquiryService +using Entities; +using Model.OrderCriteria; +using Shared; + +namespace API.Service; + +public class InquiryDataServiceApi(IInquiryService inquiryService) : IInquiryService { public InquiryEntity CreateInquiry(string title, string description, bool isUser, int tableId, int solutionId) { @@ -16,14 +16,14 @@ public class InquiryDataServiceApi(IInquiryService inquiryService return inquiryService.DeleteInquiry(id); } - public IEnumerable GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria) - { - var inquiries = inquiryService.GetInquiries(page, number, orderCriteria); - return inquiries.Select(i => i).ToList(); - } - - public InquiryEntity GetInquiryById(int id) => inquiryService.GetInquiryById(id); - + public IEnumerable GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria) + { + var inquiries = inquiryService.GetInquiries(page, number, orderCriteria); + return inquiries.Select(i => i).ToList(); + } + + public InquiryEntity GetInquiryById(int id) => inquiryService.GetInquiryById(id); + public InquiryEntity GetInquiryByTitle(string title) => inquiryService.GetInquiryByTitle(title); public InquiryEntity UpdateInquiry(int id, InquiryEntity inquiry) diff --git a/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs b/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs index da662b2..922e3c9 100644 --- a/API_SQLuedo/DbDataManager/Service/InquiryDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/InquiryDataService.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 InquiryDataService : IInquiryService { private UserDbContext DbContext { get; set; } diff --git a/API_SQLuedo/Shared/InquiryDataService.cs b/API_SQLuedo/Shared/InquiryDataService.cs index e7b01d6..012eb4e 100644 --- a/API_SQLuedo/Shared/InquiryDataService.cs +++ b/API_SQLuedo/Shared/InquiryDataService.cs @@ -90,11 +90,9 @@ public class InquiryDataService : IInquiryDataService updatingInquiry.Title = inquiry.Title; updatingInquiry.Description = inquiry.Description; updatingInquiry.IsUser = inquiry.IsUser; - //updatingInquiry.Database = inquiry.Database.FromDTOToEntity(); - //updatingInquiry.InquiryTable = inquiry.InquiryTable.FromDTOToEntity(); - // Permet d'indiquer en Db que l'entité a été modifiée. - DbContext.Entry(updatingInquiry).State = EntityState.Modified; + updatingInquiry.IdDatabase = inquiry.Database; + updatingInquiry.IdInquiryTable = inquiry.InquiryTable; DbContext.SaveChangesAsync(); - return updatingInquiry.FromEntityToModel().FromModelToDTO(); + return updatingInquiry.FromEntityToDTO(); } } diff --git a/API_SQLuedo/Shared/LessonDataService.cs b/API_SQLuedo/Shared/LessonDataService.cs index 3b80dc6..e37b67e 100644 --- a/API_SQLuedo/Shared/LessonDataService.cs +++ b/API_SQLuedo/Shared/LessonDataService.cs @@ -57,7 +57,7 @@ public class LessonDataService : ILessonDataService throw new ArgumentException("Impossible de trouver la leçon", nameof(title)); } - return lessonEntity.FromEntityToModel().FromModelToDTO(); + return lessonEntity.FromEntityToDTO(); } public bool DeleteLesson(int id) @@ -84,10 +84,8 @@ public class LessonDataService : ILessonDataService 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.FromEntityToModel().FromModelToDTO(); + return updatingLesson.FromEntityToDTO(); } public LessonDTO CreateLesson(string title, string lastPublisher, DateOnly? lastEdit) @@ -98,7 +96,7 @@ public class LessonDataService : ILessonDataService LastPublisher = lastPublisher, LastEdit = lastEdit, }; - DbContext.Lessons.Add(newLessonEntity.FromDTOToModel().FromModelToEntity()); + DbContext.Lessons.Add(newLessonEntity.FromDTOToEntity()); DbContext.SaveChangesAsync(); return newLessonEntity; } diff --git a/API_SQLuedo/Shared/ParagraphDataService.cs b/API_SQLuedo/Shared/ParagraphDataService.cs index 40a410d..7954f78 100644 --- a/API_SQLuedo/Shared/ParagraphDataService.cs +++ b/API_SQLuedo/Shared/ParagraphDataService.cs @@ -94,8 +94,6 @@ public class ParagraphDataService : IParagraphDataService updatingParagraph.Info = paragraphDTO.Info; updatingParagraph.Query = paragraphDTO.Query; updatingParagraph.Comment = paragraphDTO.Comment; - // Permet d'indiquer en Db que l'entité a été modifiée. - DbContext.Entry(updatingParagraph).State = EntityState.Modified; DbContext.SaveChangesAsync(); return updatingParagraph.FromEntityToDTO(); } diff --git a/API_SQLuedo/Shared/SuccessDataService.cs b/API_SQLuedo/Shared/SuccessDataService.cs index aa57de2..f2f7b88 100644 --- a/API_SQLuedo/Shared/SuccessDataService.cs +++ b/API_SQLuedo/Shared/SuccessDataService.cs @@ -84,8 +84,6 @@ public class SuccessDataService : ISuccessDataService 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.FromEntityToDTO(); } diff --git a/API_SQLuedo/Shared/UserDataService.cs b/API_SQLuedo/Shared/UserDataService.cs index b7098a9..a90b809 100644 --- a/API_SQLuedo/Shared/UserDataService.cs +++ b/API_SQLuedo/Shared/UserDataService.cs @@ -30,7 +30,7 @@ namespace Shared throw new ArgumentException("Impossible de trouver l'utilisateur", nameof(id)); } - return userEntity.FromEntityToModel().FromModelToDTO(); + return userEntity.FromEntityToDTO(); } @@ -42,7 +42,7 @@ namespace Shared throw new ArgumentException("Impossible de trouver l'utilisateur", nameof(username)); } - return userEntity.FromEntityToModel().FromModelToDTO(); + return userEntity.FromEntityToDTO(); } @@ -69,7 +69,7 @@ namespace Shared break; } var users = query.ToList(); - return users.Select(s => s.FromEntityToModel().FromModelToDTO()); + return users.Select(s => s.FromEntityToDTO()); } public bool DeleteUser(int id) @@ -98,10 +98,8 @@ namespace Shared 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.FromEntityToModel().FromModelToDTO(); + return updatingUser.FromEntityToDTO(); } @@ -114,7 +112,7 @@ namespace Shared Email = email, IsAdmin = isAdmin }; - DbContext.Users.Add(newUserEntity.FromDTOToModel().FromModelToEntity()); + DbContext.Users.Add(newUserEntity.FromDTOToEntity()); DbContext.SaveChangesAsync(); return newUserEntity;