Unrelated PR

core/Controllers/EventsController.cs

@@ -1,17 +1,12 @@
-using api.core.data.entities;
 using api.core.Data;
-using api.core.Data.Entities;
-using api.core.Data.Exceptions;
-using api.core.Data.requests;
+using api.core.Data.Enums;
 using api.core.Data.Requests;
 using api.core.Data.Responses;
 using api.core.Misc;
 using api.core.services.abstractions;
 
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.OutputCaching;
-using Microsoft.Extensions.Logging;
 
 namespace api.core.controllers;
 

core/Controllers/ModeratorEventsController.cs

@@ -1,10 +1,11 @@
 using api.core.controllers;
-using api.core.Data.Entities;
+using api.core.Data.Enums;
 using api.core.Data.Exceptions;
 using api.core.Data.Requests;
 using api.core.Data.Responses;
 using api.core.Misc;
 using api.core.services.abstractions;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 

core/Controllers/ModeratorUserController.cs

@@ -29,7 +29,7 @@ public async Task<IActionResult> CreateOrganizer([FromBody] UserCreateDTO organi
         Guid.TryParse(supabaseUser, out Guid userId);
         var created = userService.AddOrganizer(userId, organizer);
         var frontBaseUrl = Environment.GetEnvironmentVariable("FRONTEND_BASE_URL") ?? throw new Exception("FRONTEND_BASE_URL is not set");
-        await emailService.SendEmailAsync<UserCreationModel>(
+        await emailService.SendEmailAsync(
             organizer.Email,
             "Votre compte Hello!",
             new UserCreationModel

core/Controllers/OrganizerEventsController.cs

@@ -6,8 +6,8 @@
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using api.core.Data.Entities;
 using api.core.Data.Requests;
+using api.core.Data.Enums;
 
 namespace api.core.Controllers;
 

core/Data/Entities/Publication.cs

@@ -3,7 +3,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-using api.core.Data.Entities;
+using api.core.Data.Enums;
 
 using Microsoft.EntityFrameworkCore;
 

core/Data/Entities/State.cs → core/Data/Enums/State.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace api.core.Data.Entities;
+namespace api.core.Data.Enums;
 
 /// <summary>
 /// 1 - OnHold

core/Data/Requests/EventRequestDTO.cs

@@ -1,7 +1,4 @@
-using api.core.data.entities;
-using api.core.Data.Entities;
-
-namespace api.core.Data.requests;
+namespace api.core.Data.requests;
 
 public class EventRequestDTO
 {

core/Data/Responses/EventResponseDTO.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 
 using api.core.data.entities;
-using api.core.Data.Entities;
+using api.core.Data.Enums;
 
 namespace api.core.Data.Responses;
 

core/Extensions/ExceptionMiddlewareExtensions.cs

@@ -0,0 +1,11 @@
+using api.core.Misc;
+
+namespace api.core.Extensions;
+
+public static class ExceptionMiddlewareExtensions
+{
+    public static IApplicationBuilder UseExceptionMiddleware(this IApplicationBuilder iBuilder)
+    {
+        return iBuilder.UseMiddleware<CustomExceptionsCheckerMiddleware>();
+    }
+}

core/Program.cs

@@ -9,6 +9,7 @@
 using Microsoft.OpenApi.Models;
 using api.core.Misc;
 using api.emails;
+using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -94,9 +95,14 @@
                          Id = "Bearer"
                      }
                },
-         new string[] {}
+         Array.Empty<string>()
          }
     });
+    options.UseInlineDefinitionsForEnums();
+
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    options.IncludeXmlComments(xmlPath);
 });
 
 builder.Services.AddEmailService(builder.Configuration);
@@ -112,7 +118,8 @@
 app.UseSwagger();
 app.UseSwaggerUI();
 
-app.UseMiddleware<CustomExceptionsCheckerMiddleware>();
+
+app.UseExceptionMiddleware();
 
 // app.UseHttpsRedirection();
 

core/Repositories/EventRepository.cs

@@ -54,8 +54,7 @@ public IEnumerable<Event> GetAll()
             .Include(x => x.Publication)
                 .ThenInclude(x => x.Tags)
             .Include(x => x.Publication)
-                .ThenInclude(x => x.Organizer)
-            .ToList();
+                .ThenInclude(x => x.Organizer);
     }
 
     public bool Update(Guid id, Event entity)

core/Services/Abstractions/IEventService.cs

@@ -1,4 +1,4 @@
-using api.core.Data.Entities;
+using api.core.Data.Enums;
 using api.core.Data.requests;
 using api.core.Data.Responses;
 

core/Services/EventService.cs

@@ -1,5 +1,5 @@
 using api.core.data.entities;
-using api.core.Data.Entities;
+using api.core.Data.Enums;
 using api.core.Data.Exceptions;
 using api.core.Data.requests;
 using api.core.Data.Responses;

core/Services/Jobs/SetPublicationEventJob.cs

@@ -1,7 +1,4 @@
-using System.Reflection.Metadata;
-
-using api.core.Data.Entities;
-using api.core.Misc;
+using api.core.Misc;
 using api.core.services.abstractions;
 
 using Quartz;

core/api.core.csproj

@@ -8,6 +8,7 @@
     <UserSecretsId>d65d8ed2-e38b-45b2-b24e-88385df1ce57</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
   </PropertyGroup>
@@ -32,7 +33,7 @@
     <PackageReference Include="Quartz.Serialization.Json" Version="3.8.1" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
     <PackageReference Include="supabase-csharp" Version="0.15.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>
 
   <ItemGroup>

tests/Tests/Services/EventServiceTests.cs

@@ -1,12 +1,13 @@
 using api.core.data.entities;
-using api.core.Data.Entities;
+using api.core.Data.Enums;
 using api.core.Data.Exceptions;
 using api.core.Data.requests;
 using api.core.repositories.abstractions;
 using api.core.Services;
 using api.emails.Models;
 using api.emails.Services.Abstractions;
 using api.files.Services.Abstractions;
+
 using Microsoft.Extensions.Configuration;
 
 using Moq;