From 779a5c349b7785641ed03196da184740f1c686fd Mon Sep 17 00:00:00 2001 From: morbalint Date: Wed, 22 May 2024 22:06:55 +0200 Subject: [PATCH] [2e][db] Add coins for 2e breaking API change --- Kemkas.Web/.config/dotnet-tools.json | 8 +- ...22200515_FelszerelesCoinsFor2E.Designer.cs | 711 ++++++++++++++++++ .../20240522200515_FelszerelesCoinsFor2E.cs | 51 ++ .../ApplicationDbContextModelSnapshot.cs | 11 +- Kemkas.Web/Db/Models/V2Karakter.cs | 6 + .../Character2EDtoToDbModelService.cs | 9 +- .../CharacterDbModelToDto2EService.cs | 3 + .../ViewModels/KarakterFelszereles2eDto.cs | 9 + 8 files changed, 803 insertions(+), 5 deletions(-) create mode 100644 Kemkas.Web/Db/Migrations/20240522200515_FelszerelesCoinsFor2E.Designer.cs create mode 100644 Kemkas.Web/Db/Migrations/20240522200515_FelszerelesCoinsFor2E.cs diff --git a/Kemkas.Web/.config/dotnet-tools.json b/Kemkas.Web/.config/dotnet-tools.json index 2167ce9..a3459a4 100644 --- a/Kemkas.Web/.config/dotnet-tools.json +++ b/Kemkas.Web/.config/dotnet-tools.json @@ -6,13 +6,15 @@ "version": "8.0.0", "commands": [ "dotnet-aspnet-codegenerator" - ] + ], + "rollForward": false }, "dotnet-ef": { - "version": "8.0.0", + "version": "8.0.5", "commands": [ "dotnet-ef" - ] + ], + "rollForward": false } } } \ No newline at end of file diff --git a/Kemkas.Web/Db/Migrations/20240522200515_FelszerelesCoinsFor2E.Designer.cs b/Kemkas.Web/Db/Migrations/20240522200515_FelszerelesCoinsFor2E.Designer.cs new file mode 100644 index 0000000..6cc752e --- /dev/null +++ b/Kemkas.Web/Db/Migrations/20240522200515_FelszerelesCoinsFor2E.Designer.cs @@ -0,0 +1,711 @@ +// +using System; +using Kemkas.Web.Db; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace Kemkas.Web.Db.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20240522200515_FelszerelesCoinsFor2E")] + partial class FelszerelesCoinsFor2E + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "8.0.5") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("Kemkas.Web.Db.Models.ApplicationRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.ApplicationUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AccessFailedCount") + .HasColumnType("integer"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("boolean"); + + b.Property("LockoutEnabled") + .HasColumnType("boolean"); + + b.Property("LockoutEnd") + .HasColumnType("timestamp with time zone"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("PasswordHash") + .HasColumnType("text"); + + b.Property("PhoneNumber") + .HasColumnType("text"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("boolean"); + + b.Property("SecurityStamp") + .HasColumnType("text"); + + b.Property("TwoFactorEnabled") + .HasColumnType("boolean"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V1Felszereles", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("IsFegyver") + .HasColumnType("boolean"); + + b.Property("KarakterId") + .HasColumnType("uuid"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("KarakterId"); + + b.ToTable("Felszerelesek"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V1Karakter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Bolcsesseg") + .HasColumnType("smallint"); + + b.Property("Egeszseg") + .HasColumnType("smallint"); + + b.Property("Ero") + .HasColumnType("smallint"); + + b.Property("Faj") + .HasColumnType("integer"); + + b.Property("Intelligencia") + .HasColumnType("smallint"); + + b.Property("IsPublic") + .HasColumnType("boolean"); + + b.Property("Isten") + .HasColumnType("text"); + + b.Property("Jellem") + .HasColumnType("smallint"); + + b.Property("Karizma") + .HasColumnType("smallint"); + + b.Property("Kor") + .HasColumnType("double precision"); + + b.Property("Nem") + .HasColumnType("text"); + + b.Property("Nev") + .IsRequired() + .HasColumnType("text"); + + b.Property("Osztaly") + .HasColumnType("integer"); + + b.Property("OwnerUserId") + .HasColumnType("integer"); + + b.Property("Pajzs") + .HasColumnType("text"); + + b.Property("Pancel") + .HasColumnType("text"); + + b.Property("Szint") + .HasColumnType("smallint"); + + b.Property("Ugyesseg") + .HasColumnType("smallint"); + + b.HasKey("Id"); + + b.HasIndex("OwnerUserId"); + + b.ToTable("Karakterek"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V1KarakterKepzettseg", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("IsTolvajKepzettseg") + .HasColumnType("boolean"); + + b.Property("KarakterId") + .HasColumnType("uuid"); + + b.Property("Kepzettseg") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("KarakterId"); + + b.ToTable("KarakterKepzettsegek"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V1Szintlepes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("FegyverSpecializacio") + .HasColumnType("text"); + + b.Property("HpRoll") + .HasColumnType("smallint"); + + b.Property("KarakterId") + .HasColumnType("uuid"); + + b.Property("KarakterSzint") + .HasColumnType("smallint"); + + b.Property("TulajdonsagNoveles") + .HasColumnType("smallint"); + + b.HasKey("Id"); + + b.HasIndex("KarakterId"); + + b.ToTable("Szintlepesek"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V2Felszereles", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("IsAprosag") + .HasColumnType("boolean"); + + b.Property("IsCipelt") + .HasColumnType("boolean"); + + b.Property("IsFegyver") + .HasColumnType("boolean"); + + b.Property("IsViselt") + .HasColumnType("boolean"); + + b.Property("KarakterId") + .HasColumnType("uuid"); + + b.Property("TargyId") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("KarakterId"); + + b.ToTable("Felszerelesek2E"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V2Karakter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("AranyTaller") + .HasColumnType("integer"); + + b.Property("Bolcsesseg") + .HasColumnType("smallint"); + + b.Property("Egeszseg") + .HasColumnType("smallint"); + + b.Property("ElektrumTaller") + .HasColumnType("integer"); + + b.Property("Ero") + .HasColumnType("smallint"); + + b.Property("EzustTaller") + .HasColumnType("integer"); + + b.Property("Faj") + .HasColumnType("integer"); + + b.Property("Intelligencia") + .HasColumnType("smallint"); + + b.Property("IsPublic") + .HasColumnType("boolean"); + + b.Property("Isten") + .HasColumnType("text"); + + b.Property("Jellem") + .HasColumnType("smallint"); + + b.Property("Karizma") + .HasColumnType("smallint"); + + b.Property("Kor") + .HasColumnType("double precision"); + + b.Property("Nem") + .HasColumnType("text"); + + b.Property("Nev") + .IsRequired() + .HasColumnType("text"); + + b.Property("OwnerUserId") + .HasColumnType("integer"); + + b.Property("Pajzs") + .HasColumnType("text"); + + b.Property("Pancel") + .HasColumnType("text"); + + b.Property("Szint") + .HasColumnType("smallint"); + + b.Property("Ugyesseg") + .HasColumnType("smallint"); + + b.HasKey("Id"); + + b.HasIndex("OwnerUserId"); + + b.ToTable("Karakterek2E"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V2KarakterKepzettseg", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("IsTolvajKepzettseg") + .HasColumnType("boolean"); + + b.Property("KarakterId") + .HasColumnType("uuid"); + + b.Property("Kepzettseg") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("KarakterId"); + + b.ToTable("KarakterKepzettsegek2E"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V2Szintlepes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("FegyverSpecializacio") + .HasColumnType("text"); + + b.Property("HpRoll") + .HasColumnType("smallint"); + + b.Property("KarakterId") + .HasColumnType("uuid"); + + b.Property("KarakterSzint") + .HasColumnType("smallint"); + + b.Property("Osztaly") + .HasColumnType("integer"); + + b.Property("TolvajExtraKepzettseg") + .HasColumnType("integer"); + + b.Property("TulajdonsagNoveles") + .HasColumnType("smallint"); + + b.HasKey("Id"); + + b.HasIndex("KarakterId"); + + b.ToTable("Szintlepesek2E"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("FriendlyName") + .HasColumnType("text"); + + b.Property("Xml") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("DataProtectionKeys"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("ProviderKey") + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("ProviderDisplayName") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("integer"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("integer"); + + b.Property("LoginProvider") + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("Name") + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V1Felszereles", b => + { + b.HasOne("Kemkas.Web.Db.Models.V1Karakter", "Karakter") + .WithMany("Felszereles") + .HasForeignKey("KarakterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Karakter"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V1Karakter", b => + { + b.HasOne("Kemkas.Web.Db.Models.ApplicationUser", "OwnerUser") + .WithMany() + .HasForeignKey("OwnerUserId"); + + b.Navigation("OwnerUser"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V1KarakterKepzettseg", b => + { + b.HasOne("Kemkas.Web.Db.Models.V1Karakter", "Karakter") + .WithMany("KarakterKepzettsegek") + .HasForeignKey("KarakterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Karakter"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V1Szintlepes", b => + { + b.HasOne("Kemkas.Web.Db.Models.V1Karakter", "Karakter") + .WithMany("Szintlepesek") + .HasForeignKey("KarakterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Karakter"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V2Felszereles", b => + { + b.HasOne("Kemkas.Web.Db.Models.V2Karakter", "Karakter") + .WithMany("Felszereles") + .HasForeignKey("KarakterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Karakter"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V2Karakter", b => + { + b.HasOne("Kemkas.Web.Db.Models.ApplicationUser", "OwnerUser") + .WithMany() + .HasForeignKey("OwnerUserId"); + + b.Navigation("OwnerUser"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V2KarakterKepzettseg", b => + { + b.HasOne("Kemkas.Web.Db.Models.V2Karakter", "Karakter") + .WithMany("KarakterKepzettsegek") + .HasForeignKey("KarakterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Karakter"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V2Szintlepes", b => + { + b.HasOne("Kemkas.Web.Db.Models.V2Karakter", "Karakter") + .WithMany("Szintlepesek") + .HasForeignKey("KarakterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Karakter"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Kemkas.Web.Db.Models.ApplicationRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Kemkas.Web.Db.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Kemkas.Web.Db.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Kemkas.Web.Db.Models.ApplicationRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Kemkas.Web.Db.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Kemkas.Web.Db.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V1Karakter", b => + { + b.Navigation("Felszereles"); + + b.Navigation("KarakterKepzettsegek"); + + b.Navigation("Szintlepesek"); + }); + + modelBuilder.Entity("Kemkas.Web.Db.Models.V2Karakter", b => + { + b.Navigation("Felszereles"); + + b.Navigation("KarakterKepzettsegek"); + + b.Navigation("Szintlepesek"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Kemkas.Web/Db/Migrations/20240522200515_FelszerelesCoinsFor2E.cs b/Kemkas.Web/Db/Migrations/20240522200515_FelszerelesCoinsFor2E.cs new file mode 100644 index 0000000..3618fe4 --- /dev/null +++ b/Kemkas.Web/Db/Migrations/20240522200515_FelszerelesCoinsFor2E.cs @@ -0,0 +1,51 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Kemkas.Web.Db.Migrations +{ + /// + public partial class FelszerelesCoinsFor2E : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "AranyTaller", + table: "Karakterek2E", + type: "integer", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "ElektrumTaller", + table: "Karakterek2E", + type: "integer", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "EzustTaller", + table: "Karakterek2E", + type: "integer", + nullable: false, + defaultValue: 0); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "AranyTaller", + table: "Karakterek2E"); + + migrationBuilder.DropColumn( + name: "ElektrumTaller", + table: "Karakterek2E"); + + migrationBuilder.DropColumn( + name: "EzustTaller", + table: "Karakterek2E"); + } + } +} diff --git a/Kemkas.Web/Db/Migrations/ApplicationDbContextModelSnapshot.cs b/Kemkas.Web/Db/Migrations/ApplicationDbContextModelSnapshot.cs index 53c90d1..75f7763 100644 --- a/Kemkas.Web/Db/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Kemkas.Web/Db/Migrations/ApplicationDbContextModelSnapshot.cs @@ -17,7 +17,7 @@ namespace Kemkas.Web.Db.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.0") + .HasAnnotation("ProductVersion", "8.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); @@ -300,15 +300,24 @@ namespace Kemkas.Web.Db.Migrations .ValueGeneratedOnAdd() .HasColumnType("uuid"); + b.Property("AranyTaller") + .HasColumnType("integer"); + b.Property("Bolcsesseg") .HasColumnType("smallint"); b.Property("Egeszseg") .HasColumnType("smallint"); + b.Property("ElektrumTaller") + .HasColumnType("integer"); + b.Property("Ero") .HasColumnType("smallint"); + b.Property("EzustTaller") + .HasColumnType("integer"); + b.Property("Faj") .HasColumnType("integer"); diff --git a/Kemkas.Web/Db/Models/V2Karakter.cs b/Kemkas.Web/Db/Models/V2Karakter.cs index aed7ce2..840a04a 100644 --- a/Kemkas.Web/Db/Models/V2Karakter.cs +++ b/Kemkas.Web/Db/Models/V2Karakter.cs @@ -30,6 +30,12 @@ public class V2Karakter public string? Pancel { get; set; } public string? Pajzs { get; set; } + public int AranyTaller { get; set; } + + public int ElektrumTaller { get; set; } + + public int EzustTaller { get; set; } + [ForeignKey(nameof(OwnerUserId))] public ApplicationUser? OwnerUser { get; set; } diff --git a/Kemkas.Web/Services/SecondEdition/Character/Character2EDtoToDbModelService.cs b/Kemkas.Web/Services/SecondEdition/Character/Character2EDtoToDbModelService.cs index d3ad2b0..f537cb8 100644 --- a/Kemkas.Web/Services/SecondEdition/Character/Character2EDtoToDbModelService.cs +++ b/Kemkas.Web/Services/SecondEdition/Character/Character2EDtoToDbModelService.cs @@ -31,7 +31,10 @@ public class Character2EDtoToDbModelService : ICharacter2EDtoToDbModelService Karizma = dto.Tulajdonsagok.Kar, Szint = dto.Szint, Pajzs = dto.Felszereles.PajzsId, - Pancel = dto.Felszereles.PancelId + Pancel = dto.Felszereles.PancelId, + AranyTaller = dto.Felszereles.AranyTaller, + ElektrumTaller = dto.Felszereles.ElektrumTaller, + EzustTaller = dto.Felszereles.EzustTaller, }; karakter.KarakterKepzettsegek = ConvertKarakterKepzettsegek(dto, karakter); @@ -96,6 +99,10 @@ public class Character2EDtoToDbModelService : ICharacter2EDtoToDbModelService original.Szint = dto.Szint; original.Pajzs = dto.Felszereles.PajzsId; original.Pancel = dto.Felszereles.PancelId; + original.AranyTaller = dto.Felszereles.AranyTaller; + original.ElektrumTaller = dto.Felszereles.ElektrumTaller; + original.EzustTaller = dto.Felszereles.EzustTaller; + original.KarakterKepzettsegek = ConvertKarakterKepzettsegek(dto, original); var felszereles = dto.Felszereles.Fegyverek.Select(x => new V2Felszereles { diff --git a/Kemkas.Web/Services/SecondEdition/Character/CharacterDbModelToDto2EService.cs b/Kemkas.Web/Services/SecondEdition/Character/CharacterDbModelToDto2EService.cs index f8ef74b..df253be 100644 --- a/Kemkas.Web/Services/SecondEdition/Character/CharacterDbModelToDto2EService.cs +++ b/Kemkas.Web/Services/SecondEdition/Character/CharacterDbModelToDto2EService.cs @@ -41,6 +41,9 @@ public class CharacterDbModelToDto2EService : ICharacterDbModelToDto2EService Viselt = entity.Felszereles.Where(x => x.IsViselt).Select(x => new FelszerelesIdAndCount { Id = x.TargyId, Count = x.Count}).ToList(), Cipelt = entity.Felszereles.Where(x => x.IsCipelt).Select(x => new FelszerelesIdAndCount { Id = x.TargyId, Count = x.Count}).ToList(), Aprosagok = entity.Felszereles.Where(x => x.IsAprosag).Select(x => new FelszerelesIdAndCount { Id = x.TargyId, Count = x.Count}).ToList(), + AranyTaller = entity.AranyTaller, + ElektrumTaller = entity.ElektrumTaller, + EzustTaller = entity.EzustTaller, }, IsPublic = entity.IsPublic, Szintlepesek = entity.Szintlepesek.OrderBy(x => x.KarakterSzint).Select(sz => new Szintlepes diff --git a/Kemkas.Web/ViewModels/KarakterFelszereles2eDto.cs b/Kemkas.Web/ViewModels/KarakterFelszereles2eDto.cs index 506ebb6..d772aca 100644 --- a/Kemkas.Web/ViewModels/KarakterFelszereles2eDto.cs +++ b/Kemkas.Web/ViewModels/KarakterFelszereles2eDto.cs @@ -21,4 +21,13 @@ public class KarakterFelszereles2eDto [JsonPropertyName("aprosagok")] public IList Aprosagok { get; set; } + + [JsonPropertyName("at")] + public int AranyTaller { get; set; } + + [JsonPropertyName("el")] + public int ElektrumTaller { get; set; } + + [JsonPropertyName("et")] + public int EzustTaller { get; set; } } \ No newline at end of file