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>
90 lines
4.0 KiB
C#
90 lines
4.0 KiB
C#
using System.ComponentModel.DataAnnotations;
|
||
|
||
namespace GerbilManagerWebAPI.Models
|
||
{
|
||
/// <summary>
|
||
/// A gerbil (Rennmaus). Pedigree is traversed via Litter → Father/Mother (no redundant
|
||
/// parent FKs here). Genotype is one compact frozen-contract string (e.g.
|
||
/// "Aa CC Dd EE GG Pp Spsp rere", "?" wildcards allowed); never SQL-filtered.
|
||
/// </summary>
|
||
public class Gerbil
|
||
{
|
||
[Key]
|
||
public Guid Id { get; set; }
|
||
public required string Name { get; set; }
|
||
public Gender Gender { get; set; }
|
||
public GerbilStatus Status { get; set; } = GerbilStatus.Active;
|
||
|
||
// Birth litter (the litter this gerbil was born in).
|
||
public Guid? LitterId { get; set; }
|
||
public Litter? Litter { get; set; }
|
||
|
||
// Contacts: Herkunft (origin) and Abnehmer (receiver, when given away).
|
||
public Guid? OriginContactId { get; set; }
|
||
public Contact? OriginContact { get; set; }
|
||
public Guid? ReceiverContactId { get; set; }
|
||
public Contact? ReceiverContact { get; set; }
|
||
|
||
// Current home.
|
||
public Guid? EnclosureId { get; set; }
|
||
public Enclosure? Enclosure { get; set; }
|
||
|
||
// Farbschlag.
|
||
public Guid? ColorVarietyId { get; set; }
|
||
public ColorVariety? ColorVariety { get; set; }
|
||
|
||
public DateOnly? DateOfBirth { get; set; }
|
||
public DateOnly? DateOfDeath { get; set; }
|
||
public string? CauseOfDeath { get; set; }
|
||
public DateOnly? GoHomeDate { get; set; }
|
||
|
||
/// <summary>Compact genotype string (frozen GEN-1 contract). Null = not genotyped.</summary>
|
||
public string? Genotype { get; set; }
|
||
|
||
public string? Notes { get; set; }
|
||
|
||
// Provenance (for the FEAT-8 spreadsheet import).
|
||
public string? ImportSource { get; set; }
|
||
public string? ExternalRef { get; set; }
|
||
|
||
/// <summary>Raw import payload preserved verbatim (rawGenotype + unmappedTokens like
|
||
/// the Uw locus / WFNZ markers) so nothing from the spreadsheets is lost. JSON text.</summary>
|
||
public string? RawImportData { get; set; }
|
||
|
||
/// <summary>Breeder/Herkunft (cattery/Zucht) as free text — set by the FEAT-8 import from
|
||
/// the source Zucht (imported animals have no OriginContact). Gridify-filterable; the
|
||
/// distinct values back the Tiere "Herkunft" dropdown (GET /gerbils/breeders).</summary>
|
||
public string? OriginBreeder { get; set; }
|
||
|
||
/// <summary>Separator-insensitive search key: Name lowercased with whitespace/.-_ stripped.
|
||
/// Kept in sync automatically on save (see ApplicationContext.SaveChanges). Gridify-filterable
|
||
/// so "clan kleine chaoten" matches "Clan-Kleine-Chaoten" (client strips separators too).</summary>
|
||
public string? NameSearch { get; set; }
|
||
|
||
/// <summary>FEAT-14: Charakterbogen trait labels (opaque to the backend — the
|
||
/// {key,label} vocabulary lives frontend-side). Stored as a JSON text column.</summary>
|
||
public List<string> CharacterTraits { get; set; } = new();
|
||
|
||
/// <summary>FEAT-14: free-text character note; feeds the AI Verkaufstext.</summary>
|
||
public string? CharacterNote { get; set; }
|
||
|
||
/// <summary>GEN-3b: hearing/deaf phenotype flag (NOT a genotype locus — it's the
|
||
/// downstream effect of high white load / Sp×Sls). null = not stated, true = deaf
|
||
/// (dea/taub), false = hearing (Dea/hörend). Set by the FEAT-8 import from the
|
||
/// after-spsp deafness annotation; see hive/agents/god/GENETIK-notation.md.</summary>
|
||
public bool? IsDeaf { get; set; }
|
||
}
|
||
|
||
/// <summary>Shared normalisation for the separator-insensitive name search.</summary>
|
||
public static class GerbilSearch
|
||
{
|
||
public static string Normalize(string? name)
|
||
{
|
||
if (string.IsNullOrEmpty(name)) return "";
|
||
var chars = name.ToLowerInvariant()
|
||
.Where(c => !char.IsWhiteSpace(c) && c != '-' && c != '.' && c != '_');
|
||
return new string(chars.ToArray());
|
||
}
|
||
}
|
||
}
|