feat(import): resolve color variety ID mappings mismatch, support unnamed parents in virtual litters, and implement SaleContract updates
This commit is contained in:
@@ -23,6 +23,7 @@ namespace GerbilManagerWebAPI.Endpoints
|
||||
{
|
||||
private const string DocxContentType =
|
||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.document";
|
||||
private const string PdfContentType = "application/pdf";
|
||||
|
||||
public static IEndpointRouteBuilder MapContractEndpoints(this IEndpointRouteBuilder app)
|
||||
{
|
||||
@@ -50,6 +51,7 @@ namespace GerbilManagerWebAPI.Endpoints
|
||||
var errors = new Dictionary<string, string[]>();
|
||||
|
||||
var gerbilIds = (input.GerbilIds ?? []).Distinct().ToList();
|
||||
var photoChoice = input.AnimalPhotos ?? [];
|
||||
if (gerbilIds.Count == 0)
|
||||
errors["gerbilIds"] = ["Mindestens ein Tier auswählen."];
|
||||
if (input.Price < 0)
|
||||
@@ -100,7 +102,11 @@ namespace GerbilManagerWebAPI.Endpoints
|
||||
ContractDate = contractDate,
|
||||
FileName = fileName,
|
||||
CreatedAt = DateTimeOffset.UtcNow,
|
||||
Animals = gerbilIds.Select(id => new SaleContractAnimal { GerbilId = id }).ToList(),
|
||||
Animals = gerbilIds.Select(id => new SaleContractAnimal
|
||||
{
|
||||
GerbilId = id,
|
||||
PhotoId = photoChoice.TryGetValue(id, out var pid) ? pid : null,
|
||||
}).ToList(),
|
||||
};
|
||||
db.SaleContracts.Add(entity);
|
||||
|
||||
@@ -144,6 +150,49 @@ namespace GerbilManagerWebAPI.Endpoints
|
||||
return TypedResults.PhysicalFile(path, DocxContentType, download);
|
||||
});
|
||||
|
||||
// GET /contracts/{id}/pdf — druckfertiges PDF, aus den (aktuellen) Daten regeneriert.
|
||||
group.MapGet("/{id:guid}/pdf", async Task<Results<FileContentHttpResult, NotFound>> (
|
||||
Guid id, ApplicationContext db, IConfiguration config, IWebHostEnvironment env) =>
|
||||
{
|
||||
var c = await db.SaleContracts.AsNoTracking()
|
||||
.Include(x => x.Contact)
|
||||
.Include(x => x.Animals)
|
||||
.FirstOrDefaultAsync(x => x.Id == id);
|
||||
if (c is null || c.Contact is null) return TypedResults.NotFound();
|
||||
|
||||
var gerbilIds = c.Animals.Select(a => a.GerbilId).ToList();
|
||||
var gerbils = await db.Gerbils.AsNoTracking()
|
||||
.Include(g => g.ColorVariety)
|
||||
.Where(g => gerbilIds.Contains(g.Id))
|
||||
.ToListAsync();
|
||||
var settings = await db.BreederSettings.AsNoTracking()
|
||||
.FirstOrDefaultAsync(s => s.Id == BreederSettings.SingletonId)
|
||||
?? new BreederSettings();
|
||||
|
||||
// Gewählte Vertragsfotos nachladen (Foto muss zum Tier gehören und die Datei
|
||||
// existieren — sonst bleibt das Bild leer statt zu scheitern).
|
||||
var photoByGerbil = c.Animals
|
||||
.Where(a => a.PhotoId is not null)
|
||||
.ToDictionary(a => a.GerbilId, a => a.PhotoId!.Value);
|
||||
var photoBytes = await LoadAnimalPhotos(db, photoByGerbil, PhotoRoot(config, env));
|
||||
|
||||
var data = new ContractData(
|
||||
Seller: ToSeller(settings),
|
||||
Buyer: new ContractBuyer(c.Contact.Name, c.Contact.Address ?? "", c.Contact.Phone, c.Contact.Email),
|
||||
Animals: gerbils
|
||||
.Select(g => new ContractAnimal(
|
||||
g.Name, GeschlechtText(g.Gender), g.DateOfBirth, g.ColorVariety?.Name,
|
||||
photoBytes.GetValueOrDefault(g.Id)))
|
||||
.ToList(),
|
||||
Price: c.Price,
|
||||
HandoverDate: c.HandoverDate,
|
||||
ContractDate: c.ContractDate);
|
||||
|
||||
var pdf = ContractPdfGenerator.Generate(data);
|
||||
var download = $"Abgabevertrag_{c.ContractDate:yyyy-MM-dd}_{Sanitize(c.Contact.Name)}.pdf";
|
||||
return TypedResults.File(pdf, PdfContentType, download);
|
||||
});
|
||||
|
||||
// DELETE /contracts/{id} — Zeile + Datei; Tier-Status wird NICHT zurückgedreht
|
||||
// (das wäre Magie — Status korrigiert man am Tier selbst).
|
||||
group.MapDelete("/{id:guid}", async Task<Results<NoContent, NotFound>> (
|
||||
@@ -166,6 +215,34 @@ namespace GerbilManagerWebAPI.Endpoints
|
||||
private static string ContractRoot(IConfiguration config, IWebHostEnvironment env) =>
|
||||
config["Contracts:RootPath"] ?? Path.Combine(env.ContentRootPath, "contract-storage");
|
||||
|
||||
/// <summary>Foto-Dateiroot (geteilt mit den Foto-Endpoints).</summary>
|
||||
private static string PhotoRoot(IConfiguration config, IWebHostEnvironment env) =>
|
||||
config["Photos:RootPath"] ?? Path.Combine(env.ContentRootPath, "photo-storage");
|
||||
|
||||
/// <summary>Lädt die gewählten Vertragsfotos als Rohbytes (GerbilId -> Bytes).
|
||||
/// Überspringt Fotos, die nicht zum Tier gehören oder deren Datei fehlt.</summary>
|
||||
private static async Task<Dictionary<Guid, byte[]>> LoadAnimalPhotos(
|
||||
ApplicationContext db, Dictionary<Guid, Guid> photoByGerbil, string photoRoot)
|
||||
{
|
||||
var result = new Dictionary<Guid, byte[]>();
|
||||
if (photoByGerbil.Count == 0) return result;
|
||||
|
||||
var photoIds = photoByGerbil.Values.ToList();
|
||||
var photos = await db.GerbilPhotos.AsNoTracking()
|
||||
.Where(p => photoIds.Contains(p.Id))
|
||||
.ToListAsync();
|
||||
|
||||
foreach (var (gerbilId, photoId) in photoByGerbil)
|
||||
{
|
||||
var photo = photos.FirstOrDefault(p => p.Id == photoId && p.GerbilId == gerbilId);
|
||||
if (photo is null) continue;
|
||||
var path = Path.Combine(photoRoot, photo.FileName);
|
||||
if (File.Exists(path))
|
||||
result[gerbilId] = await File.ReadAllBytesAsync(path);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static BreederProfile ToSeller(BreederSettings s) => new()
|
||||
{
|
||||
ZuchtName = s.ZuchtName,
|
||||
|
||||
Reference in New Issue
Block a user