From d9f9ab2391f1815ae256d8a524b1cfa28c7c377c Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Fri, 15 Mar 2024 16:41:40 +0100
Subject: [PATCH] Models: Use nameof() in InverseProperty
---
Elwig/Models/Entities/AT_Gem.cs | 6 +++---
Elwig/Models/Entities/AT_Kg.cs | 2 +-
Elwig/Models/Entities/AT_Plz.cs | 4 ++--
Elwig/Models/Entities/Branch.cs | 4 ++--
Elwig/Models/Entities/Delivery.cs | 4 ++--
Elwig/Models/Entities/DeliveryPart.cs | 10 +++++-----
Elwig/Models/Entities/Member.cs | 18 +++++++++---------
Elwig/Models/Entities/PaymentMember.cs | 2 +-
Elwig/Models/Entities/PaymentVar.cs | 12 ++++++------
Elwig/Models/Entities/Season.cs | 12 ++++++------
Elwig/Models/Entities/WbGl.cs | 4 ++--
Elwig/Models/Entities/WbKg.cs | 8 ++++----
Elwig/Models/Entities/WineOrigin.cs | 8 ++++----
13 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/Elwig/Models/Entities/AT_Gem.cs b/Elwig/Models/Entities/AT_Gem.cs
index 8647bd5..15d4736 100644
--- a/Elwig/Models/Entities/AT_Gem.cs
+++ b/Elwig/Models/Entities/AT_Gem.cs
@@ -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; }
}
}
diff --git a/Elwig/Models/Entities/AT_Kg.cs b/Elwig/Models/Entities/AT_Kg.cs
index 22cdf11..f545e48 100644
--- a/Elwig/Models/Entities/AT_Kg.cs
+++ b/Elwig/Models/Entities/AT_Kg.cs
@@ -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; }
}
}
diff --git a/Elwig/Models/Entities/AT_Plz.cs b/Elwig/Models/Entities/AT_Plz.cs
index 7267516..ea021db 100644
--- a/Elwig/Models/Entities/AT_Plz.cs
+++ b/Elwig/Models/Entities/AT_Plz.cs
@@ -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!;
}
}
diff --git a/Elwig/Models/Entities/Branch.cs b/Elwig/Models/Entities/Branch.cs
index 4c0027b..83584e4 100644
--- a/Elwig/Models/Entities/Branch.cs
+++ b/Elwig/Models/Entities/Branch.cs
@@ -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!;
}
}
diff --git a/Elwig/Models/Entities/Delivery.cs b/Elwig/Models/Entities/Delivery.cs
index 39e61d8..83cca06 100644
--- a/Elwig/Models/Entities/Delivery.cs
+++ b/Elwig/Models/Entities/Delivery.cs
@@ -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));
diff --git a/Elwig/Models/Entities/DeliveryPart.cs b/Elwig/Models/Entities/DeliveryPart.cs
index d16d9b0..8510ba7 100644
--- a/Elwig/Models/Entities/DeliveryPart.cs
+++ b/Elwig/Models/Entities/DeliveryPart.cs
@@ -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!;
}
}
diff --git a/Elwig/Models/Entities/Member.cs b/Elwig/Models/Entities/Member.cs
index 5ed52a0..8ec4586 100644
--- a/Elwig/Models/Entities/Member.cs
+++ b/Elwig/Models/Entities/Member.cs
@@ -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}";
diff --git a/Elwig/Models/Entities/PaymentMember.cs b/Elwig/Models/Entities/PaymentMember.cs
index 7af44e2..bfcf6f5 100644
--- a/Elwig/Models/Entities/PaymentMember.cs
+++ b/Elwig/Models/Entities/PaymentMember.cs
@@ -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; }
}
}
diff --git a/Elwig/Models/Entities/PaymentVar.cs b/Elwig/Models/Entities/PaymentVar.cs
index 0cf553b..ff28dd1 100644
--- a/Elwig/Models/Entities/PaymentVar.cs
+++ b/Elwig/Models/Entities/PaymentVar.cs
@@ -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!;
}
}
diff --git a/Elwig/Models/Entities/Season.cs b/Elwig/Models/Entities/Season.cs
index 6ee1f2e..75f06d6 100644
--- a/Elwig/Models/Entities/Season.cs
+++ b/Elwig/Models/Entities/Season.cs
@@ -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);
diff --git a/Elwig/Models/Entities/WbGl.cs b/Elwig/Models/Entities/WbGl.cs
index 7542e00..099e129 100644
--- a/Elwig/Models/Entities/WbGl.cs
+++ b/Elwig/Models/Entities/WbGl.cs
@@ -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!;
}
}
diff --git a/Elwig/Models/Entities/WbKg.cs b/Elwig/Models/Entities/WbKg.cs
index 90b7ea0..16f6474 100644
--- a/Elwig/Models/Entities/WbKg.cs
+++ b/Elwig/Models/Entities/WbKg.cs
@@ -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!;
diff --git a/Elwig/Models/Entities/WineOrigin.cs b/Elwig/Models/Entities/WineOrigin.cs
index 9fbbf07..6e52d1f 100644
--- a/Elwig/Models/Entities/WineOrigin.cs
+++ b/Elwig/Models/Entities/WineOrigin.cs
@@ -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;