winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Models: Use nameof() in InverseProperty

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-03-15 16:41:40 +01:00
parent ebb196b094
commit d9f9ab2391
13 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Elwig/Models/Entities/AT_Gem.cs
View File

@ -11,10 +11,10 @@ namespace Elwig.Models.Entities {
[Column("name")]
public string Name { get; private set; } = null!;
[InverseProperty("Gem")]
public virtual ISet<AT_Kg> Kgs { get; private set; } = null!;
[InverseProperty(nameof(AT_Kg.Gem))]
public virtual ICollection<AT_Kg> Kgs { get; private set; } = null!;
[InverseProperty("AtGem")]
[InverseProperty(nameof(WbGem.AtGem))]
public virtual WbGem? WbGem { get; private set; }
}
}

2
Elwig/Models/Entities/AT_Kg.cs
View File

@ -16,7 +16,7 @@ namespace Elwig.Models.Entities {
[ForeignKey("Gkz")]
public virtual AT_Gem Gem { get; private set; } = null!;
[InverseProperty("AtKg")]
[InverseProperty(nameof(WbKg.AtKg))]
public virtual WbKg? WbKg { get; private set; }
}
}

4
Elwig/Models/Entities/AT_Plz.cs
View File

@ -26,7 +26,7 @@ namespace Elwig.Models.Entities {
[Column("po_box")]
public bool IsPoBox { get; private set; }
[InverseProperty("AtPlz")]
public virtual ISet<AT_PlzDest> Orte { get; private set; } = null!;
[InverseProperty(nameof(AT_PlzDest.AtPlz))]
public virtual ICollection<AT_PlzDest> Orte { get; private set; } = null!;
}
}

4
Elwig/Models/Entities/Branch.cs
View File

@ -36,7 +36,7 @@ namespace Elwig.Models.Entities {
[Column("mobile_nr")]
public string? MobileNr { get; set; }
[InverseProperty("Branch")]
public virtual ISet<Member> Members { get; private set; } = null!;
[InverseProperty(nameof(Member.Branch))]
public virtual ICollection<Member> Members { get; private set; } = null!;
}
}

4
Elwig/Models/Entities/Delivery.cs
View File

@ -66,8 +66,8 @@ namespace Elwig.Models.Entities {
[ForeignKey("Year")]
public virtual Season Season { get; private set; } = null!;
[InverseProperty("Delivery")]
public virtual ISet<DeliveryPart> Parts { get; private set; } = null!;
[InverseProperty(nameof(DeliveryPart.Delivery))]
public virtual ICollection<DeliveryPart> Parts { get; private set; } = null!;
[NotMapped]
public IEnumerable<DeliveryPart> FilteredParts => PartFilter == null ? Parts : Parts.Where(p => PartFilter(p));

10
Elwig/Models/Entities/DeliveryPart.cs
View File

@ -108,19 +108,19 @@ namespace Elwig.Models.Entities {
[Column("comment")]
public string? Comment { get; set; }
[InverseProperty("Part")]
public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; } = null!;
[InverseProperty(nameof(DeliveryPartModifier.Part))]
public virtual ICollection<DeliveryPartModifier> PartModifiers { get; private set; } = null!;
[NotMapped]
public IEnumerable<Modifier> Modifiers => PartModifiers.Select(m => m.Modifier).OrderBy(m => m.Ordering);
[InverseProperty("DeliveryPart")]
[InverseProperty(nameof(PaymentDeliveryPart.DeliveryPart))]
public virtual PaymentDeliveryPart? Payment { get; private set; }
[NotMapped]
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; } = null!;
[InverseProperty(nameof(DeliveryPartBucket.Part))]
public virtual ICollection<DeliveryPartBucket> Buckets { get; private set; } = null!;
}
}

18
Elwig/Models/Entities/Member.cs
View File

@ -153,25 +153,25 @@ namespace Elwig.Models.Entities {
[ForeignKey("ZwstId")]
public virtual Branch? Branch { get; private set; }
[InverseProperty("Member")]
public virtual ISet<AreaCom> AreaCommitments { get; private set; } = null!;
[InverseProperty(nameof(AreaCom.Member))]
public virtual ICollection<AreaCom> AreaCommitments { get; private set; } = null!;
public IEnumerable<AreaCom> ActiveAreaCommitments(AppDbContext ctx) {
return ctx.AreaCommitments
.Where(c => c.MgNr == MgNr && c.YearFrom <= Utils.CurrentYear && (c.YearTo ?? int.MaxValue) >= Utils.CurrentYear);
}
[InverseProperty("Member")]
[InverseProperty(nameof(BillingAddr.Member))]
public virtual BillingAddr? BillingAddress { get; private set; }
[InverseProperty("Member")]
public virtual ISet<Delivery> Deliveries { get; private set; } = null!;
[InverseProperty(nameof(Delivery.Member))]
public virtual ICollection<Delivery> Deliveries { get; private set; } = null!;
[InverseProperty("Member")]
public virtual ISet<MemberTelNr> TelephoneNumbers { get; private set; } = null!;
[InverseProperty(nameof(MemberTelNr.Member))]
public virtual ICollection<MemberTelNr> TelephoneNumbers { get; private set; } = null!;
[InverseProperty("member")]
public virtual ISet<MemberEmailAddr> EmailAddresses { get; private set; } = null!;
[InverseProperty(nameof(MemberEmailAddr.Member))]
public virtual ICollection<MemberEmailAddr> EmailAddresses { get; private set; } = null!;
public string FullAddress => $"{Address}, {PostalDest.AtPlz?.Plz} {PostalDest.AtPlz?.Ort.Name}";

2
Elwig/Models/Entities/PaymentMember.cs
View File

@ -48,7 +48,7 @@ namespace Elwig.Models.Entities {
[ForeignKey("MgNr")]
public virtual Member Member { get; private set; } = null!;
[InverseProperty("Payment")]
[InverseProperty(nameof(Credit.Payment))]
public virtual Credit? Credit { get; private set; }
}
}

12
Elwig/Models/Entities/PaymentVar.cs
View File

@ -48,13 +48,13 @@ namespace Elwig.Models.Entities {
[ForeignKey("Year")]
public virtual Season Season { get; private set; } = null!;
[InverseProperty("Variant")]
public virtual ISet<PaymentMember> MemberPayments { get; private set; } = null!;
[InverseProperty(nameof(PaymentMember.Variant))]
public virtual ICollection<PaymentMember> MemberPayments { get; private set; } = null!;
[InverseProperty("Variant")]
public virtual ISet<PaymentDeliveryPart> DeliveryPartPayments { get; private set; } = null!;
[InverseProperty(nameof(PaymentDeliveryPart.Variant))]
public virtual ICollection<PaymentDeliveryPart> DeliveryPartPayments { get; private set; } = null!;
[InverseProperty("Variant")]
public virtual ISet<Credit> Credits { get; private set; } = null!;
[InverseProperty(nameof(Credit.Variant))]
public virtual ICollection<Credit> Credits { get; private set; } = null!;
}
}

12
Elwig/Models/Entities/Season.cs
View File

@ -100,14 +100,14 @@ namespace Elwig.Models.Entities {
[ForeignKey("CurrencyCode")]
public virtual Currency Currency { get; private set; } = null!;
[InverseProperty("Season")]
public virtual ISet<Modifier> Modifiers { get; private set; } = null!;
[InverseProperty(nameof(Modifier.Season))]
public virtual ICollection<Modifier> Modifiers { get; private set; } = null!;
[InverseProperty("Season")]
public virtual ISet<PaymentVar> PaymentVariants { get; private set; } = null!;
[InverseProperty(nameof(PaymentVar.Season))]
public virtual ICollection<PaymentVar> PaymentVariants { get; private set; } = null!;
[InverseProperty("Season")]
public virtual ISet<Delivery> Deliveries { get; private set; } = null!;
[InverseProperty(nameof(Delivery.Season))]
public virtual ICollection<Delivery> Deliveries { get; private set; } = null!;
public decimal DecFromDb(long value) {
return Utils.DecFromDb(value, Precision);

4
Elwig/Models/Entities/WbGl.cs
View File

@ -11,7 +11,7 @@ namespace Elwig.Models.Entities {
[Column("name")]
public string Name { get; private set; } = null!;
[InverseProperty("Gl")]
public virtual ISet<WbKg> Kgs { get; private set; } = null!;
[InverseProperty(nameof(WbKg.Gl))]
public virtual ICollection<WbKg> Kgs { get; private set; } = null!;
}
}

8
Elwig/Models/Entities/WbKg.cs
View File

@ -17,11 +17,11 @@ namespace Elwig.Models.Entities {
[ForeignKey("GlNr")]
public virtual WbGl Gl { get; private set; } = null!;
[InverseProperty("Kg")]
public virtual ISet<WbRd> Rds { get; private set; } = null!;
[InverseProperty(nameof(WbRd.Kg))]
public virtual ICollection<WbRd> Rds { get; private set; } = null!;
[InverseProperty("DefaultWbKg")]
public virtual ISet<Member> Members { get; private set; } = null!;
[InverseProperty(nameof(Member.DefaultWbKg))]
public virtual ICollection<Member> Members { get; private set; } = null!;
[NotMapped]
public WbGem Gem => AtKg.Gem.WbGem!;

8
Elwig/Models/Entities/WineOrigin.cs
View File

@ -23,11 +23,11 @@ namespace Elwig.Models.Entities {
[Column("blnr")]
public int? BlNr { get; private set; }
[InverseProperty("Origin")]
public virtual ISet<WbGem> Gems { get; private set; } = null!;
[InverseProperty(nameof(WbGem.Origin))]
public virtual ICollection<WbGem> Gems { get; private set; } = null!;
[InverseProperty("Parent")]
public virtual ISet<WineOrigin> Children { get; private set; } = null!;
[InverseProperty(nameof(Parent))]
public virtual ICollection<WineOrigin> Children { get; private set; } = null!;
public int Level => (Parent?.Level + 1) ?? 0;