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

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

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-02-29 15:48:09 +01:00
parent 53a25b3be4
commit f922388db9
40 changed files with 142 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@ using Elwig.Helpers;
using Microsoft.EntityFrameworkCore;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
namespace Elwig.Models.Entities {
[Table("area_commitment"), PrimaryKey("FbNr")]
@ -14,7 +13,7 @@ namespace Elwig.Models.Entities {
public int MgNr { get; set; }
[Column("vtrgid")]
public string VtrgId { get; set; }
public required string VtrgId { get; set; }
[Column("cultid")]
public string? CultId { get; set; }
@ -26,7 +25,7 @@ namespace Elwig.Models.Entities {
public int KgNr { get; set; }
[Column("gstnr")]
public string GstNr { get; set; }
public required string GstNr { get; set; }
[Column("rdnr")]
public int? RdNr { get; set; }
@ -41,25 +40,24 @@ namespace Elwig.Models.Entities {
public string? Comment { get; set; }
[ForeignKey("MgNr")]
public virtual Member Member { get; private set; }
public virtual Member Member { get; private set; } = null!;
[ForeignKey("VtrgId")]
public virtual AreaComType AreaComType { get; private set; }
public virtual AreaComType AreaComType { get; private set; } = null!;
[ForeignKey("CultId")]
public virtual WineCult? WineCult { get; private set; }
[ForeignKey("KgNr")]
public virtual WbKg Kg { get; private set; }
public virtual WbKg Kg { get; private set; } = null!;
[ForeignKey("KgNr, RdNr")]
public virtual WbRd? Rd { get; private set; }
public int SearchScore(IEnumerable<string> keywords) {
var list = new string?[] {
WineCult?.Name, Kg.AtKg.Name, Rd.Name, GstNr, Comment,
}.ToList();
return Utils.GetSearchScore(list, keywords);
return Utils.GetSearchScore([
WineCult?.Name, Kg.AtKg.Name, Rd?.Name, GstNr, Comment,
], keywords);
}
}
}