Entities: Use 'required' and '= null!' to get rid of warnings

This commit is contained in:
2024-02-29 15:48:09 +01:00
parent 53a25b3be4
commit f922388db9
40 changed files with 142 additions and 155 deletions

View File

@ -14,16 +14,16 @@ namespace Elwig.Models.Entities {
public int DId { get; set; }
[ForeignKey("Year, DId")]
public virtual Delivery Delivery { get; private set; }
public virtual Delivery Delivery { get; private set; } = null!;
[Column("dpnr")]
public int DPNr { get; set; }
[Column("sortid")]
public string SortId { get; set; }
public required string SortId { get; set; }
[ForeignKey("SortId")]
public virtual WineVar Variety { get; private set; }
public virtual WineVar Variety { get; private set; } = null!;
[Column("attrid")]
public string? AttrId { get; set; }
@ -49,16 +49,16 @@ namespace Elwig.Models.Entities {
}
[Column("qualid")]
public string QualId { get; set; }
public required string QualId { get; set; }
[ForeignKey("QualId")]
public virtual WineQualLevel Quality { get; private set; }
public virtual WineQualLevel Quality { get; private set; } = null!;
[Column("hkid")]
public string HkId { get; set; }
public required string HkId { get; set; }
[ForeignKey("HkId")]
public virtual WineOrigin Origin { get; private set; }
public virtual WineOrigin Origin { get; private set; } = null!;
[Column("kgnr")]
public int? KgNr { get; set; }
@ -109,7 +109,7 @@ namespace Elwig.Models.Entities {
public string? Comment { get; set; }
[InverseProperty("Part")]
public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; }
public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; } = null!;
[NotMapped]
public IEnumerable<Modifier> Modifiers => PartModifiers.Select(m => m.Modifier).OrderBy(m => m.Ordering);
@ -121,6 +121,6 @@ namespace Elwig.Models.Entities {
public string OriginString => Origin.OriginString + "\n" + (Kg?.Gl != null ? $" / {Kg.Gl.Name}" : "") + (Kg != null ? $" / {Kg.AtKg.Gem.Name} / KG {Kg.AtKg.Name}" : "") + (Rd != null ? $" / Ried {Rd.Name}" : "");
[InverseProperty("Part")]
public virtual ISet<DeliveryPartBucket> Buckets { get; private set; }
public virtual ISet<DeliveryPartBucket> Buckets { get; private set; } = null!;
}
}