genotype.py: - Uw/uw aliased to G/g (same locus) so the D2 conflict group + pure-Uw cases stop being conflicts (Gg == Uwuw). - Sls/WP recognized as a SECOND spotting locus (S(l)s(l)=WP het); carried into mapped8locus alongside Sp (Sp+Sls = Superschecke). - dea/Dea/taub/hörend -> hearing/deaf phenotype FLAG (not a locus). - WFNZ/RV/GV/DP -> provenance/breeding tags (not genotype, not conflicts). - test_genotype.py: zero-dep unit tests for all four. extract.py: surface deaf+tags on animals; dedup conflict detection now compares the NORMALIZED genotype key (mapped8locus) instead of the raw string, so Uw=G no longer triggers a conflict. Result: Konflikte 32 -> 27, Zucht-Splits stays 0. Dedup identity = name + DOB + Zucht. Backend: Gerbil.IsDeaf (bool?) + additive migration AddGerbilDeafFlag (has-pending-model-changes clean) + GerbilDto/GerbilInput round-trip. ImportService sets IsDeaf from animal.deaf and preserves Sls + tags + deaf in RawImportData (kept out of the 8-locus compact Genotype contract until GEN-3a adopts them). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
105 lines
3.4 KiB
C#
105 lines
3.4 KiB
C#
using GerbilManagerWebAPI.Models;
|
|
|
|
namespace GerbilManagerWebAPI.Dtos
|
|
{
|
|
// Response DTOs ----------------------------------------------------------
|
|
// Enums serialise as string names; JSON property names are camelCase (configured
|
|
// globally in Program.cs). FK references are FLAT ids (no nested objects) per the
|
|
// frontend contract (Kelly's pedigree + Oscar's filters depend on this).
|
|
|
|
public record GerbilDto(
|
|
Guid Id,
|
|
string Name,
|
|
Gender Gender,
|
|
GerbilStatus Status,
|
|
Guid? LitterId,
|
|
Guid? OriginContactId,
|
|
Guid? ReceiverContactId,
|
|
Guid? EnclosureId,
|
|
Guid? ColorVarietyId,
|
|
DateOnly? DateOfBirth,
|
|
DateOnly? DateOfDeath,
|
|
string? CauseOfDeath,
|
|
DateOnly? GoHomeDate,
|
|
string? Genotype,
|
|
string? Notes,
|
|
string? ImportSource,
|
|
string? ExternalRef,
|
|
string? OriginBreeder,
|
|
List<string> CharacterTraits,
|
|
string? CharacterNote,
|
|
bool? IsDeaf);
|
|
|
|
public record LitterDto(
|
|
Guid Id,
|
|
string Name,
|
|
DateOnly Date,
|
|
int? TotalBorn,
|
|
Guid? FatherId,
|
|
Guid? MotherId,
|
|
DateOnly? ExpectedGoHomeDate,
|
|
string? Notes);
|
|
|
|
public record ContactDto(Guid Id, string Name, string? Email, string? Phone, string? Address, string? Notes);
|
|
|
|
public record EnclosureDto(Guid Id, string Name, string? Notes);
|
|
|
|
public record ColorVarietyDto(Guid Id, string Name, string? CanonicalGenotype, int SortOrder);
|
|
|
|
public record HealthRecordDto(
|
|
Guid Id, Guid GerbilId, DateOnly Date, HealthRecordType Type,
|
|
string Description, string? Veterinarian, DateTimeOffset CreatedAt);
|
|
|
|
public record WeightRecordDto(
|
|
Guid Id, Guid GerbilId, DateOnly Date, int WeightGrams, string? Notes);
|
|
|
|
public record PhotoDto(Guid Id, string FileName, string? Caption, int SortOrder, string Url);
|
|
|
|
// Request DTOs -----------------------------------------------------------
|
|
|
|
public record GerbilInput(
|
|
string Name,
|
|
Gender Gender,
|
|
GerbilStatus? Status,
|
|
Guid? LitterId,
|
|
Guid? OriginContactId,
|
|
Guid? ReceiverContactId,
|
|
Guid? EnclosureId,
|
|
Guid? ColorVarietyId,
|
|
DateOnly? DateOfBirth,
|
|
DateOnly? DateOfDeath,
|
|
string? CauseOfDeath,
|
|
DateOnly? GoHomeDate,
|
|
string? Genotype,
|
|
string? Notes,
|
|
string? ImportSource,
|
|
string? ExternalRef,
|
|
string? OriginBreeder,
|
|
List<string>? CharacterTraits,
|
|
string? CharacterNote,
|
|
bool? IsDeaf);
|
|
|
|
public record LitterInput(
|
|
string Name,
|
|
DateOnly Date,
|
|
int? TotalBorn,
|
|
Guid? FatherId,
|
|
Guid? MotherId,
|
|
DateOnly? ExpectedGoHomeDate,
|
|
string? Notes);
|
|
|
|
public record ContactInput(string Name, string? Email, string? Phone, string? Address, string? Notes);
|
|
|
|
public record EnclosureInput(string Name, string? Notes);
|
|
|
|
public record ColorVarietyInput(string Name, string? CanonicalGenotype, int? SortOrder);
|
|
|
|
public record HealthRecordInput(
|
|
Guid GerbilId, DateOnly Date, HealthRecordType Type, string Description, string? Veterinarian);
|
|
|
|
public record WeightRecordInput(Guid GerbilId, DateOnly Date, int WeightGrams, string? Notes);
|
|
|
|
/// <summary>Hypothetical pairing request for POST /genetics/test-inbreeding.</summary>
|
|
public record TestInbreedingDto(Guid? FatherId, Guid? MotherId);
|
|
}
|