Suppressions de certaines lignes inutiles (state), modification de certaines utilisations des méthodes d'extensions, correction d'un bug lié à l'update d'un objet inquiry

API_SQLuedo/API/Service/InquiryDataServiceAPI.cs

@@ -1,10 +1,10 @@
-using Entities;
+using Entities;
-using Model.OrderCriteria;
+using Model.OrderCriteria;
-using Shared;
+using Shared;
-
+
-namespace API.Service;
+namespace API.Service;
-
+
-public class InquiryDataServiceApi(IInquiryService<InquiryEntity> inquiryService) : IInquiryService<InquiryEntity>
+public class InquiryDataServiceApi(IInquiryService<InquiryEntity> inquiryService) : IInquiryService<InquiryEntity>
 {
     public InquiryEntity CreateInquiry(string title, string description, bool isUser, int tableId, int solutionId)
     {
@@ -16,14 +16,14 @@ public class InquiryDataServiceApi(IInquiryService<InquiryEntity> inquiryService
         return inquiryService.DeleteInquiry(id);
     }
 
-    public IEnumerable<InquiryEntity> GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria)
+    public IEnumerable<InquiryEntity> GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria)
-    {
+    {
-        var inquiries = inquiryService.GetInquiries(page, number, orderCriteria);
+        var inquiries = inquiryService.GetInquiries(page, number, orderCriteria);
-        return inquiries.Select(i => i).ToList();
+        return inquiries.Select(i => i).ToList();
-    }
+    }
-
+
-    public InquiryEntity GetInquiryById(int id) => inquiryService.GetInquiryById(id);
+    public InquiryEntity GetInquiryById(int id) => inquiryService.GetInquiryById(id);
-
+
     public InquiryEntity GetInquiryByTitle(string title) => inquiryService.GetInquiryByTitle(title);
 
     public InquiryEntity UpdateInquiry(int id, InquiryEntity inquiry)

API_SQLuedo/DbDataManager/Service/InquiryDataService.cs

@@ -1,11 +1,11 @@
-using DbContextLib;
+using DbContextLib;
-using Entities;
+using Entities;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
-using Model.OrderCriteria;
+using Model.OrderCriteria;
-using Shared;
+using Shared;
-
+
-namespace DbDataManager.Service;
+namespace DbDataManager.Service;
-
+
 public class InquiryDataService : IInquiryService<InquiryEntity>
 {
     private UserDbContext DbContext { get; set; }

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.IdDatabase = inquiry.Database;
-        //updatingInquiry.InquiryTable = inquiry.InquiryTable.FromDTOToEntity();
+        updatingInquiry.IdInquiryTable = inquiry.InquiryTable;
-        // Permet d'indiquer en Db que l'entité a été modifiée.
-        DbContext.Entry(updatingInquiry).State = EntityState.Modified;
         DbContext.SaveChangesAsync();
-        return updatingInquiry.FromEntityToModel().FromModelToDTO();
+        return updatingInquiry.FromEntityToDTO();
     }
 }

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;
     }

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();
     }

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();
     }

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;