Modification du service de inquiry

API_SQLuedo/API/Controllers/InquiriesController.cs

@@ -13,7 +13,7 @@ namespace API.Controllers
     [ApiController]
     public class InquiriesController : Controller
     {
-        private IInquiryService<InquiryDTO> _inquiryDataService;
+        private readonly IInquiryService<InquiryDTO> _inquiryDataService;
 
         private readonly ILogger<InquiriesController> _logger;
         public InquiriesController(IInquiryService<InquiryDTO> inquiryDataService, ILogger<InquiriesController> logger)

API_SQLuedo/API/Program.cs

@@ -24,8 +24,8 @@ builder.Services.AddSwaggerGen();
 builder.Services.AddScoped<IUserService<UserEntity>, DbDataManager.Service.UserDataService>();
 builder.Services.AddScoped<IUserService<UserDTO>, Shared.UserDataService>();
 
-builder.Services.AddScoped<IInquiryService<InquiryEntity>, DbDataManager.Service.InquiryDataService>();
-builder.Services.AddScoped<IInquiryService<InquiryDTO>, Shared.InquiryDataService>();
+builder.Services.AddScoped<IInquiryService<InquiryEntity>, InquiryDataService>();
+builder.Services.AddScoped<IInquiryService<InquiryDTO>, InquiryDataServiceApi>();
 
 builder.Services.AddScoped<IParagraphService<ParagraphEntity>, DbDataManager.Service.ParagraphDataService>();
 builder.Services.AddScoped<IParagraphService<ParagraphDTO>, Shared.ParagraphDataService>();

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<InquiryEntity> inquiryService) : IInquiryService<InquiryEntity>
+public class InquiryDataServiceApi(IInquiryService<InquiryEntity> inquiryService) : IInquiryService<InquiryDTO>
 {
-    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<InquiryEntity> inquiryService
         return inquiryService.DeleteInquiry(id);
     }
 
-    public IEnumerable<InquiryEntity> GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria)
+    public IEnumerable<InquiryDTO> 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();
 }

API_SQLuedo/Shared/InquiryDataService.cs

@@ -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<InquiryDTO> GetInquiries(int page, int number, InquiryOrderCriteria orderCriteria)
-    {
-        IQueryable<InquiryEntity> 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();
-    }
-}

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<SuccessesController> successLogger = factory.CreateLogger<SuccessesContr
 using (var context = new UserDbContext(options))
 {
     var userController = new UsersController(userLogger, new UserDataService(context));
-    var inquiryController = new InquiriesController(new InquiryDataService(context), inquiryLogger);
+    var inquiryController = new InquiriesController(new InquiryDataServiceApi(new InquiryDataService(context)), inquiryLogger);
     var paragraphController = new ParagraphsController(new ParagraphDataService(context), paragraphLogger);
     var lessonController = new LessonsController(new LessonDataService(context), lessonLogger);
     var successController = new SuccessesController(new SuccessDataService(context), successLogger);