Compare commits

...

2 Commits

Author SHA1 Message Date
cernont b3612f5bec Remove /api prefix from all routes and fix CityId FK constraint
- Strip /api prefix from all endpoint routes
- Make Show.CityId nullable (no longer required FK)
- Drop CityId FK constraint and alter column to NULL at startup via raw SQL
- Add migration MakeCityIdNullable for schema consistency
- Update Show DTOs to reflect nullable CityId

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-27 20:32:55 +02:00
cernont 6c1330e570 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>
2026-05-27 19:35:01 +02:00
42 changed files with 179 additions and 87 deletions
@@ -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; }
}
@@ -8,7 +8,7 @@ public class CreateShowEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoin
{
public override void Configure()
{
Post("/api/shows");
Post("/shows");
AllowAnonymous();
}
@@ -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);
+1 -17
View File
@@ -8,7 +8,7 @@ public class DeleteShowEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoin
{
public override void Configure()
{
Delete("/api/shows/{Id}");
Delete("/shows/{Id}");
AllowAnonymous();
}
@@ -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);
@@ -8,7 +8,7 @@ public class GetAllShowsEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoi
{
public override void Configure()
{
Get("/api/shows");
Get("/shows");
AllowAnonymous();
}
@@ -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);
+3 -2
View File
@@ -9,7 +9,7 @@ public class GetShowEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoint<I
{
public override void Configure()
{
Get("/api/shows/{Id}");
Get("/shows/{Id}");
AllowAnonymous();
}
@@ -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);
@@ -9,7 +9,7 @@ public class UpdateShowEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoin
{
public override void Configure()
{
Put("/api/shows/{Id}");
Put("/shows/{Id}");
AllowAnonymous();
}
@@ -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);
@@ -8,7 +8,7 @@ public class CreateSoundEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoi
{
public override void Configure()
{
Post("/api/sounds");
Post("/sounds");
AllowAnonymous();
}
@@ -8,7 +8,7 @@ public class DeleteSoundEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoi
{
public override void Configure()
{
Delete("/api/sounds/{Id}");
Delete("/sounds/{Id}");
AllowAnonymous();
}
@@ -8,7 +8,7 @@ public class GetAllSoundsEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpo
{
public override void Configure()
{
Get("/api/sounds");
Get("/sounds");
AllowAnonymous();
}
@@ -9,7 +9,7 @@ public class GetSoundEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoint<
{
public override void Configure()
{
Get("/api/sounds/{Id}");
Get("/sounds/{Id}");
AllowAnonymous();
}
@@ -9,7 +9,7 @@ public class UpdateSoundEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoi
{
public override void Configure()
{
Put("/api/sounds/{Id}");
Put("/sounds/{Id}");
AllowAnonymous();
}
@@ -8,7 +8,7 @@ public class CreateSoundCategoryEndpoint(PyroFetesDbContext pyroFetesDbContext)
{
public override void Configure()
{
Post("/api/soundcategorys");
Post("/soundcategorys");
AllowAnonymous();
}
@@ -8,7 +8,7 @@ public class DeleteSoundCategoryEndpoint(PyroFetesDbContext pf3DbContext) : Endp
{
public override void Configure()
{
Delete("/api/soundcategorys/{Id}");
Delete("/soundcategorys/{Id}");
AllowAnonymous();
}
@@ -8,7 +8,7 @@ public class GetAllSoundCategorysEndpoint(PyroFetesDbContext pf3DbContext) : End
{
public override void Configure()
{
Get("/api/soundcategorys");
Get("/soundcategorys");
AllowAnonymous();
}
@@ -9,7 +9,7 @@ public class GetSoundCategoryEndpoint(PyroFetesDbContext pf3DbContext) : Endpoin
{
public override void Configure()
{
Get("/api/soundcategorys/{Id}");
Get("/soundcategorys/{Id}");
AllowAnonymous();
}
@@ -9,7 +9,7 @@ public class UpdateSoundCategoryEndpoint(PyroFetesDbContext pf3DbContext) : Endp
{
public override void Configure()
{
Patch("/api/soundcategorys/{Id}/name");
Patch("/soundcategorys/{Id}/name");
AllowAnonymous();
}
@@ -8,7 +8,7 @@ public class CreateSoundTimecodeEndpoint(PyroFetesDbContext pyroFetesDbContext)
{
public override void Configure()
{
Post("/api/soundtimecodes");
Post("/soundtimecodes");
AllowAnonymous();
}
@@ -14,7 +14,7 @@ public class DeleteSoundTimecodeEndpoint(PyroFetesDbContext pyroFetesDbContext)
{
public override void Configure()
{
Delete("/api/soundtimecodes/{ShowId}/{SoundId}");
Delete("/soundtimecodes/{ShowId}/{SoundId}");
AllowAnonymous();
}
@@ -8,7 +8,7 @@ public class GetAllSoundTimecodesEndpoint(PyroFetesDbContext pyroFetesDbContext)
{
public override void Configure()
{
Get("/api/soundtimecodes");
Get("/soundtimecodes");
AllowAnonymous();
}
@@ -15,7 +15,7 @@ public class GetSoundTimecodeEndpoint(PyroFetesDbContext pyroFetesDbContext) : E
{
public override void Configure()
{
Get("/api/soundtimecodes/{ShowId}/{SoundId}");
Get("/soundtimecodes/{ShowId}/{SoundId}");
AllowAnonymous();
}
@@ -18,7 +18,7 @@ public class UpdateSoundTimecodeEndpoint(PyroFetesDbContext pyroFetesDbContext)
{
public override void Configure()
{
Put("/api/soundtimecodes/{ShowId}/{SoundId}");
Put("/soundtimecodes/{ShowId}/{SoundId}");
AllowAnonymous();
}
@@ -8,7 +8,7 @@ public class CreateStaffEndpoint(PyroFetesDbContext pf3DbContext):Endpoint<Creat
{
public override void Configure()
{
Post("/api/staff");
Post("/staff");
AllowAnonymous();
}
@@ -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);
@@ -8,7 +8,7 @@ public class DeleteStaffEndpoint(PyroFetesDbContext pf3DbContext) : Endpoint<IdS
{
public override void Configure()
{
Delete("/api/staff/{Id}");
Delete("/staff/{Id}");
AllowAnonymous();
}
@@ -8,7 +8,7 @@ public class GetAllStaffEndpoint(PyroFetesDbContext pf3DbContext) : EndpointWith
{
public override void Configure()
{
Get("/api/staff");
Get("/staff");
AllowAnonymous();
}
@@ -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);
@@ -9,7 +9,7 @@ public class GetStaffEndpoint(PyroFetesDbContext pf3DbContext) : Endpoint<IdStaf
{
public override void Configure()
{
Get("/api/staff/{Id}");
Get("/staff/{Id}");
AllowAnonymous();
}
@@ -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);
@@ -9,7 +9,7 @@ public class UpdateStaffEndpoint(PyroFetesDbContext pf3DbContext) : Endpoint<Upd
{
public override void Configure()
{
Put("/api/staff/{Id}");
Put("/staff/{Id}");
AllowAnonymous();
}
@@ -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);
@@ -8,7 +8,7 @@ public class CreateTruckEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoi
{
public override void Configure()
{
Post("/api/trucks");
Post("/trucks");
AllowAnonymous();
}
@@ -8,7 +8,7 @@ public class DeleteTruckEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoi
{
public override void Configure()
{
Delete("/api/trucks/{Id}");
Delete("/trucks/{Id}");
AllowAnonymous();
}
@@ -8,7 +8,7 @@ public class GetAllTrucksEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpo
{
public override void Configure()
{
Get("/api/trucks");
Get("/trucks");
AllowAnonymous();
}
@@ -9,7 +9,7 @@ public class GetTruckEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoint<
{
public override void Configure()
{
Get("/api/trucks/{Id}");
Get("/trucks/{Id}");
AllowAnonymous();
}
@@ -9,7 +9,7 @@ public class UpdateTruckEndpoint(PyroFetesDbContext pyroFetesDbContext) : Endpoi
{
public override void Configure()
{
Put("/api/trucks/{Id}");
Put("/trucks/{Id}");
AllowAnonymous();
}
@@ -0,0 +1,59 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PyroFetes.Migrations
{
/// <inheritdoc />
public partial class MakeCityIdNullable : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Shows_Cities_CityId",
table: "Shows");
migrationBuilder.AlterColumn<int>(
name: "CityId",
table: "Shows",
type: "int",
nullable: true,
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AddForeignKey(
name: "FK_Shows_Cities_CityId",
table: "Shows",
column: "CityId",
principalTable: "Cities",
principalColumn: "Id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Shows_Cities_CityId",
table: "Shows");
migrationBuilder.AlterColumn<int>(
name: "CityId",
table: "Shows",
type: "int",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "int",
oldNullable: true);
migrationBuilder.AddForeignKey(
name: "FK_Shows_Cities_CityId",
table: "Shows",
column: "CityId",
principalTable: "Cities",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
}
}
@@ -813,7 +813,7 @@ namespace PyroFetes.Migrations
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
b.Property<int>("CityId")
b.Property<int?>("CityId")
.HasColumnType("int");
b.Property<DateOnly?>("Date")
@@ -1594,8 +1594,7 @@ namespace PyroFetes.Migrations
b.HasOne("PyroFetes.Models.City", "City")
.WithMany("Shows")
.HasForeignKey("CityId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
.OnDelete(DeleteBehavior.ClientSetNull);
b.Navigation("City");
});
+1 -1
View File
@@ -13,7 +13,7 @@ public class Show
// Link (path/URL/file name) to the pyrotechnic implementation plan
[Required, MaxLength(500)] public string? PyrotechnicImplementationPlan { get; set; }
[Required] public int CityId { get; set; }
public int? CityId { get; set; }
public City? City { get; set; }
public List<ShowStaff>? ShowStaffs { get; set; }
+31 -8
View File
@@ -1,19 +1,42 @@
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.
using (var scope = app.Services.CreateScope())
{
var db = scope.ServiceProvider.GetRequiredService<PyroFetesDbContext>();
db.Database.ExecuteSqlRaw("""
IF EXISTS (
SELECT 1 FROM sys.foreign_keys
WHERE name = 'FK_Shows_Cities_CityId' AND parent_object_id = OBJECT_ID('Shows')
)
ALTER TABLE Shows DROP CONSTRAINT FK_Shows_Cities_CityId
""");
db.Database.ExecuteSqlRaw("""
IF COL_LENGTH('Shows', 'CityId') IS NOT NULL
AND COLUMNPROPERTY(OBJECT_ID('Shows'), 'CityId', 'AllowsNull') = 0
ALTER TABLE Shows ALTER COLUMN CityId INT NULL
""");
}
if (app.Environment.IsDevelopment())
{
app.UseSwagger();
app.UseSwaggerUI();
app.UseSwaggerGen();
}
app.UseHttpsRedirection();
app.UseFastEndpoints();
app.Run();
app.Run();
+1 -1
View File
@@ -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; }
+4 -1
View File
@@ -5,5 +5,8 @@
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnection": "Server=romaric-thibault.fr;Database=PyroFetes;Trusted_Connection=True;TrustServerCertificate=True;"
}
}