diff --git a/Kemkas.Web/Config/MailgunOptions.cs b/Kemkas.Web/Config/MailgunOptions.cs index 6904e01..b5b6e5d 100644 --- a/Kemkas.Web/Config/MailgunOptions.cs +++ b/Kemkas.Web/Config/MailgunOptions.cs @@ -4,7 +4,7 @@ public class MailgunOptions { public const string Section = "Email"; - public string ApiKey { get; set; } + public string ApiKey { get; set; } = string.Empty; - public string DomainName { get; set; } + public string DomainName { get; set; } = string.Empty; } \ No newline at end of file diff --git a/Kemkas.Web/Db/Models/V1Felszereles.cs b/Kemkas.Web/Db/Models/V1Felszereles.cs index e2850d8..ca690c7 100644 --- a/Kemkas.Web/Db/Models/V1Felszereles.cs +++ b/Kemkas.Web/Db/Models/V1Felszereles.cs @@ -13,5 +13,5 @@ public class V1Felszereles public bool IsFegyver { get; set; } = true; [ForeignKey(nameof(KarakterId))] - public virtual V1Karakter Karakter { get; set; } + public virtual V1Karakter Karakter { get; set; } = null!; } \ No newline at end of file diff --git a/Kemkas.Web/Db/Models/V1Karakter.cs b/Kemkas.Web/Db/Models/V1Karakter.cs index 46d009a..4c42b93 100644 --- a/Kemkas.Web/Db/Models/V1Karakter.cs +++ b/Kemkas.Web/Db/Models/V1Karakter.cs @@ -35,11 +35,11 @@ public class V1Karakter public ApplicationUser? OwnerUser { get; set; } [InverseProperty(nameof(V1KarakterKepzettseg.Karakter))] - public virtual IEnumerable KarakterKepzettsegek { get; set; } + public virtual IEnumerable KarakterKepzettsegek { get; set; } = []; [InverseProperty(nameof(V1Szintlepes.Karakter))] - public virtual IEnumerable Szintlepesek { get; set; } + public virtual IEnumerable Szintlepesek { get; set; } = []; [InverseProperty(nameof(V1Felszereles.Karakter))] - public virtual IEnumerable Felszereles { get; set; } + public virtual IEnumerable Felszereles { get; set; } = []; } \ No newline at end of file diff --git a/Kemkas.Web/Db/Models/V1KarakterKepzettseg.cs b/Kemkas.Web/Db/Models/V1KarakterKepzettseg.cs index bd23173..5f3ed82 100644 --- a/Kemkas.Web/Db/Models/V1KarakterKepzettseg.cs +++ b/Kemkas.Web/Db/Models/V1KarakterKepzettseg.cs @@ -13,5 +13,5 @@ public class V1KarakterKepzettseg public bool IsTolvajKepzettseg { get; set; } = false; [ForeignKey(nameof(KarakterId))] - public virtual V1Karakter Karakter { get; set; } + public virtual V1Karakter Karakter { get; set; } = null!; } \ No newline at end of file diff --git a/Kemkas.Web/Db/Models/V1Szintlepes.cs b/Kemkas.Web/Db/Models/V1Szintlepes.cs index 6c465ea..1dd248a 100644 --- a/Kemkas.Web/Db/Models/V1Szintlepes.cs +++ b/Kemkas.Web/Db/Models/V1Szintlepes.cs @@ -24,5 +24,5 @@ public class V1Szintlepes public string? FegyverSpecializacio { get; set; } [ForeignKey(nameof(KarakterId))] - public virtual V1Karakter Karakter { get; set; } + public virtual V1Karakter Karakter { get; set; } = null!; } \ No newline at end of file diff --git a/Kemkas.Web/Db/Models/V2Felszereles.cs b/Kemkas.Web/Db/Models/V2Felszereles.cs index 74b8b81..2a4ca9b 100644 --- a/Kemkas.Web/Db/Models/V2Felszereles.cs +++ b/Kemkas.Web/Db/Models/V2Felszereles.cs @@ -24,5 +24,5 @@ public class V2Felszereles public bool IsAprosag { get; set; } = false; [ForeignKey(nameof(KarakterId))] - public virtual V2Karakter Karakter { get; set; } + public virtual V2Karakter Karakter { get; set; } = null!; } \ No newline at end of file diff --git a/Kemkas.Web/Db/Models/V2Karakter.cs b/Kemkas.Web/Db/Models/V2Karakter.cs index 01f0f16..35caec8 100644 --- a/Kemkas.Web/Db/Models/V2Karakter.cs +++ b/Kemkas.Web/Db/Models/V2Karakter.cs @@ -40,14 +40,14 @@ public class V2Karakter public ApplicationUser? OwnerUser { get; set; } [InverseProperty(nameof(V2KarakterKepzettseg.Karakter))] - public virtual IEnumerable KarakterKepzettsegek { get; set; } + public virtual IEnumerable KarakterKepzettsegek { get; set; } = []; [InverseProperty(nameof(V2Szintlepes.Karakter))] - public virtual IEnumerable Szintlepesek { get; set; } + public virtual IEnumerable Szintlepesek { get; set; } = []; [InverseProperty(nameof(V2Felszereles.Karakter))] - public virtual IEnumerable Felszereles { get; set; } + public virtual IEnumerable Felszereles { get; set; } = []; [InverseProperty(nameof(V2KarakterVarazslat.Karakter))] - public virtual ISet Varazslatok { get; set; } + public virtual ISet Varazslatok { get; set; } = new HashSet(); } \ No newline at end of file diff --git a/Kemkas.Web/Db/Models/V2KarakterKepzettseg.cs b/Kemkas.Web/Db/Models/V2KarakterKepzettseg.cs index 293f972..5297e43 100644 --- a/Kemkas.Web/Db/Models/V2KarakterKepzettseg.cs +++ b/Kemkas.Web/Db/Models/V2KarakterKepzettseg.cs @@ -13,5 +13,5 @@ public class V2KarakterKepzettseg public bool IsTolvajKepzettseg { get; set; } = false; [ForeignKey(nameof(KarakterId))] - public virtual V2Karakter Karakter { get; set; } + public virtual V2Karakter Karakter { get; set; } = null!; } \ No newline at end of file diff --git a/Kemkas.Web/Db/Models/V2KarakterVarazslat.cs b/Kemkas.Web/Db/Models/V2KarakterVarazslat.cs index afc33e2..ab34aef 100644 --- a/Kemkas.Web/Db/Models/V2KarakterVarazslat.cs +++ b/Kemkas.Web/Db/Models/V2KarakterVarazslat.cs @@ -18,5 +18,5 @@ public class V2KarakterVarazslat public Osztaly2E Osztaly { get; set; } [ForeignKey(nameof(KarakterId))] - public V2Karakter Karakter { get; set; } + public V2Karakter Karakter { get; set; } = null!; } \ No newline at end of file diff --git a/Kemkas.Web/Db/Models/V2Szintlepes.cs b/Kemkas.Web/Db/Models/V2Szintlepes.cs index c7f6881..e0e5e91 100644 --- a/Kemkas.Web/Db/Models/V2Szintlepes.cs +++ b/Kemkas.Web/Db/Models/V2Szintlepes.cs @@ -25,5 +25,5 @@ public class V2Szintlepes public Kepzettseg2E? TolvajExtraKepzettseg { get; set; } [ForeignKey(nameof(KarakterId))] - public virtual V2Karakter Karakter { get; set; } + public virtual V2Karakter Karakter { get; set; } = null!; } \ No newline at end of file diff --git a/Kemkas.Web/Program.cs b/Kemkas.Web/Program.cs index f99273b..6b19273 100644 --- a/Kemkas.Web/Program.cs +++ b/Kemkas.Web/Program.cs @@ -1,9 +1,7 @@ -using System.Net; using System.Text.Encodings.Web; using System.Text.Json.Serialization; using System.Text.Unicode; using Kemkas.Web.Config; -using Microsoft.EntityFrameworkCore; using Kemkas.Web.Db; using Kemkas.Web.Db.Models; using Kemkas.Web.Services.FirstEdition.Character; @@ -12,10 +10,10 @@ using Kemkas.Web.Services.SecondEdition.Character; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.Identity.UI.Services; +using Microsoft.EntityFrameworkCore; // using OpenTelemetry.Metrics; // using OpenTelemetry.Resources; // using OpenTelemetry.Trace; -using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork; var builder = WebApplication.CreateBuilder(args); // Add services to the container. @@ -65,7 +63,7 @@ app.UseForwardedHeaders(new ForwardedHeadersOptions ForwardedHostHeaderName = "X-Forwarded-Host", ForwardedProtoHeaderName = "X-Forwarded-Proto", ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedHost | ForwardedHeaders.XForwardedProto, - KnownNetworks = { new IPNetwork(new IPAddress([0,0,0,0]), 0) } + KnownIPNetworks = { System.Net.IPNetwork.Parse("0.0.0.0/0") } }); if (app.Environment.IsDevelopment()) diff --git a/Kemkas.Web/ViewModels/FelszerelesIdAndCount.cs b/Kemkas.Web/ViewModels/FelszerelesIdAndCount.cs index 7de9fa7..28896eb 100644 --- a/Kemkas.Web/ViewModels/FelszerelesIdAndCount.cs +++ b/Kemkas.Web/ViewModels/FelszerelesIdAndCount.cs @@ -5,7 +5,7 @@ namespace Kemkas.Web.ViewModels; public class FelszerelesIdAndCount { [JsonPropertyName("id")] - public string Id { get; set; } + public required string Id { get; set; } [JsonPropertyName("count")] public int Count { get; set; } diff --git a/Kemkas.Web/ViewModels/Karakter1eDto.cs b/Kemkas.Web/ViewModels/Karakter1eDto.cs index 656d0ec..2981dc4 100644 --- a/Kemkas.Web/ViewModels/Karakter1eDto.cs +++ b/Kemkas.Web/ViewModels/Karakter1eDto.cs @@ -7,7 +7,7 @@ public class Karakter1eDto { [Required] [JsonPropertyName("name")] - public string Name { get; set; } + public required string Name { get; set; } [JsonPropertyName("nem")] public string? Nem { get; set; } @@ -16,22 +16,22 @@ public class Karakter1eDto public double? Kor { get; set; } [JsonPropertyName("jellem")] - public string Jellem { get; set; } + public required string Jellem { get; set; } [JsonPropertyName("isten")] public string? Isten { get; set; } [JsonPropertyName("faj")] - public string Faj { get; set; } + public required string Faj { get; set; } [JsonPropertyName("osztaly")] - public string Osztaly { get; set; } + public required string Osztaly { get; set; } [JsonPropertyName("tulajdonsagok")] - public KarakterTulajdonsagokDto Tulajdonsagok { get; set; } + public required KarakterTulajdonsagokDto Tulajdonsagok { get; set; } [JsonPropertyName("kepzettsegek")] - public IList Kepzettsegek { get; set; } + public IList Kepzettsegek { get; set; } = []; [JsonPropertyName("tolvajkepzettsegek")] public IList? Tolvajkepzettsegek { get; set; } @@ -40,19 +40,19 @@ public class Karakter1eDto public byte Szint { get; set; } [JsonPropertyName("hpRolls")] - public IList HpRolls { get; set; } + public IList HpRolls { get; set; } = []; [JsonPropertyName("tulajdonsagNovelesek")] - public IList TulajdonsagNovelesek { get; set; } + public IList TulajdonsagNovelesek { get; set; } = []; [JsonPropertyName("harcosSpecializaciok")] - public IList HarcosSpecializaciok { get; set; } + public IList HarcosSpecializaciok { get; set; } = []; [JsonPropertyName("kalozKritikus")] - public IList KalozKritikus { get; set; } + public IList KalozKritikus { get; set; } = []; [JsonPropertyName("felszereles")] - public KarakterFelszereles1eDto Felszereles1E { get; set; } + public required KarakterFelszereles1eDto Felszereles1E { get; set; } public bool? IsPublic { get; set; } } \ No newline at end of file diff --git a/Kemkas.Web/ViewModels/Karakter2eDto.cs b/Kemkas.Web/ViewModels/Karakter2eDto.cs index 4780342..6c03ec1 100644 --- a/Kemkas.Web/ViewModels/Karakter2eDto.cs +++ b/Kemkas.Web/ViewModels/Karakter2eDto.cs @@ -7,7 +7,7 @@ public class Karakter2eDto { [Required] [JsonPropertyName("nev")] - public string Nev { get; set; } + public required string Nev { get; set; } [JsonPropertyName("nem")] public string? Nem { get; set; } @@ -16,19 +16,19 @@ public class Karakter2eDto public double? Kor { get; set; } [JsonPropertyName("jellem")] - public string Jellem { get; set; } + public required string Jellem { get; set; } [JsonPropertyName("isten")] public string? Isten { get; set; } [JsonPropertyName("faj")] - public string Faj { get; set; } + public required string Faj { get; set; } [JsonPropertyName("tulajdonsagok")] - public KarakterTulajdonsagokDto Tulajdonsagok { get; set; } + public required KarakterTulajdonsagokDto Tulajdonsagok { get; set; } [JsonPropertyName("kepzettsegek")] - public IList Kepzettsegek { get; set; } + public IList Kepzettsegek { get; set; } = []; [JsonPropertyName("tolvajkepzettsegek")] public IList? Tolvajkepzettsegek { get; set; } @@ -37,10 +37,10 @@ public class Karakter2eDto public byte Szint { get; set; } [JsonPropertyName("szintlepesek")] - public IList Szintlepesek { get; set; } + public IList Szintlepesek { get; set; } = []; [JsonPropertyName("felszereles")] - public KarakterFelszereles2eDto Felszereles { get; set; } + public required KarakterFelszereles2eDto Felszereles { get; set; } [JsonPropertyName("varazslatok")] public IList? Varazslatok { get; set; } diff --git a/Kemkas.Web/ViewModels/KarakterFelszereles1eDto.cs b/Kemkas.Web/ViewModels/KarakterFelszereles1eDto.cs index 0857e33..4953439 100644 --- a/Kemkas.Web/ViewModels/KarakterFelszereles1eDto.cs +++ b/Kemkas.Web/ViewModels/KarakterFelszereles1eDto.cs @@ -11,5 +11,5 @@ public class KarakterFelszereles1eDto public string? PajzsId { get; set; } [JsonPropertyName("fegyverIDk")] - public IList FegyverIds { get; set; } + public IList FegyverIds { get; set; } = []; } \ No newline at end of file diff --git a/Kemkas.Web/ViewModels/KarakterFelszereles2eDto.cs b/Kemkas.Web/ViewModels/KarakterFelszereles2eDto.cs index d772aca..2acbf14 100644 --- a/Kemkas.Web/ViewModels/KarakterFelszereles2eDto.cs +++ b/Kemkas.Web/ViewModels/KarakterFelszereles2eDto.cs @@ -11,16 +11,16 @@ public class KarakterFelszereles2eDto public string? PajzsId { get; set; } [JsonPropertyName("fegyverek")] - public IList Fegyverek { get; set; } + public IList Fegyverek { get; set; } = []; [JsonPropertyName("viselt")] - public IList Viselt { get; set; } + public IList Viselt { get; set; } = []; [JsonPropertyName("cipelt")] - public IList Cipelt { get; set; } + public IList Cipelt { get; set; } = []; [JsonPropertyName("aprosagok")] - public IList Aprosagok { get; set; } + public IList Aprosagok { get; set; } = []; [JsonPropertyName("at")] public int AranyTaller { get; set; } diff --git a/Kemkas.Web/ViewModels/KarakterVarazslat2eDto.cs b/Kemkas.Web/ViewModels/KarakterVarazslat2eDto.cs index 92b7121..ab66cf4 100644 --- a/Kemkas.Web/ViewModels/KarakterVarazslat2eDto.cs +++ b/Kemkas.Web/ViewModels/KarakterVarazslat2eDto.cs @@ -5,11 +5,11 @@ namespace Kemkas.Web.ViewModels; public class KarakterVarazslat2eDto { [JsonPropertyName("id")] - public string VarazslatId { get; set; } + public required string VarazslatId { get; set; } [JsonPropertyName("bekeszitve")] public bool Bekeszitve { get; set; } [JsonPropertyName("osztaly")] - public string Osztaly { get; set; } + public required string Osztaly { get; set; } } \ No newline at end of file diff --git a/Kemkas.Web/ViewModels/Szintlepes.cs b/Kemkas.Web/ViewModels/Szintlepes.cs index c6e9b57..92517fe 100644 --- a/Kemkas.Web/ViewModels/Szintlepes.cs +++ b/Kemkas.Web/ViewModels/Szintlepes.cs @@ -5,7 +5,7 @@ namespace Kemkas.Web.ViewModels; public class Szintlepes { [JsonPropertyName("osztaly")] - public string Osztaly { get; set; } + public required string Osztaly { get; set; } [JsonPropertyName("HProll")] public byte HProll { get; set; }