Fix FastEndpoints/Swagger wiring and missing required fields in DTOs
- Register FastEndpoints, SwaggerDocument, DbContext in Program.cs - Add DbContextOptions constructor to PyroFetesDbContext - Add CityId to Show DTOs and endpoints (NOT NULL in DB) - Add F4T2NumberApproval/F4T2ExpirationDate to Staff DTOs and endpoints - Simplify DeleteShow to rely on DB cascade instead of manual includes - Default NOT NULL string fields to empty string on create Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -7,4 +7,5 @@ public class CreateShowDto
|
||||
public string? Description { get; set; }
|
||||
public string? PyrotechnicImplementationPlan { get; set; }
|
||||
public DateTime? Date { get; set; }
|
||||
public int CityId { get; set; }
|
||||
}
|
||||
@@ -8,4 +8,5 @@ public class UpdateShowDto
|
||||
public string? Description { get; set; }
|
||||
public string? PyrotechnicImplementationPlan { get; set; }
|
||||
public DateTime? Date { get; set; }
|
||||
public int? CityId { get; set; }
|
||||
}
|
||||
@@ -8,4 +8,5 @@ public class ReadShowDto
|
||||
public string? Description { get; set; }
|
||||
public string? PyrotechnicImplementationPlan { get; set; }
|
||||
public DateTime? Date { get; set; }
|
||||
public int CityId { get; set; }
|
||||
}
|
||||
@@ -6,4 +6,6 @@ public class CreateStaffDto
|
||||
public string? LastName { get; set; }
|
||||
public string? Profession { get; set; }
|
||||
public string? Email { get; set; }
|
||||
public string? F4T2NumberApproval { get; set; }
|
||||
public DateOnly F4T2ExpirationDate { get; set; }
|
||||
}
|
||||
@@ -7,4 +7,6 @@ public class UpdateStaffDto
|
||||
public string? LastName { get; set; }
|
||||
public string? Profession { get; set; }
|
||||
public string? Email { get; set; }
|
||||
public string? F4T2NumberApproval { get; set; }
|
||||
public DateOnly? F4T2ExpirationDate { get; set; }
|
||||
}
|
||||
@@ -7,4 +7,6 @@ public class ReadStaffDto
|
||||
public string? LastName { get; set; }
|
||||
public string? Profession { get; set; }
|
||||
public string? Email { get; set; }
|
||||
public string? F4T2NumberApproval { get; set; }
|
||||
public DateOnly F4T2ExpirationDate { get; set; }
|
||||
}
|
||||
@@ -16,11 +16,12 @@ public class CreateShowEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoin
|
||||
{
|
||||
var show = new PyroFetes.Models.Show
|
||||
{
|
||||
Name = req.Name,
|
||||
Place = req.Place,
|
||||
Name = req.Name ?? string.Empty,
|
||||
Place = req.Place ?? string.Empty,
|
||||
Description = req.Description,
|
||||
PyrotechnicImplementationPlan = req.PyrotechnicImplementationPlan,
|
||||
Date = req.Date.HasValue ? DateOnly.FromDateTime(req.Date.Value) : null
|
||||
PyrotechnicImplementationPlan = req.PyrotechnicImplementationPlan ?? string.Empty,
|
||||
Date = req.Date.HasValue ? DateOnly.FromDateTime(req.Date.Value) : null,
|
||||
CityId = req.CityId
|
||||
};
|
||||
|
||||
pyroFetesDbContext.Shows.Add(show);
|
||||
@@ -33,7 +34,8 @@ public class CreateShowEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoin
|
||||
Place = show.Place,
|
||||
Description = show.Description,
|
||||
PyrotechnicImplementationPlan = show.PyrotechnicImplementationPlan,
|
||||
Date = show.Date.HasValue ? show.Date.Value.ToDateTime(TimeOnly.MinValue) : null
|
||||
Date = show.Date.HasValue ? show.Date.Value.ToDateTime(TimeOnly.MinValue) : null,
|
||||
CityId = show.CityId
|
||||
};
|
||||
|
||||
await Send.OkAsync(result, ct);
|
||||
|
||||
@@ -21,12 +21,6 @@ public class DeleteShowEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoin
|
||||
}
|
||||
|
||||
var show = await pyroFetesDbContext.Shows
|
||||
.Include(s => s.ShowTrucks)
|
||||
.Include(s => s.ShowStaffs)
|
||||
.Include(s => s.SoundTimecodes)
|
||||
.Include(s => s.ProductTimecodes)
|
||||
.Include(s => s.Contracts)
|
||||
.Include(s => s.ShowMaterials)
|
||||
.FirstOrDefaultAsync(s => s.Id == req.Id.Value, ct);
|
||||
|
||||
if (show is null)
|
||||
@@ -35,16 +29,6 @@ public class DeleteShowEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoin
|
||||
return;
|
||||
}
|
||||
|
||||
// Supprimer les relations associées
|
||||
if (show.ShowTrucks != null && show.ShowTrucks.Any())
|
||||
{
|
||||
pyroFetesDbContext.ShowTrucks.RemoveRange(show.ShowTrucks);
|
||||
}
|
||||
|
||||
// Note: Les autres relations (ShowStaffs, SoundTimecodes, etc.) devront aussi être gérées
|
||||
// en fonction de votre modèle de données et de vos règles métier
|
||||
// Pour l'instant, je laisse juste ShowTrucks comme exemple
|
||||
|
||||
pyroFetesDbContext.Shows.Remove(show);
|
||||
await pyroFetesDbContext.SaveChangesAsync(ct);
|
||||
|
||||
|
||||
@@ -22,7 +22,8 @@ public class GetAllShowsEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoi
|
||||
Place = s.Place,
|
||||
Description = s.Description,
|
||||
PyrotechnicImplementationPlan = s.PyrotechnicImplementationPlan,
|
||||
Date = s.Date.HasValue ? s.Date.Value.ToDateTime(TimeOnly.MinValue) : null
|
||||
Date = s.Date.HasValue ? s.Date.Value.ToDateTime(TimeOnly.MinValue) : null,
|
||||
CityId = s.CityId
|
||||
})
|
||||
.ToListAsync(ct);
|
||||
|
||||
|
||||
@@ -30,7 +30,8 @@ public class GetShowEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoint<I
|
||||
Place = s.Place,
|
||||
Description = s.Description,
|
||||
PyrotechnicImplementationPlan = s.PyrotechnicImplementationPlan,
|
||||
Date = s.Date.HasValue ? s.Date.Value.ToDateTime(TimeOnly.MinValue) : null
|
||||
Date = s.Date.HasValue ? s.Date.Value.ToDateTime(TimeOnly.MinValue) : null,
|
||||
CityId = s.CityId
|
||||
})
|
||||
.FirstOrDefaultAsync(ct);
|
||||
|
||||
|
||||
@@ -34,11 +34,8 @@ public class UpdateShowEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoin
|
||||
show.Place = req.Place ?? show.Place;
|
||||
show.Description = req.Description ?? show.Description;
|
||||
show.PyrotechnicImplementationPlan = req.PyrotechnicImplementationPlan ?? show.PyrotechnicImplementationPlan;
|
||||
|
||||
if (req.Date.HasValue)
|
||||
{
|
||||
show.Date = DateOnly.FromDateTime(req.Date.Value);
|
||||
}
|
||||
if (req.CityId.HasValue) show.CityId = req.CityId.Value;
|
||||
if (req.Date.HasValue) show.Date = DateOnly.FromDateTime(req.Date.Value);
|
||||
|
||||
await pyroFetesDbContext.SaveChangesAsync(ct);
|
||||
|
||||
@@ -49,7 +46,8 @@ public class UpdateShowEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoin
|
||||
Place = show.Place,
|
||||
Description = show.Description,
|
||||
PyrotechnicImplementationPlan = show.PyrotechnicImplementationPlan,
|
||||
Date = show.Date.HasValue ? show.Date.Value.ToDateTime(TimeOnly.MinValue) : null
|
||||
Date = show.Date.HasValue ? show.Date.Value.ToDateTime(TimeOnly.MinValue) : null,
|
||||
CityId = show.CityId
|
||||
};
|
||||
|
||||
await Send.OkAsync(result, ct);
|
||||
|
||||
@@ -19,19 +19,23 @@ public class CreateStaffEndpoint(PyroFetesDbContext pf3DbContext):Endpoint<Creat
|
||||
FirstName = req.FirstName,
|
||||
LastName = req.LastName,
|
||||
Profession = req.Profession,
|
||||
Email = req.Email
|
||||
Email = req.Email,
|
||||
F4T2NumberApproval = req.F4T2NumberApproval,
|
||||
F4T2ExpirationDate = req.F4T2ExpirationDate
|
||||
};
|
||||
|
||||
|
||||
pf3DbContext.Staffs.Add(staff);
|
||||
await pf3DbContext.SaveChangesAsync(ct);
|
||||
|
||||
|
||||
var result = new ReadStaffDto()
|
||||
{
|
||||
Id = staff.Id,
|
||||
FirstName = req.FirstName,
|
||||
LastName = req.LastName,
|
||||
Profession = req.Profession,
|
||||
Email = req.Email
|
||||
FirstName = staff.FirstName,
|
||||
LastName = staff.LastName,
|
||||
Profession = staff.Profession,
|
||||
Email = staff.Email,
|
||||
F4T2NumberApproval = staff.F4T2NumberApproval,
|
||||
F4T2ExpirationDate = staff.F4T2ExpirationDate
|
||||
};
|
||||
|
||||
await Send.OkAsync(result, ct);
|
||||
|
||||
@@ -22,7 +22,9 @@ public class GetAllStaffEndpoint(PyroFetesDbContext pf3DbContext) : EndpointWith
|
||||
FirstName = s.FirstName,
|
||||
LastName = s.LastName,
|
||||
Profession = s.Profession,
|
||||
Email = s.Email
|
||||
Email = s.Email,
|
||||
F4T2NumberApproval = s.F4T2NumberApproval,
|
||||
F4T2ExpirationDate = s.F4T2ExpirationDate
|
||||
}).ToList();
|
||||
|
||||
await Send.OkAsync(result, ct);
|
||||
|
||||
@@ -23,7 +23,9 @@ public class GetStaffEndpoint(PyroFetesDbContext pf3DbContext) : Endpoint<IdStaf
|
||||
FirstName = s.FirstName,
|
||||
LastName = s.LastName,
|
||||
Profession = s.Profession,
|
||||
Email = s.Email
|
||||
Email = s.Email,
|
||||
F4T2NumberApproval = s.F4T2NumberApproval,
|
||||
F4T2ExpirationDate = s.F4T2ExpirationDate
|
||||
})
|
||||
.FirstOrDefaultAsync(ct);
|
||||
|
||||
|
||||
@@ -22,10 +22,13 @@ public class UpdateStaffEndpoint(PyroFetesDbContext pf3DbContext) : Endpoint<Upd
|
||||
return;
|
||||
}
|
||||
|
||||
staff.FirstName = req.FirstName;
|
||||
staff.LastName = req.LastName;
|
||||
staff.Profession = req.Profession;
|
||||
staff.Email = req.Email;
|
||||
staff.FirstName = req.FirstName ?? staff.FirstName;
|
||||
staff.LastName = req.LastName ?? staff.LastName;
|
||||
staff.Profession = req.Profession ?? staff.Profession;
|
||||
staff.Email = req.Email ?? staff.Email;
|
||||
staff.F4T2NumberApproval = req.F4T2NumberApproval ?? staff.F4T2NumberApproval;
|
||||
if (req.F4T2ExpirationDate.HasValue)
|
||||
staff.F4T2ExpirationDate = req.F4T2ExpirationDate.Value;
|
||||
|
||||
await pf3DbContext.SaveChangesAsync(ct);
|
||||
|
||||
@@ -35,7 +38,9 @@ public class UpdateStaffEndpoint(PyroFetesDbContext pf3DbContext) : Endpoint<Upd
|
||||
FirstName = staff.FirstName,
|
||||
LastName = staff.LastName,
|
||||
Profession = staff.Profession,
|
||||
Email = staff.Email
|
||||
Email = staff.Email,
|
||||
F4T2NumberApproval = staff.F4T2NumberApproval,
|
||||
F4T2ExpirationDate = staff.F4T2ExpirationDate
|
||||
};
|
||||
|
||||
await Send.OkAsync(result, ct);
|
||||
|
||||
+14
-8
@@ -1,19 +1,25 @@
|
||||
using FastEndpoints;
|
||||
using FastEndpoints.Swagger;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using PyroFetes;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
// Add services to the container.
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
builder.Services.AddDbContext<PyroFetesDbContext>(options =>
|
||||
options.UseSqlServer(builder.Configuration.GetConnectionString("DefaultConnection")));
|
||||
|
||||
builder.Services.AddFastEndpoints();
|
||||
builder.Services.SwaggerDocument();
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
app.UseSwaggerGen();
|
||||
}
|
||||
|
||||
app.UseHttpsRedirection();
|
||||
app.UseFastEndpoints();
|
||||
|
||||
app.Run();
|
||||
app.Run();
|
||||
|
||||
@@ -4,7 +4,7 @@ using ServiceProvider = PyroFetes.Models.ServiceProvider;
|
||||
|
||||
namespace PyroFetes;
|
||||
|
||||
public class PyroFetesDbContext : DbContext
|
||||
public class PyroFetesDbContext(DbContextOptions<PyroFetesDbContext> options) : DbContext(options)
|
||||
{
|
||||
// Entities
|
||||
public DbSet<Availability> Availabilities { get; set; }
|
||||
|
||||
@@ -5,5 +5,8 @@
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*"
|
||||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
"DefaultConnection": "Server=romaric-thibault.fr;Database=PyroFetes;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user