From 5ca6ff014278e83a367cc2dbfb0bf66fff5e2856 Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:23:23 +0100 Subject: [PATCH 01/14] adding migrations and new table config --- .../20230910103737_Migrations_13.Designer.cs | 787 ++++++++++++++++++ .../20230910103737_Migrations_13.cs | 38 + .../20230918200125_Migration_14.Designer.cs | 784 +++++++++++++++++ .../Migrations/20230918200125_Migration_14.cs | 32 + .../ApplicationDbContextModelSnapshot.cs | 71 +- .../Persistence/ApplicationDbContext.cs | 5 + .../Persistence/ApplicationDbContextSeed.cs | 40 +- .../CustomClaimConfiguration.cs | 30 + .../Configurations/MusicConfiguration.cs | 2 - .../Services/CustomClaimsService.cs | 44 + .../Services/RoleService.cs | 4 +- 11 files changed, 1801 insertions(+), 36 deletions(-) create mode 100644 BlazorShop.Infrastructure/Migrations/20230910103737_Migrations_13.Designer.cs create mode 100644 BlazorShop.Infrastructure/Migrations/20230910103737_Migrations_13.cs create mode 100644 BlazorShop.Infrastructure/Migrations/20230918200125_Migration_14.Designer.cs create mode 100644 BlazorShop.Infrastructure/Migrations/20230918200125_Migration_14.cs create mode 100644 BlazorShop.Infrastructure/Persistence/Configurations/CustomClaimConfiguration.cs create mode 100644 BlazorShop.Infrastructure/Services/CustomClaimsService.cs diff --git a/BlazorShop.Infrastructure/Migrations/20230910103737_Migrations_13.Designer.cs b/BlazorShop.Infrastructure/Migrations/20230910103737_Migrations_13.Designer.cs new file mode 100644 index 00000000..454bc592 --- /dev/null +++ b/BlazorShop.Infrastructure/Migrations/20230910103737_Migrations_13.Designer.cs @@ -0,0 +1,787 @@ +// +#pragma warning disable CS1591 + +using System; +using BlazorShop.Infrastructure.Persistence; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace BlazorShop.Infrastructure.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20230910103737_Migrations_13")] + partial class Migrations_13 + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Cart", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("ClotheId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Price") + .HasColumnType("decimal(18, 2)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ClotheId"); + + b.HasIndex("UserId"); + + b.ToTable("Carts", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Clothe", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(1000) + .HasColumnType("nvarchar(1000)"); + + b.Property("ImageName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ImagePath") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("IsActive") + .IsRequired() + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Price") + .IsRequired() + .HasColumnType("decimal(18, 2)"); + + b.HasKey("Id"); + + b.ToTable("Clothes", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.CustomClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("nvarchar(250)"); + + b.Property("ClaimValue") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.HasKey("Id"); + + b.ToTable("CustomClaims", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.Role", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("nvarchar(max)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("NormalizedName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AppRoles", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.RoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ClaimValue") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("RoleId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AppRoleClaims", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("AccessFailedCount") + .HasColumnType("int"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("nvarchar(max)"); + + b.Property("Email") + .IsRequired() + .HasMaxLength(150) + .HasColumnType("nvarchar(150)"); + + b.Property("EmailConfirmed") + .HasColumnType("bit"); + + b.Property("FirstName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("IsActive") + .HasColumnType("bit"); + + b.Property("LastName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("LockoutEnabled") + .HasColumnType("bit"); + + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); + + b.Property("NormalizedEmail") + .IsRequired() + .HasMaxLength(150) + .HasColumnType("nvarchar(150)"); + + b.Property("NormalizedUserName") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("nvarchar(250)"); + + b.Property("PasswordHash") + .HasColumnType("nvarchar(max)"); + + b.Property("PhoneNumber") + .HasColumnType("nvarchar(max)"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("bit"); + + b.Property("SecurityStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("TwoFactorEnabled") + .HasColumnType("bit"); + + b.Property("UserName") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("nvarchar(250)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AppUsers", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ClaimValue") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AppUserClaims", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("nvarchar(450)"); + + b.Property("ProviderKey") + .HasColumnType("nvarchar(450)"); + + b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AppUserLogins", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserRole", b => + { + b.Property("UserId") + .HasColumnType("int"); + + b.Property("RoleId") + .HasColumnType("int"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AppUserRoles", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserToken", b => + { + b.Property("UserId") + .HasColumnType("int"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(450)"); + + b.Property("Name") + .HasColumnType("nvarchar(450)"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AppUserTokens", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Invoice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("AmountSubTotal") + .HasColumnType("int"); + + b.Property("AmountTotal") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Quantity") + .HasColumnType("int"); + + b.Property("UserEmail") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.HasKey("Id"); + + b.ToTable("Invoices", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Music", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("AccessLevel") + .HasColumnType("int"); + + b.Property("Author") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("DateRelease") + .HasColumnType("datetime2"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(1000) + .HasColumnType("nvarchar(1000)"); + + b.Property("ImageName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ImagePath") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.HasKey("Id"); + + b.ToTable("Musics", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("AmountTotal") + .HasMaxLength(50) + .HasColumnType("int"); + + b.Property("LineItems") + .IsRequired() + .HasMaxLength(10000) + .HasColumnType("nvarchar(max)"); + + b.Property("OrderDate") + .HasColumnType("datetime2"); + + b.Property("OrderName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("UserEmail") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.HasKey("Id"); + + b.ToTable("Orders", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Receipt", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ReceiptDate") + .HasColumnType("datetime2"); + + b.Property("ReceiptName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ReceiptUrl") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("nvarchar(500)"); + + b.Property("UserEmail") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.HasKey("Id"); + + b.ToTable("Receipts", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Subscriber", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CurrentPeriodEnd") + .HasColumnType("datetime2"); + + b.Property("CurrentPeriodStart") + .HasColumnType("datetime2"); + + b.Property("CustomerId") + .HasColumnType("int"); + + b.Property("DateStart") + .HasColumnType("datetime2"); + + b.Property("HostedInvoiceUrl") + .IsRequired() + .HasMaxLength(700) + .HasColumnType("nvarchar(700)"); + + b.Property("Status") + .HasMaxLength(50) + .HasColumnType("int"); + + b.Property("StripeSubscriberSubscriptionId") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("nvarchar(500)"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("CustomerId"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("Subscribers", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Subscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ChargeType") + .IsRequired() + .HasMaxLength(25) + .HasColumnType("nvarchar(25)"); + + b.Property("Currency") + .IsRequired() + .HasMaxLength(25) + .HasColumnType("nvarchar(25)"); + + b.Property("CurrencySymbol") + .IsRequired() + .HasMaxLength(5) + .HasColumnType("nvarchar(5)"); + + b.Property("ImageName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ImagePath") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Options") + .IsRequired() + .HasMaxLength(1000) + .HasColumnType("nvarchar(1000)"); + + b.Property("Price") + .HasColumnType("int"); + + b.Property("StripeSubscriptionId") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Subscriptions", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.TodoItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Done") + .HasColumnType("bit"); + + b.Property("ListId") + .HasColumnType("int"); + + b.Property("Note") + .HasMaxLength(1000) + .HasColumnType("nvarchar(1000)"); + + b.Property("Priority") + .HasColumnType("int"); + + b.Property("State") + .HasColumnType("int"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.HasKey("Id"); + + b.HasIndex("ListId"); + + b.ToTable("TodoItems", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.TodoList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.HasKey("Id"); + + b.ToTable("TodoLists", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Cart", b => + { + b.HasOne("BlazorShop.Domain.Entities.Clothe", "Clothe") + .WithMany() + .HasForeignKey("ClotheId"); + + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "User") + .WithMany() + .HasForeignKey("UserId"); + + b.Navigation("Clothe"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.RoleClaim", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.Role", "Role") + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserClaim", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "User") + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserLogin", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "User") + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserRole", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.Role", "Role") + .WithMany("Users") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "User") + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserToken", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "User") + .WithMany("UserTokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Subscriber", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "Customer") + .WithMany() + .HasForeignKey("CustomerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BlazorShop.Domain.Entities.Subscription", "Subscription") + .WithMany() + .HasForeignKey("SubscriptionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Customer"); + + b.Navigation("Subscription"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.TodoItem", b => + { + b.HasOne("BlazorShop.Domain.Entities.TodoList", "List") + .WithMany("Items") + .HasForeignKey("ListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("List"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.Role", b => + { + b.Navigation("Claims"); + + b.Navigation("Users"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.User", b => + { + b.Navigation("Claims"); + + b.Navigation("Logins"); + + b.Navigation("Roles"); + + b.Navigation("UserTokens"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.TodoList", b => + { + b.Navigation("Items"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/BlazorShop.Infrastructure/Migrations/20230910103737_Migrations_13.cs b/BlazorShop.Infrastructure/Migrations/20230910103737_Migrations_13.cs new file mode 100644 index 00000000..6ed394d8 --- /dev/null +++ b/BlazorShop.Infrastructure/Migrations/20230910103737_Migrations_13.cs @@ -0,0 +1,38 @@ +// +#pragma warning disable CS1591 + +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BlazorShop.Infrastructure.Migrations +{ + /// + public partial class Migrations_13 : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "CustomClaims", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ClaimType = table.Column(type: "nvarchar(250)", maxLength: 250, nullable: false), + ClaimValue = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_CustomClaims", x => x.Id); + }); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "CustomClaims"); + } + } +} diff --git a/BlazorShop.Infrastructure/Migrations/20230918200125_Migration_14.Designer.cs b/BlazorShop.Infrastructure/Migrations/20230918200125_Migration_14.Designer.cs new file mode 100644 index 00000000..2f67a2e7 --- /dev/null +++ b/BlazorShop.Infrastructure/Migrations/20230918200125_Migration_14.Designer.cs @@ -0,0 +1,784 @@ +// +#pragma warning disable CS1591 + +using System; +using BlazorShop.Infrastructure.Persistence; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace BlazorShop.Infrastructure.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20230918200125_Migration_14")] + partial class Migration_14 + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Cart", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("ClotheId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Price") + .HasColumnType("decimal(18, 2)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ClotheId"); + + b.HasIndex("UserId"); + + b.ToTable("Carts", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Clothe", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(1000) + .HasColumnType("nvarchar(1000)"); + + b.Property("ImageName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ImagePath") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("IsActive") + .IsRequired() + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Price") + .IsRequired() + .HasColumnType("decimal(18, 2)"); + + b.HasKey("Id"); + + b.ToTable("Clothes", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.CustomClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("nvarchar(250)"); + + b.Property("ClaimValue") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.HasKey("Id"); + + b.ToTable("CustomClaims", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.Role", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("nvarchar(max)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("NormalizedName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AppRoles", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.RoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ClaimValue") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("RoleId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AppRoleClaims", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("AccessFailedCount") + .HasColumnType("int"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("nvarchar(max)"); + + b.Property("Email") + .IsRequired() + .HasMaxLength(150) + .HasColumnType("nvarchar(150)"); + + b.Property("EmailConfirmed") + .HasColumnType("bit"); + + b.Property("FirstName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("IsActive") + .HasColumnType("bit"); + + b.Property("LastName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("LockoutEnabled") + .HasColumnType("bit"); + + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); + + b.Property("NormalizedEmail") + .IsRequired() + .HasMaxLength(150) + .HasColumnType("nvarchar(150)"); + + b.Property("NormalizedUserName") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("nvarchar(250)"); + + b.Property("PasswordHash") + .HasColumnType("nvarchar(max)"); + + b.Property("PhoneNumber") + .HasColumnType("nvarchar(max)"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("bit"); + + b.Property("SecurityStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("TwoFactorEnabled") + .HasColumnType("bit"); + + b.Property("UserName") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("nvarchar(250)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AppUsers", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ClaimValue") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AppUserClaims", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("nvarchar(450)"); + + b.Property("ProviderKey") + .HasColumnType("nvarchar(450)"); + + b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AppUserLogins", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserRole", b => + { + b.Property("UserId") + .HasColumnType("int"); + + b.Property("RoleId") + .HasColumnType("int"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AppUserRoles", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserToken", b => + { + b.Property("UserId") + .HasColumnType("int"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(450)"); + + b.Property("Name") + .HasColumnType("nvarchar(450)"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AppUserTokens", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Invoice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("AmountSubTotal") + .HasColumnType("int"); + + b.Property("AmountTotal") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Quantity") + .HasColumnType("int"); + + b.Property("UserEmail") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.HasKey("Id"); + + b.ToTable("Invoices", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Music", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Author") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("DateRelease") + .HasColumnType("datetime2"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(1000) + .HasColumnType("nvarchar(1000)"); + + b.Property("ImageName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ImagePath") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.HasKey("Id"); + + b.ToTable("Musics", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("AmountTotal") + .HasMaxLength(50) + .HasColumnType("int"); + + b.Property("LineItems") + .IsRequired() + .HasMaxLength(10000) + .HasColumnType("nvarchar(max)"); + + b.Property("OrderDate") + .HasColumnType("datetime2"); + + b.Property("OrderName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("UserEmail") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.HasKey("Id"); + + b.ToTable("Orders", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Receipt", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ReceiptDate") + .HasColumnType("datetime2"); + + b.Property("ReceiptName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ReceiptUrl") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("nvarchar(500)"); + + b.Property("UserEmail") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.HasKey("Id"); + + b.ToTable("Receipts", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Subscriber", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CurrentPeriodEnd") + .HasColumnType("datetime2"); + + b.Property("CurrentPeriodStart") + .HasColumnType("datetime2"); + + b.Property("CustomerId") + .HasColumnType("int"); + + b.Property("DateStart") + .HasColumnType("datetime2"); + + b.Property("HostedInvoiceUrl") + .IsRequired() + .HasMaxLength(700) + .HasColumnType("nvarchar(700)"); + + b.Property("Status") + .HasMaxLength(50) + .HasColumnType("int"); + + b.Property("StripeSubscriberSubscriptionId") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("nvarchar(500)"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("CustomerId"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("Subscribers", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Subscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ChargeType") + .IsRequired() + .HasMaxLength(25) + .HasColumnType("nvarchar(25)"); + + b.Property("Currency") + .IsRequired() + .HasMaxLength(25) + .HasColumnType("nvarchar(25)"); + + b.Property("CurrencySymbol") + .IsRequired() + .HasMaxLength(5) + .HasColumnType("nvarchar(5)"); + + b.Property("ImageName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("ImagePath") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Options") + .IsRequired() + .HasMaxLength(1000) + .HasColumnType("nvarchar(1000)"); + + b.Property("Price") + .HasColumnType("int"); + + b.Property("StripeSubscriptionId") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Subscriptions", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.TodoItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Done") + .HasColumnType("bit"); + + b.Property("ListId") + .HasColumnType("int"); + + b.Property("Note") + .HasMaxLength(1000) + .HasColumnType("nvarchar(1000)"); + + b.Property("Priority") + .HasColumnType("int"); + + b.Property("State") + .HasColumnType("int"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.HasKey("Id"); + + b.HasIndex("ListId"); + + b.ToTable("TodoItems", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.TodoList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.HasKey("Id"); + + b.ToTable("TodoLists", (string)null); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Cart", b => + { + b.HasOne("BlazorShop.Domain.Entities.Clothe", "Clothe") + .WithMany() + .HasForeignKey("ClotheId"); + + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "User") + .WithMany() + .HasForeignKey("UserId"); + + b.Navigation("Clothe"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.RoleClaim", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.Role", "Role") + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserClaim", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "User") + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserLogin", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "User") + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserRole", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.Role", "Role") + .WithMany("Users") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "User") + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.UserToken", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "User") + .WithMany("UserTokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Subscriber", b => + { + b.HasOne("BlazorShop.Domain.Entities.Identity.User", "Customer") + .WithMany() + .HasForeignKey("CustomerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("BlazorShop.Domain.Entities.Subscription", "Subscription") + .WithMany() + .HasForeignKey("SubscriptionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Customer"); + + b.Navigation("Subscription"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.TodoItem", b => + { + b.HasOne("BlazorShop.Domain.Entities.TodoList", "List") + .WithMany("Items") + .HasForeignKey("ListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("List"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.Role", b => + { + b.Navigation("Claims"); + + b.Navigation("Users"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.User", b => + { + b.Navigation("Claims"); + + b.Navigation("Logins"); + + b.Navigation("Roles"); + + b.Navigation("UserTokens"); + }); + + modelBuilder.Entity("BlazorShop.Domain.Entities.TodoList", b => + { + b.Navigation("Items"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/BlazorShop.Infrastructure/Migrations/20230918200125_Migration_14.cs b/BlazorShop.Infrastructure/Migrations/20230918200125_Migration_14.cs new file mode 100644 index 00000000..0fed0564 --- /dev/null +++ b/BlazorShop.Infrastructure/Migrations/20230918200125_Migration_14.cs @@ -0,0 +1,32 @@ +// +#pragma warning disable CS1591 + +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BlazorShop.Infrastructure.Migrations +{ + /// + public partial class Migration_14 : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "AccessLevel", + table: "Musics"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "AccessLevel", + table: "Musics", + type: "int", + nullable: false, + defaultValue: 0); + } + } +} diff --git a/BlazorShop.Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs b/BlazorShop.Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs index 84050ea2..eac4a917 100644 --- a/BlazorShop.Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/BlazorShop.Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs @@ -1,7 +1,10 @@ -// -#pragma warning disable CS1591 - +// +using System; +using BlazorShop.Infrastructure.Persistence; +using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable @@ -14,10 +17,10 @@ protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "6.0.1") + .HasAnnotation("ProductVersion", "7.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 128); - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); modelBuilder.Entity("BlazorShop.Domain.Entities.Cart", b => { @@ -25,7 +28,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("Amount") .HasColumnType("int"); @@ -39,7 +42,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("nvarchar(200)"); b.Property("Price") - .HasColumnType("decimal(18,2)"); + .HasColumnType("decimal(18, 2)"); b.Property("UserId") .HasColumnType("int"); @@ -59,7 +62,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("Amount") .HasColumnType("int"); @@ -90,20 +93,43 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("Price") .IsRequired() - .HasColumnType("decimal(18,2)"); + .HasColumnType("decimal(18, 2)"); b.HasKey("Id"); b.ToTable("Clothes", (string)null); }); + modelBuilder.Entity("BlazorShop.Domain.Entities.CustomClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("nvarchar(250)"); + + b.Property("ClaimValue") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.HasKey("Id"); + + b.ToTable("CustomClaims", (string)null); + }); + modelBuilder.Entity("BlazorShop.Domain.Entities.Identity.Role", b => { b.Property("Id") .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("ConcurrencyStamp") .IsConcurrencyToken() @@ -134,7 +160,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("ClaimType") .IsRequired() @@ -162,7 +188,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("AccessFailedCount") .HasColumnType("int"); @@ -246,7 +272,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("ClaimType") .IsRequired() @@ -329,7 +355,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("AmountSubTotal") .HasColumnType("int"); @@ -361,10 +387,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); - - b.Property("AccessLevel") - .HasColumnType("int"); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("Author") .IsRequired() @@ -405,7 +428,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("AmountTotal") .HasMaxLength(50) @@ -440,7 +463,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("ReceiptDate") .HasColumnType("datetime2"); @@ -471,7 +494,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("CurrentPeriodEnd") .HasColumnType("datetime2"); @@ -517,7 +540,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("ChargeType") .IsRequired() @@ -572,7 +595,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("Done") .HasColumnType("bit"); @@ -608,7 +631,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("Title") .IsRequired() diff --git a/BlazorShop.Infrastructure/Persistence/ApplicationDbContext.cs b/BlazorShop.Infrastructure/Persistence/ApplicationDbContext.cs index 3b240c6e..0590694b 100644 --- a/BlazorShop.Infrastructure/Persistence/ApplicationDbContext.cs +++ b/BlazorShop.Infrastructure/Persistence/ApplicationDbContext.cs @@ -69,6 +69,9 @@ protected ApplicationDbContext() /// public DbSet TodoLists { get; set; } + /// + public DbSet CustomClaims { get; set; } + /// public override async Task SaveChangesAsync(CancellationToken cancellationToken = default) { @@ -103,6 +106,8 @@ protected override void OnModelCreating(ModelBuilder builder) builder.ApplyConfiguration(new SubscriptionConfiguration()); builder.ApplyConfiguration(new TodoItemConfiguration()); builder.ApplyConfiguration(new TodoListConfiguration()); + + builder.ApplyConfiguration(new CustomClaimConfiguration()); } /// diff --git a/BlazorShop.Infrastructure/Persistence/ApplicationDbContextSeed.cs b/BlazorShop.Infrastructure/Persistence/ApplicationDbContextSeed.cs index e1ce79b1..252ec1ad 100644 --- a/BlazorShop.Infrastructure/Persistence/ApplicationDbContextSeed.cs +++ b/BlazorShop.Infrastructure/Persistence/ApplicationDbContextSeed.cs @@ -9,6 +9,38 @@ namespace BlazorShop.Infrastructure.Persistence /// public static class ApplicationDbContextSeed { + /// + /// Adding the custom claims data when the app is deploy the first time. + /// + /// The instance of to use. + /// A representing the result of the asynchronous operation. + public static async Task SeedCustomClaimsAsync(ApplicationDbContext context) + { + if (!context.CustomClaims.Any()) + { + context.CustomClaims.AddRange(new List + { + new CustomClaim + { + ClaimType = ClaimTypes.Role, + ClaimValue = "BASIC", + }, + new CustomClaim + { + ClaimType = ClaimTypes.Role, + ClaimValue = "PRO", + }, + new CustomClaim + { + ClaimType = ClaimTypes.Role, + ClaimValue = "ENTERPRISE", + }, + }); + + await context.SaveChangesAsync(); + } + } + /// /// Adding the roles data when the app is deploy the first time. /// @@ -229,7 +261,6 @@ public static async Task SeedMusicsDataAsync(ApplicationDbContext context) DateRelease = new DateTime(2020, 12, 25), ImageName = "music-1", ImagePath = "music-1.jpg", - AccessLevel = 1, }); context.Musics.Add(new Music { @@ -239,7 +270,6 @@ public static async Task SeedMusicsDataAsync(ApplicationDbContext context) DateRelease = new DateTime(2022, 1, 15), ImageName = "music-2", ImagePath = "music-2.jpg", - AccessLevel = 1, }); context.Musics.Add(new Music { @@ -249,7 +279,6 @@ public static async Task SeedMusicsDataAsync(ApplicationDbContext context) DateRelease = new DateTime(2019, 8, 30), ImageName = "music-3", ImagePath = "music-3.jpg", - AccessLevel = 2, }); context.Musics.Add(new Music { @@ -259,7 +288,6 @@ public static async Task SeedMusicsDataAsync(ApplicationDbContext context) DateRelease = new DateTime(2011, 11, 11), ImageName = "music-4", ImagePath = "music-4.jpg", - AccessLevel = 2, }); context.Musics.Add(new Music { @@ -269,7 +297,6 @@ public static async Task SeedMusicsDataAsync(ApplicationDbContext context) DateRelease = new DateTime(2022, 1, 19), ImageName = "music-5", ImagePath = "music-5.jpg", - AccessLevel = 2, }); context.Musics.Add(new Music { @@ -279,7 +306,6 @@ public static async Task SeedMusicsDataAsync(ApplicationDbContext context) DateRelease = new DateTime(2015, 5, 15), ImageName = "music-6", ImagePath = "music-6.jpg", - AccessLevel = 3, }); context.Musics.Add(new Music { @@ -289,7 +315,6 @@ public static async Task SeedMusicsDataAsync(ApplicationDbContext context) DateRelease = new DateTime(2013, 9, 15), ImageName = "music-2", ImagePath = "music-2.jpg", - AccessLevel = 3, }); context.Musics.Add(new Music { @@ -299,7 +324,6 @@ public static async Task SeedMusicsDataAsync(ApplicationDbContext context) DateRelease = new DateTime(2019, 5, 15), ImageName = "music-6", ImagePath = "music-6.jpg", - AccessLevel = 3, }); await context.SaveChangesAsync(); diff --git a/BlazorShop.Infrastructure/Persistence/Configurations/CustomClaimConfiguration.cs b/BlazorShop.Infrastructure/Persistence/Configurations/CustomClaimConfiguration.cs new file mode 100644 index 00000000..586bb5bd --- /dev/null +++ b/BlazorShop.Infrastructure/Persistence/Configurations/CustomClaimConfiguration.cs @@ -0,0 +1,30 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Infrastructure.Persistence.Configurations +{ + /// + /// The configuration for the entity . + /// + public class CustomClaimConfiguration : IEntityTypeConfiguration + { + /// + /// A method to configure an entity. + /// + /// The builder for configuring the entity metadata. + public void Configure(EntityTypeBuilder builder) + { + builder.ToTable("CustomClaims"); + + builder.HasKey(x => x.Id); + + builder.Property(t => t.ClaimType) + .HasMaxLength(250) + .IsRequired(); + builder.Property(t => t.ClaimValue) + .HasMaxLength(50) + .IsRequired(); + } + } +} diff --git a/BlazorShop.Infrastructure/Persistence/Configurations/MusicConfiguration.cs b/BlazorShop.Infrastructure/Persistence/Configurations/MusicConfiguration.cs index 3103b6df..74a195dd 100644 --- a/BlazorShop.Infrastructure/Persistence/Configurations/MusicConfiguration.cs +++ b/BlazorShop.Infrastructure/Persistence/Configurations/MusicConfiguration.cs @@ -35,8 +35,6 @@ public void Configure(EntityTypeBuilder builder) builder.Property(t => t.ImagePath) .HasMaxLength(200) .IsRequired(); - builder.Property(t => t.AccessLevel) - .IsRequired(); } } } diff --git a/BlazorShop.Infrastructure/Services/CustomClaimsService.cs b/BlazorShop.Infrastructure/Services/CustomClaimsService.cs new file mode 100644 index 00000000..8f9dbde4 --- /dev/null +++ b/BlazorShop.Infrastructure/Services/CustomClaimsService.cs @@ -0,0 +1,44 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Infrastructure.Services +{ + /// + /// An implementation of . + /// + public class CustomClaimsService : ICustomClaimsService + { + /// + /// Initializes a new instance of the class. + /// + /// The instance of to use. + public CustomClaimsService(UserManager userManager) + { + this.UserManager = userManager; + } + + /// + /// Gets the instance of the to use. + /// + private UserManager UserManager { get; } + + /// + public Task AddUserClaim() + { + throw new NotImplementedException(); + } + + /// + public Task DeleteUserClaim() + { + throw new NotImplementedException(); + } + + /// + public Task UpdateUserClaim() + { + throw new NotImplementedException(); + } + } +} diff --git a/BlazorShop.Infrastructure/Services/RoleService.cs b/BlazorShop.Infrastructure/Services/RoleService.cs index b3420a56..ebf745da 100644 --- a/BlazorShop.Infrastructure/Services/RoleService.cs +++ b/BlazorShop.Infrastructure/Services/RoleService.cs @@ -149,7 +149,7 @@ public RoleResponse GetRoleByNormalizedName(string normalizedName) } /// - public async Task CreateRoleAsync(CreateRoleCommand command) + public async Task CreateRoleAsync(CreateClaimCommand command) { var role = await this.RoleManager.FindByNameAsync(command.Name); if (role != null) @@ -168,7 +168,7 @@ await this.RoleManager.CreateAsync(new Role } /// - public async Task UpdateRoleAsync(UpdateRoleCommand command) + public async Task UpdateRoleAsync(UpdateClaimCommand command) { var existsRole = await this.RoleManager.FindByNameAsync(command.Name); if (existsRole != null) From 50496f9f1b528437f9dd561277330148d26e183d Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:23:32 +0100 Subject: [PATCH 02/14] adding docs --- .../Commands/RoleHandler/CreateRoleCommandHandlerTests.cs | 4 ++-- .../Commands/RoleHandler/DeleteRoleCommandHandlerTests.cs | 4 ++-- .../Commands/RoleHandler/UpdateRoleCommandHandlerTests.cs | 4 ++-- .../Queries/RoleHandler/GetRoleByIdQueryHandlerTests.cs | 4 ++-- .../RoleHandler/GetRoleByNormalizedNameQueryHandlerTests.cs | 4 ++-- .../Queries/RoleHandler/GetRolesForAdminQueryHandlerTests.cs | 4 ++-- .../Handlers/Queries/RoleHandler/GetRolesQueryHandlerTests.cs | 4 ++-- BlazorShop.UnitTests/Controllers/RolesControllerTests.cs | 4 ++-- BlazorShop.UnitTests/Infrastructure/RoleServiceTests.cs | 4 ++-- BlazorShop.UnitTests/WebClient/Auth/AuthStateProviderTests.cs | 2 +- .../WebClient/Auth/AuthenticationServiceTests.cs | 2 +- .../WebClient/Services/AccountServiceTests.cs | 2 +- BlazorShop.UnitTests/WebClient/Services/CartServiceTests.cs | 2 +- BlazorShop.UnitTests/WebClient/Services/ClotheServiceTests.cs | 2 +- BlazorShop.UnitTests/WebClient/Services/MusicServiceTests.cs | 2 +- BlazorShop.UnitTests/WebClient/Services/OrderServiceTests.cs | 2 +- .../WebClient/Services/ReceiptServiceTests.cs | 2 +- BlazorShop.UnitTests/WebClient/Services/RoleServiceTests.cs | 2 +- BlazorShop.UnitTests/WebClient/Services/StripeServiceTests.cs | 2 +- .../WebClient/Services/SubscriberServiceTests.cs | 2 +- .../WebClient/Services/SubscriptionServiceTests.cs | 2 +- .../WebClient/Services/TodoItemServiceTests.cs | 2 +- .../WebClient/Services/TodoListServiceTests.cs | 2 +- BlazorShop.UnitTests/WebClient/Services/UserServiceTests.cs | 2 +- BlazorShop.UnitTests/WorkerService/WorkerServiceTests.cs | 2 +- 25 files changed, 34 insertions(+), 34 deletions(-) diff --git a/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/CreateRoleCommandHandlerTests.cs b/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/CreateRoleCommandHandlerTests.cs index 9a38e31e..d236cbd7 100644 --- a/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/CreateRoleCommandHandlerTests.cs +++ b/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/CreateRoleCommandHandlerTests.cs @@ -47,7 +47,7 @@ public CreateRoleCommandHandlerTests() private ILogger Logger { get; } /// - /// A test for method. + /// A test for method. /// /// A representing the result of the asynchronous operation. [Fact] @@ -57,7 +57,7 @@ public async Task Handle() } /// - /// A test for method. + /// A test for method. /// /// A representing the result of the asynchronous operation. [Fact] diff --git a/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/DeleteRoleCommandHandlerTests.cs b/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/DeleteRoleCommandHandlerTests.cs index a87b5f63..52819e76 100644 --- a/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/DeleteRoleCommandHandlerTests.cs +++ b/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/DeleteRoleCommandHandlerTests.cs @@ -47,7 +47,7 @@ public DeleteRoleCommandHandlerTests() private ILogger Logger { get; } /// - /// A test for method. + /// A test for method. /// /// A representing the result of the asynchronous operation. [Fact] @@ -57,7 +57,7 @@ public async Task Handle() } /// - /// A test for method. + /// A test for method. /// /// A representing the result of the asynchronous operation. [Fact] diff --git a/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/UpdateRoleCommandHandlerTests.cs b/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/UpdateRoleCommandHandlerTests.cs index e727f389..cfe07c51 100644 --- a/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/UpdateRoleCommandHandlerTests.cs +++ b/BlazorShop.UnitTests/Application/Handlers/Commands/RoleHandler/UpdateRoleCommandHandlerTests.cs @@ -47,7 +47,7 @@ public UpdateRoleCommandHandlerTests() private ILogger Logger { get; } /// - /// A test for method. + /// A test for method. /// /// A representing the result of the asynchronous operation. [Fact] @@ -57,7 +57,7 @@ public async Task Handle() } /// - /// A test for method. + /// A test for method. /// /// A representing the result of the asynchronous operation. [Fact] diff --git a/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRoleByIdQueryHandlerTests.cs b/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRoleByIdQueryHandlerTests.cs index 710b8d28..f7351edd 100644 --- a/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRoleByIdQueryHandlerTests.cs +++ b/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRoleByIdQueryHandlerTests.cs @@ -50,7 +50,7 @@ public GetRoleByIdQueryHandlerTests() private IMapper Mapper { get; } = Mock.Of(); /// - /// A test for method. + /// A test for method. /// /// A async result. [Fact] @@ -60,7 +60,7 @@ public async Task Handle() } /// - /// A test for method. + /// A test for method. /// /// A async result. [Fact] diff --git a/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRoleByNormalizedNameQueryHandlerTests.cs b/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRoleByNormalizedNameQueryHandlerTests.cs index 628ac720..0782efd0 100644 --- a/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRoleByNormalizedNameQueryHandlerTests.cs +++ b/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRoleByNormalizedNameQueryHandlerTests.cs @@ -50,7 +50,7 @@ public GetRoleByNormalizedNameQueryHandlerTests() private IMapper Mapper { get; } = Mock.Of(); /// - /// A test for method. + /// A test for method. /// /// A async result. [Fact] @@ -60,7 +60,7 @@ public async Task Handle() } /// - /// A test for method. + /// A test for method. /// /// A async result. [Fact] diff --git a/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRolesForAdminQueryHandlerTests.cs b/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRolesForAdminQueryHandlerTests.cs index ada51aef..ec06e5c3 100644 --- a/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRolesForAdminQueryHandlerTests.cs +++ b/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRolesForAdminQueryHandlerTests.cs @@ -50,7 +50,7 @@ public GetRolesForAdminQueryHandlerTests() private IMapper Mapper { get; } = Mock.Of(); /// - /// A test for method. + /// A test for method. /// /// A async result. [Fact] @@ -60,7 +60,7 @@ public async Task Handle() } /// - /// A test for method. + /// A test for method. /// /// A async result. [Fact] diff --git a/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRolesQueryHandlerTests.cs b/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRolesQueryHandlerTests.cs index 9ea87a7c..63f6478f 100644 --- a/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRolesQueryHandlerTests.cs +++ b/BlazorShop.UnitTests/Application/Handlers/Queries/RoleHandler/GetRolesQueryHandlerTests.cs @@ -50,7 +50,7 @@ public GetRolesQueryHandlerTests() private IMapper Mapper { get; } = Mock.Of(); /// - /// A test for method. + /// A test for method. /// /// A async result. [Fact] @@ -60,7 +60,7 @@ public async Task Handle() } /// - /// A test for method. + /// A test for method. /// /// A async result. [Fact] diff --git a/BlazorShop.UnitTests/Controllers/RolesControllerTests.cs b/BlazorShop.UnitTests/Controllers/RolesControllerTests.cs index 0db3fd92..2d6766b0 100644 --- a/BlazorShop.UnitTests/Controllers/RolesControllerTests.cs +++ b/BlazorShop.UnitTests/Controllers/RolesControllerTests.cs @@ -28,7 +28,7 @@ public RolesControllerTests() private IMediator Mediator { get; } = Mock.Of(); /// - /// A test for method. + /// A test for method. /// /// A representing the result of the asynchronous operation. [Fact] @@ -38,7 +38,7 @@ public async Task CreateRole() } /// - /// A test for method. + /// A test for method. /// /// A representing the result of the asynchronous operation. [Fact] diff --git a/BlazorShop.UnitTests/Infrastructure/RoleServiceTests.cs b/BlazorShop.UnitTests/Infrastructure/RoleServiceTests.cs index 836ee77d..9b0999aa 100644 --- a/BlazorShop.UnitTests/Infrastructure/RoleServiceTests.cs +++ b/BlazorShop.UnitTests/Infrastructure/RoleServiceTests.cs @@ -131,7 +131,7 @@ public async Task GetRoleByNormalizedName() } /// - /// A test for method. + /// A test for method. /// /// A representing the result of the asynchronous operation. [Fact] @@ -141,7 +141,7 @@ public async Task CreateRoleAsync() } /// - /// A test for method. + /// A test for method. /// /// A representing the result of the asynchronous operation. [Fact] diff --git a/BlazorShop.UnitTests/WebClient/Auth/AuthStateProviderTests.cs b/BlazorShop.UnitTests/WebClient/Auth/AuthStateProviderTests.cs index a69c899d..20760d5f 100644 --- a/BlazorShop.UnitTests/WebClient/Auth/AuthStateProviderTests.cs +++ b/BlazorShop.UnitTests/WebClient/Auth/AuthStateProviderTests.cs @@ -28,7 +28,7 @@ public AuthStateProviderTests() private AuthStateProvider AuthStateProvider { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } diff --git a/BlazorShop.UnitTests/WebClient/Auth/AuthenticationServiceTests.cs b/BlazorShop.UnitTests/WebClient/Auth/AuthenticationServiceTests.cs index cfde178c..3b144598 100644 --- a/BlazorShop.UnitTests/WebClient/Auth/AuthenticationServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Auth/AuthenticationServiceTests.cs @@ -27,7 +27,7 @@ public AuthenticationServiceTests() private AuthenticationService AuthenticationService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } diff --git a/BlazorShop.UnitTests/WebClient/Services/AccountServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/AccountServiceTests.cs index fa71f631..d192639e 100644 --- a/BlazorShop.UnitTests/WebClient/Services/AccountServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/AccountServiceTests.cs @@ -27,7 +27,7 @@ public AccountServiceTests() private AccountService AccountService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/CartServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/CartServiceTests.cs index d407642c..76917205 100644 --- a/BlazorShop.UnitTests/WebClient/Services/CartServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/CartServiceTests.cs @@ -27,7 +27,7 @@ public CartServiceTests() private CartService CartService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/ClotheServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/ClotheServiceTests.cs index 07b91f53..71adb8a7 100644 --- a/BlazorShop.UnitTests/WebClient/Services/ClotheServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/ClotheServiceTests.cs @@ -27,7 +27,7 @@ public ClotheServiceTests() private ClotheService ClotheService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/MusicServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/MusicServiceTests.cs index 45d5a6ed..70fb5bfa 100644 --- a/BlazorShop.UnitTests/WebClient/Services/MusicServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/MusicServiceTests.cs @@ -27,7 +27,7 @@ public MusicServiceTests() private MusicService MusicService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/OrderServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/OrderServiceTests.cs index 1257dd0e..0faf1f80 100644 --- a/BlazorShop.UnitTests/WebClient/Services/OrderServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/OrderServiceTests.cs @@ -27,7 +27,7 @@ public OrderServiceTests() private OrderService OrderService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/ReceiptServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/ReceiptServiceTests.cs index 77afaf4d..0fc6870e 100644 --- a/BlazorShop.UnitTests/WebClient/Services/ReceiptServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/ReceiptServiceTests.cs @@ -27,7 +27,7 @@ public ReceiptServiceTests() private ReceiptService ReceiptService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/RoleServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/RoleServiceTests.cs index dbef8aba..91af41dd 100644 --- a/BlazorShop.UnitTests/WebClient/Services/RoleServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/RoleServiceTests.cs @@ -27,7 +27,7 @@ public RoleServiceTests() private RoleService RoleService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/StripeServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/StripeServiceTests.cs index 33e28ff4..cea46129 100644 --- a/BlazorShop.UnitTests/WebClient/Services/StripeServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/StripeServiceTests.cs @@ -27,7 +27,7 @@ public StripeServiceTests() private StripeService StripeService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/SubscriberServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/SubscriberServiceTests.cs index fac6c20e..1efef287 100644 --- a/BlazorShop.UnitTests/WebClient/Services/SubscriberServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/SubscriberServiceTests.cs @@ -27,7 +27,7 @@ public SubscriberServiceTests() private SubscriberService SubscriberService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/SubscriptionServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/SubscriptionServiceTests.cs index ac77b30f..4d7d1a1d 100644 --- a/BlazorShop.UnitTests/WebClient/Services/SubscriptionServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/SubscriptionServiceTests.cs @@ -27,7 +27,7 @@ public SubscriptionServiceTests() private SubscriptionService SubscriptionService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/TodoItemServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/TodoItemServiceTests.cs index dc1ef4ec..13d22762 100644 --- a/BlazorShop.UnitTests/WebClient/Services/TodoItemServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/TodoItemServiceTests.cs @@ -27,7 +27,7 @@ public TodoItemServiceTests() private TodoItemService TodoItemService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/TodoListServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/TodoListServiceTests.cs index 504b1bb3..9d3f0951 100644 --- a/BlazorShop.UnitTests/WebClient/Services/TodoListServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/TodoListServiceTests.cs @@ -27,7 +27,7 @@ public TodoListServiceTests() private TodoListService TodoListService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WebClient/Services/UserServiceTests.cs b/BlazorShop.UnitTests/WebClient/Services/UserServiceTests.cs index 9a219ac0..c5e09c69 100644 --- a/BlazorShop.UnitTests/WebClient/Services/UserServiceTests.cs +++ b/BlazorShop.UnitTests/WebClient/Services/UserServiceTests.cs @@ -27,7 +27,7 @@ public UserServiceTests() private UserService UserService { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); diff --git a/BlazorShop.UnitTests/WorkerService/WorkerServiceTests.cs b/BlazorShop.UnitTests/WorkerService/WorkerServiceTests.cs index a9adfc20..88c805c5 100644 --- a/BlazorShop.UnitTests/WorkerService/WorkerServiceTests.cs +++ b/BlazorShop.UnitTests/WorkerService/WorkerServiceTests.cs @@ -36,7 +36,7 @@ public WorkerServiceTests() private IServiceScopeFactory ServiceScopeFactory { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } = Mock.Of(); From 2411c5a88ffb604bc681e60ff66603ead25c05f0 Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:23:44 +0100 Subject: [PATCH 03/14] creating the web client for claims stuff --- .../Auth/AuthStateProvider.cs | 4 +- .../Auth/AuthenticationService.cs | 4 +- .../Interfaces/IClaimService.cs | 46 +++++ .../Pages/Admin/Claims/AddEditClaim.razor | 105 ++++++++++ .../Pages/Admin/Claims/Claims.razor | 185 ++++++++++++++++++ .../Pages/Admin/Musics/AddEditMusic.razor | 8 - .../Pages/Admin/Roles/Roles.razor | 4 - BlazorShop.WebClient/Pages/Musics/Index.razor | 2 +- .../Services/AccountService.cs | 4 +- BlazorShop.WebClient/Services/CartService.cs | 4 +- BlazorShop.WebClient/Services/ClaimService.cs | 142 ++++++++++++++ .../Services/ClotheService.cs | 4 +- BlazorShop.WebClient/Services/MusicService.cs | 4 +- BlazorShop.WebClient/Services/OrderService.cs | 4 +- .../Services/ReceiptService.cs | 4 +- BlazorShop.WebClient/Services/RoleService.cs | 6 +- .../Services/StripeService.cs | 4 +- .../Services/SubscriberService.cs | 4 +- .../Services/SubscriptionService.cs | 4 +- .../Services/TodoItemService.cs | 4 +- .../Services/TodoListService.cs | 4 +- BlazorShop.WebClient/Services/UserService.cs | 4 +- BlazorShop.WebClient/Shared/NavMenu.razor | 5 + 23 files changed, 515 insertions(+), 44 deletions(-) create mode 100644 BlazorShop.WebClient/Interfaces/IClaimService.cs create mode 100644 BlazorShop.WebClient/Pages/Admin/Claims/AddEditClaim.razor create mode 100644 BlazorShop.WebClient/Pages/Admin/Claims/Claims.razor create mode 100644 BlazorShop.WebClient/Services/ClaimService.cs diff --git a/BlazorShop.WebClient/Auth/AuthStateProvider.cs b/BlazorShop.WebClient/Auth/AuthStateProvider.cs index abf49fd2..c96be8d4 100644 --- a/BlazorShop.WebClient/Auth/AuthStateProvider.cs +++ b/BlazorShop.WebClient/Auth/AuthStateProvider.cs @@ -12,7 +12,7 @@ public class AuthStateProvider : AuthenticationStateProvider /// /// Initializes a new instance of the class. /// - /// The instance of the to use. + /// The instance of the to use. /// The instance of the to use. /// The instance of the to use. public AuthStateProvider(HttpClient httpClient, ILocalStorageService localStorage, NavigationManager navMagager) @@ -24,7 +24,7 @@ public AuthStateProvider(HttpClient httpClient, ILocalStorageService localStorag } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } diff --git a/BlazorShop.WebClient/Auth/AuthenticationService.cs b/BlazorShop.WebClient/Auth/AuthenticationService.cs index 81a719ae..81ebf33b 100644 --- a/BlazorShop.WebClient/Auth/AuthenticationService.cs +++ b/BlazorShop.WebClient/Auth/AuthenticationService.cs @@ -12,7 +12,7 @@ public class AuthenticationService : IAuthenticationService /// /// Initializes a new instance of the class. /// - /// The instance of the to use. + /// The instance of the to use. /// The instance of the to use. /// The instance of the to use. /// The instance of the to use. @@ -29,7 +29,7 @@ public AuthenticationService( } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } diff --git a/BlazorShop.WebClient/Interfaces/IClaimService.cs b/BlazorShop.WebClient/Interfaces/IClaimService.cs new file mode 100644 index 00000000..a3358c02 --- /dev/null +++ b/BlazorShop.WebClient/Interfaces/IClaimService.cs @@ -0,0 +1,46 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.WebClient.Interfaces +{ + /// + /// The service to interact with the claim. + /// + public interface IClaimService + { + /// + /// Get the Claims. + /// + /// A representing the result of the asynchronous operation. + Task> GetClaims(); + + /// + /// Get a Claim. + /// + /// The id. + /// A representing the result of the asynchronous operation. + Task GetClaim(int id); + + /// + /// Save a Claim. + /// + /// The Claim. + /// A representing the result of the asynchronous operation. + Task AddClaim(ClaimResponse claim); + + /// + /// Update a Claim. + /// + /// The Claim. + /// A representing the result of the asynchronous operation. + Task UpdateClaim(ClaimResponse claim); + + /// + /// Delete a Claim. + /// + /// The id. + /// A representing the result of the asynchronous operation. + Task DeleteClaim(int id); + } +} diff --git a/BlazorShop.WebClient/Pages/Admin/Claims/AddEditClaim.razor b/BlazorShop.WebClient/Pages/Admin/Claims/AddEditClaim.razor new file mode 100644 index 00000000..77b4e37c --- /dev/null +++ b/BlazorShop.WebClient/Pages/Admin/Claims/AddEditClaim.razor @@ -0,0 +1,105 @@ +@* + + Copyright (c) Beniamin Jitca. All rights reserved. + +*@ + +@page "/admin/claims/add" +@page "/admin/claims/edit/{Id:int}" + +@attribute [Authorize(Policy = StringRoleResources.Admin)] + +@inject IClaimService ClaimService +@inject NavigationManager NavManager +@inject HttpInterceptorService Interceptor + +

@Title Claim

+
+ + + + +
+
+ +
+
+
+
+ +
+
+ +
+ + Save + + + Cancel + +
+ + +@code { + [Parameter] + public int Id { get; set; } + protected string Title = "Add"; + + public ClaimResponse claim = new(); + + public void Dispose() => Interceptor.DisposeEvent(); + + /// + /// Initialize the component on load. + /// + protected override void OnInitialized() + { + Interceptor.RegisterEvent(); + } + + /// + /// Initialize the component using the parameter. + /// + protected override async Task OnParametersSetAsync() + { + if (Id != 0) + { + Title = "Edit"; + claim = await ClaimService.GetClaim(Id); + } + } + + /// + /// Save the Claim. + /// + protected async Task SaveClaim() + { + RequestResponse result = new(); + if (claim.Id != 0) + { + result = await ClaimService.UpdateClaim(claim); + } + else + { + result = await ClaimService.AddClaim(claim); + } + if (result.Successful) + { + Cancel(); + } + } + + /// + /// Cancel. + /// + public void Cancel() + { + NavManager.NavigateTo("/admin/claims"); + } +} diff --git a/BlazorShop.WebClient/Pages/Admin/Claims/Claims.razor b/BlazorShop.WebClient/Pages/Admin/Claims/Claims.razor new file mode 100644 index 00000000..2b6dd793 --- /dev/null +++ b/BlazorShop.WebClient/Pages/Admin/Claims/Claims.razor @@ -0,0 +1,185 @@ +@* + + Copyright (c) Beniamin Jitca. All rights reserved. + +*@ + +@page "/admin/claims" + +@attribute [Authorize(Policy = StringRoleResources.Admin)] + +@inject IClaimService ClaimService +@inject NavigationManager NavManager +@inject HttpInterceptorService Interceptor + +

Claims List

+ +
+
+ Add Claim +
+
+ +@if (claimsList is null) +{ +
+

Loading the data...

+
+} +else +{ + @if (claimsList.Count > 0) + { + + + Id + Value + Type + Actions + + + + @String.Format("{0:d}", @context.Id) + @context.Value + @context.Type + + + Edit + + + Delete + + + + + + @if (showModal) + { + + } + } + else + { +
+

No record found

+
+ } +} + +@code { + bool showModal = false; + + void ModalShow() => showModal = true; + void ModalCancel() => showModal = false; + void ModalOk() => showModal = false; + + protected ClaimResponse claim = new(); + protected string searchString { get; set; } = string.Empty; + + protected List claimsList { get; set; } + protected List searchClaimsData { get; set; } + + public void Dispose() => Interceptor.DisposeEvent(); + + /// + /// Initialize the component on load. + /// + protected override async Task OnInitializedAsync() + { + Interceptor.RegisterEvent(); + await GetClaims(); + } + + /// + /// Get the admin Claims. + /// + protected async Task GetClaims() + { + claimsList = await ClaimService.GetClaims(); + searchClaimsData = claimsList; + } + + /// + /// Filter the Claims. + /// + protected void FilterClaims() + { + if (!string.IsNullOrEmpty(searchString)) + { + claimsList = searchClaimsData.Where(x => x.Value.IndexOf(searchString, StringComparison.OrdinalIgnoreCase) != -1).ToList(); + } + else + { + claimsList = searchClaimsData; + } + } + + /// + /// Confirm the delete operation. + /// + protected void DeleteConfirm(int Id) + { + claim = claimsList.FirstOrDefault(x => x.Id == Id); + } + + /// + /// Delete the Claim. + /// + protected async Task DeleteClaim(int Id) + { + await ClaimService.DeleteClaim(Id); + await GetClaims(); + } + + /// + /// Reset the search filter. + /// + public void ResetSearch() + { + searchString = string.Empty; + claimsList = searchClaimsData; + } + + /// + /// Navigate. + /// + private void NavigateToPage(int id) + { + NavManager.NavigateTo($"admin/claims/edit/{id}"); + } +} + + diff --git a/BlazorShop.WebClient/Pages/Admin/Musics/AddEditMusic.razor b/BlazorShop.WebClient/Pages/Admin/Musics/AddEditMusic.razor index 8f00407b..50813a94 100644 --- a/BlazorShop.WebClient/Pages/Admin/Musics/AddEditMusic.razor +++ b/BlazorShop.WebClient/Pages/Admin/Musics/AddEditMusic.razor @@ -64,14 +64,6 @@ Variant="Variant.Outlined"> -
-
- -
-
diff --git a/BlazorShop.WebClient/Pages/Admin/Roles/Roles.razor b/BlazorShop.WebClient/Pages/Admin/Roles/Roles.razor index db18b76f..472e3247 100644 --- a/BlazorShop.WebClient/Pages/Admin/Roles/Roles.razor +++ b/BlazorShop.WebClient/Pages/Admin/Roles/Roles.razor @@ -44,10 +44,6 @@ else @context.Name @context.NormalizedName - Edit - Edit diff --git a/BlazorShop.WebClient/Pages/Musics/Index.razor b/BlazorShop.WebClient/Pages/Musics/Index.razor index 1bd8b42e..1896683b 100644 --- a/BlazorShop.WebClient/Pages/Musics/Index.razor +++ b/BlazorShop.WebClient/Pages/Musics/Index.razor @@ -80,7 +80,7 @@ else
- @if (MembershipAccess !=0 && MembershipAccess >= item.AccessLevel) + @if (MembershipAccess !=0 && MembershipAccess >= 1)//"TO DO") {
+
+ + Claims + +
Clothes From 388c8710dc01fd12382ed4713b6d34de9a3d357a Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:23:59 +0100 Subject: [PATCH 04/14] other changes --- .../Controllers/ClaimsController.cs | 91 +++++++++++++++++++ .../Controllers/RolesController.cs | 12 +-- BlazorShop.WebApi/Program.cs | 6 +- BlazorShop.WorkerService/Worker.cs | 4 +- 4 files changed, 102 insertions(+), 11 deletions(-) create mode 100644 BlazorShop.WebApi/Controllers/ClaimsController.cs diff --git a/BlazorShop.WebApi/Controllers/ClaimsController.cs b/BlazorShop.WebApi/Controllers/ClaimsController.cs new file mode 100644 index 00000000..6c315ffd --- /dev/null +++ b/BlazorShop.WebApi/Controllers/ClaimsController.cs @@ -0,0 +1,91 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.WebApi.Controllers +{ + /// + /// Controller for Claims. + /// + [Authorize(Roles = $"{StringRoleResources.Admin}")] + public class ClaimsController : ApiBaseController + { + /// + /// Initializes a new instance of the class. + /// + /// The instance of the to use. + public ClaimsController(IMediator mediator) + : base(mediator) + { + } + + /// + /// Create a Claim. + /// + /// The command. + /// A representing the result of the asynchronous operation. + [HttpPost("Claim")] + public async Task CreateClaim([FromBody] CreateClaimCommand command) + { + var result = await this.Mediator.Send(command); + return result.Successful == true + ? this.Ok(result) + : this.BadRequest(result); + } + + /// + /// Update a Claim. + /// + /// The command. + /// A representing the result of the asynchronous operation. + [HttpPut("Claim")] + public async Task UpdateClaim([FromBody] UpdateClaimCommand command) + { + var result = await this.Mediator.Send(command); + return result.Successful == true + ? this.Ok(result) + : this.BadRequest(result); + } + + /// + /// Delete a Claim. + /// + /// The id of the Claim. + /// A representing the result of the asynchronous operation. + [HttpDelete("Claim/{id}")] + public async Task DeleteClaim(int id) + { + var result = await this.Mediator.Send(new DeleteClaimCommand { Id = id }); + return result.Successful == true + ? this.Ok(result) + : this.BadRequest(result); + } + + /// + /// Get the Claim. + /// + /// The id of the Claim. + /// A representing the result of the asynchronous operation. + [HttpGet("Claim/{id}")] + public async Task GetClaimById(int id) + { + var result = await this.Mediator.Send(new GetClaimByIdQuery { Id = id }); + return result.Successful == true + ? this.Ok(result) + : this.BadRequest(result); + } + + /// + /// Get the user Claims for a non admin Claim. + /// + /// A representing the result of the asynchronous operation. + [HttpGet("Claims")] + public async Task GetClaims() + { + var result = await this.Mediator.Send(new GetClaimsQuery { }); + return result.Successful == true + ? this.Ok(result) + : this.BadRequest(result); + } + } +} diff --git a/BlazorShop.WebApi/Controllers/RolesController.cs b/BlazorShop.WebApi/Controllers/RolesController.cs index 122375e6..9932d023 100644 --- a/BlazorShop.WebApi/Controllers/RolesController.cs +++ b/BlazorShop.WebApi/Controllers/RolesController.cs @@ -25,7 +25,7 @@ public RolesController(IMediator mediator) /// The command. /// A representing the result of the asynchronous operation. [HttpPost("role")] - public async Task CreateRole([FromBody] CreateRoleCommand command) + public async Task CreateRole([FromBody] CreateClaimCommand command) { var result = await this.Mediator.Send(command); return result.Successful == true @@ -39,7 +39,7 @@ public async Task CreateRole([FromBody] CreateRoleCommand command /// The command. /// A representing the result of the asynchronous operation. [HttpPut("role")] - public async Task UpdateRole([FromBody] UpdateRoleCommand command) + public async Task UpdateRole([FromBody] UpdateClaimCommand command) { var result = await this.Mediator.Send(command); return result.Successful == true @@ -55,7 +55,7 @@ public async Task UpdateRole([FromBody] UpdateRoleCommand command [HttpDelete("role/{id}")] public async Task DeleteRole(int id) { - var result = await this.Mediator.Send(new DeleteRoleCommand { Id = id }); + var result = await this.Mediator.Send(new DeleteClaimCommand { Id = id }); return result.Successful == true ? this.Ok(result) : this.BadRequest(result); @@ -69,7 +69,7 @@ public async Task DeleteRole(int id) [HttpGet("role/{id}")] public async Task GetRoleById(int id) { - var result = await this.Mediator.Send(new GetRoleByIdQuery { Id = id }); + var result = await this.Mediator.Send(new GetClaimByIdQuery { Id = id }); return result.Successful == true ? this.Ok(result) : this.BadRequest(result); @@ -82,7 +82,7 @@ public async Task GetRoleById(int id) [HttpGet("roles")] public async Task GetRoles() { - var result = await this.Mediator.Send(new GetRolesQuery { }); + var result = await this.Mediator.Send(new GetClaimsQuery { }); return result.Successful == true ? this.Ok(result) : this.BadRequest(result); @@ -95,7 +95,7 @@ public async Task GetRoles() [HttpGet("rolesAdmin")] public async Task GetRolesForAdmin() { - var result = await this.Mediator.Send(new GetRolesForAdminQuery { }); + var result = await this.Mediator.Send(new GetClaimByTypeQuery { }); return result.Successful == true ? this.Ok(result) : this.BadRequest(result); diff --git a/BlazorShop.WebApi/Program.cs b/BlazorShop.WebApi/Program.cs index e0f56a9c..72d68030 100644 --- a/BlazorShop.WebApi/Program.cs +++ b/BlazorShop.WebApi/Program.cs @@ -31,9 +31,8 @@ builder.Services.AddFluentValidationAutoValidation(); builder.Services.AddValidatorsFromAssemblyContaining(); - builder.Services.AddControllers(options => - options.Filters.Add()) - .AddFluentValidation(x => x.AutomaticValidationEnabled = false); + builder.Services.AddControllers(options => options.Filters.Add()) + .AddFluentValidation(x => x.AutomaticValidationEnabled = false); // Add JWT TOKEN Settings builder.Services.AddAuthentication(opt => @@ -110,6 +109,7 @@ await ApplicationDbContextSeed.SeedMusicsDataAsync(context); await ApplicationDbContextSeed.SeedSubscriptionsDataAsync(context); await ApplicationDbContextSeed.SeedTodosDataAsync(context); + await ApplicationDbContextSeed.SeedCustomClaimsAsync(context); } catch (Exception ex) { diff --git a/BlazorShop.WorkerService/Worker.cs b/BlazorShop.WorkerService/Worker.cs index afe7301e..19f4b8e3 100644 --- a/BlazorShop.WorkerService/Worker.cs +++ b/BlazorShop.WorkerService/Worker.cs @@ -14,7 +14,7 @@ public class Worker : BackgroundService /// /// The instance of the to use. /// The instance of the to use. - /// The instance of the to use. + /// The instance of the to use. public Worker(ILogger logger, IServiceScopeFactory serviceScopeFactory, HttpClient httpClient) { this.Logger = logger; @@ -33,7 +33,7 @@ public Worker(ILogger logger, IServiceScopeFactory serviceScopeFactory, private IServiceScopeFactory ServiceScopeFactory { get; } /// - /// Gets the instance of the to use. + /// Gets the instance of the to use. /// private HttpClient HttpClient { get; } From 94c35298a6917954aac612b3bbab12eea2fa70df Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:24:14 +0100 Subject: [PATCH 05/14] commands --- .../ClaimCommand/CreateClaimCommand.cs | 22 +++++++++++++++ .../ClaimCommand/DeleteClaimCommand.cs | 17 ++++++++++++ .../ClaimCommand/UpdateClaimCommand.cs | 27 +++++++++++++++++++ .../MusicCommand/CreateMusicCommand.cs | 5 ---- .../MusicCommand/UpdateMusicCommand.cs | 5 ---- 5 files changed, 66 insertions(+), 10 deletions(-) create mode 100644 BlazorShop.Application/Commands/ClaimCommand/CreateClaimCommand.cs create mode 100644 BlazorShop.Application/Commands/ClaimCommand/DeleteClaimCommand.cs create mode 100644 BlazorShop.Application/Commands/ClaimCommand/UpdateClaimCommand.cs diff --git a/BlazorShop.Application/Commands/ClaimCommand/CreateClaimCommand.cs b/BlazorShop.Application/Commands/ClaimCommand/CreateClaimCommand.cs new file mode 100644 index 00000000..4bd33435 --- /dev/null +++ b/BlazorShop.Application/Commands/ClaimCommand/CreateClaimCommand.cs @@ -0,0 +1,22 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Commands.ClaimCommand +{ + /// + /// A model to create a claim. + /// + public class CreateClaimCommand : IRequest + { + /// + /// Gets or sets the value of the claim. + /// + public string Value { get; set; } + + /// + /// Gets or sets the type of the claim. + /// + public string Type { get; set; } + } +} diff --git a/BlazorShop.Application/Commands/ClaimCommand/DeleteClaimCommand.cs b/BlazorShop.Application/Commands/ClaimCommand/DeleteClaimCommand.cs new file mode 100644 index 00000000..c18285de --- /dev/null +++ b/BlazorShop.Application/Commands/ClaimCommand/DeleteClaimCommand.cs @@ -0,0 +1,17 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Commands.ClaimCommand +{ + /// + /// A model to delete a claim. + /// + public class DeleteClaimCommand : IRequest + { + /// + /// Gets or sets the id of the claim. + /// + public int Id { get; set; } + } +} diff --git a/BlazorShop.Application/Commands/ClaimCommand/UpdateClaimCommand.cs b/BlazorShop.Application/Commands/ClaimCommand/UpdateClaimCommand.cs new file mode 100644 index 00000000..f6c53e4d --- /dev/null +++ b/BlazorShop.Application/Commands/ClaimCommand/UpdateClaimCommand.cs @@ -0,0 +1,27 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Commands.ClaimCommand +{ + /// + /// A model to update a claim. + /// + public class UpdateClaimCommand : IRequest + { + /// + /// Gets or sets the id of the claim. + /// + public int Id { get; set; } + + /// + /// Gets or sets the value of the claim. + /// + public string Value { get; set; } + + /// + /// Gets or sets the type of the claim. + /// + public string Type { get; set; } + } +} diff --git a/BlazorShop.Application/Commands/MusicCommand/CreateMusicCommand.cs b/BlazorShop.Application/Commands/MusicCommand/CreateMusicCommand.cs index eb80ef67..e7910ac1 100644 --- a/BlazorShop.Application/Commands/MusicCommand/CreateMusicCommand.cs +++ b/BlazorShop.Application/Commands/MusicCommand/CreateMusicCommand.cs @@ -43,10 +43,5 @@ public class CreateMusicCommand : IRequest /// Gets or sets The image path of the music. /// public string ImagePath { get; set; } - - /// - /// Gets or sets The access level of the music. - /// - public int AccessLevel { get; set; } } } diff --git a/BlazorShop.Application/Commands/MusicCommand/UpdateMusicCommand.cs b/BlazorShop.Application/Commands/MusicCommand/UpdateMusicCommand.cs index d1328407..8229250d 100644 --- a/BlazorShop.Application/Commands/MusicCommand/UpdateMusicCommand.cs +++ b/BlazorShop.Application/Commands/MusicCommand/UpdateMusicCommand.cs @@ -43,10 +43,5 @@ public class UpdateMusicCommand : IRequest /// Gets or sets The image path of the music. /// public string ImagePath { get; set; } - - /// - /// Gets or sets The access level of the music. - /// - public int AccessLevel { get; set; } } } From 2c93affb81b449054b3cb59c201255c97cca3bf6 Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:24:23 +0100 Subject: [PATCH 06/14] common stuff on app layer --- .../Interfaces/IApplicationDbContext.cs | 45 ++++++++++--------- .../Common/Interfaces/ICustomClaimsService.cs | 18 ++++++++ .../Common/Interfaces/IRoleService.cs | 4 +- 3 files changed, 45 insertions(+), 22 deletions(-) create mode 100644 BlazorShop.Application/Common/Interfaces/ICustomClaimsService.cs diff --git a/BlazorShop.Application/Common/Interfaces/IApplicationDbContext.cs b/BlazorShop.Application/Common/Interfaces/IApplicationDbContext.cs index 43da9384..55c0a44c 100644 --- a/BlazorShop.Application/Common/Interfaces/IApplicationDbContext.cs +++ b/BlazorShop.Application/Common/Interfaces/IApplicationDbContext.cs @@ -10,54 +10,59 @@ namespace BlazorShop.Application.Common.Interfaces public interface IApplicationDbContext { /// - /// Gets or sets the set. + /// Gets the set. /// - DbSet Carts { get; set; } + DbSet Carts { get; } /// - /// Gets or sets the set. + /// Gets the set. /// - DbSet Clothes { get; set; } + DbSet Clothes { get; } /// - /// Gets or sets the set. + /// Gets the set. /// - DbSet Invoices { get; set; } + DbSet Invoices { get; } /// - /// Gets or sets the set. + /// Gets the set. /// - DbSet Musics { get; set; } + DbSet Musics { get; } /// - /// Gets or sets the set. + /// Gets the set. /// - DbSet Orders { get; set; } + DbSet Orders { get; } /// - /// Gets or sets the set. + /// Gets the set. /// - DbSet Subscribers { get; set; } + DbSet Subscribers { get; } /// - /// Gets or sets the set. + /// Gets the set. /// - DbSet Subscriptions { get; set; } + DbSet Subscriptions { get; } /// - /// Gets or sets the set. + /// Gets the set. /// - DbSet Receipts { get; set; } + DbSet Receipts { get; } /// - /// Gets or sets the set. + /// Gets the set. /// - DbSet TodoItems { get; set; } + DbSet TodoItems { get; } /// - /// Gets or sets the set. + /// Gets the set. /// - DbSet TodoLists { get; set; } + DbSet TodoLists { get; } + + /// + /// Gets the set. + /// + DbSet CustomClaims { get; } /// /// Applying the chnages made to the application database context. diff --git a/BlazorShop.Application/Common/Interfaces/ICustomClaimsService.cs b/BlazorShop.Application/Common/Interfaces/ICustomClaimsService.cs new file mode 100644 index 00000000..0e0db2b4 --- /dev/null +++ b/BlazorShop.Application/Common/Interfaces/ICustomClaimsService.cs @@ -0,0 +1,18 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Common.Interfaces +{ + /// + /// A service for the custom user claims. + /// + public interface ICustomClaimsService + { + Task AddUserClaim(); + + Task DeleteUserClaim(); + + Task UpdateUserClaim(); + } +} diff --git a/BlazorShop.Application/Common/Interfaces/IRoleService.cs b/BlazorShop.Application/Common/Interfaces/IRoleService.cs index 2a1da74b..dfd998e0 100644 --- a/BlazorShop.Application/Common/Interfaces/IRoleService.cs +++ b/BlazorShop.Application/Common/Interfaces/IRoleService.cs @@ -61,14 +61,14 @@ public interface IRoleService /// /// The name of the role. /// The created role. - Task CreateRoleAsync(CreateRoleCommand role); + Task CreateRoleAsync(CreateClaimCommand role); /// /// Updates the role data. /// /// The role data. /// The request response. - Task UpdateRoleAsync(UpdateRoleCommand role); + Task UpdateRoleAsync(UpdateClaimCommand role); /// /// Deletes a role. From d6ca83e8a58674bc2f9e90f8fa4d1ac5e31d8885 Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:24:48 +0100 Subject: [PATCH 07/14] other changes --- .../MusicHandler/CreateMusicCommandHandler.cs | 1 - .../MusicHandler/UpdateMusicCommandHandler.cs | 1 - .../Queries/ClaimQuery/GetClaimByIdQuery.cs | 17 ++++++++ .../ClaimQuery/GetClaimByValueQuery.cs | 17 ++++++++ .../Queries/ClaimQuery/GetClaimsQuery.cs | 13 +++++++ .../Responses/ClaimResponse.cs | 39 +++++++++++++++++++ .../Responses/MusicResponse.cs | 6 --- .../CreateMusicCommandValidator.cs | 3 -- .../UpdateMusicCommandValidator.cs | 3 -- BlazorShop.Domain/Entities/CustomClaim.cs | 22 +++++++++++ BlazorShop.Domain/Entities/Music.cs | 5 --- 11 files changed, 108 insertions(+), 19 deletions(-) create mode 100644 BlazorShop.Application/Queries/ClaimQuery/GetClaimByIdQuery.cs create mode 100644 BlazorShop.Application/Queries/ClaimQuery/GetClaimByValueQuery.cs create mode 100644 BlazorShop.Application/Queries/ClaimQuery/GetClaimsQuery.cs create mode 100644 BlazorShop.Application/Responses/ClaimResponse.cs create mode 100644 BlazorShop.Domain/Entities/CustomClaim.cs diff --git a/BlazorShop.Application/Handlers/Commands/MusicHandler/CreateMusicCommandHandler.cs b/BlazorShop.Application/Handlers/Commands/MusicHandler/CreateMusicCommandHandler.cs index 23049a39..80b6cefe 100644 --- a/BlazorShop.Application/Handlers/Commands/MusicHandler/CreateMusicCommandHandler.cs +++ b/BlazorShop.Application/Handlers/Commands/MusicHandler/CreateMusicCommandHandler.cs @@ -59,7 +59,6 @@ public async Task Handle(CreateMusicCommand request, Cancellati DateRelease = request.DateRelease, ImageName = request.ImageName, ImagePath = request.ImagePath, - AccessLevel = request.AccessLevel, }; this.DbContext.Musics.Add(entity); diff --git a/BlazorShop.Application/Handlers/Commands/MusicHandler/UpdateMusicCommandHandler.cs b/BlazorShop.Application/Handlers/Commands/MusicHandler/UpdateMusicCommandHandler.cs index d212dc9f..1cbfe9c2 100644 --- a/BlazorShop.Application/Handlers/Commands/MusicHandler/UpdateMusicCommandHandler.cs +++ b/BlazorShop.Application/Handlers/Commands/MusicHandler/UpdateMusicCommandHandler.cs @@ -57,7 +57,6 @@ public async Task Handle(UpdateMusicCommand request, Cancellati entity.DateRelease = request.DateRelease; entity.ImageName = request.ImageName; entity.ImagePath = request.ImagePath; - entity.AccessLevel = request.AccessLevel; this.DbContext.Musics.Update(entity); await this.DbContext.SaveChangesAsync(cancellationToken); diff --git a/BlazorShop.Application/Queries/ClaimQuery/GetClaimByIdQuery.cs b/BlazorShop.Application/Queries/ClaimQuery/GetClaimByIdQuery.cs new file mode 100644 index 00000000..c06def1e --- /dev/null +++ b/BlazorShop.Application/Queries/ClaimQuery/GetClaimByIdQuery.cs @@ -0,0 +1,17 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Queries.ClaimQuery +{ + /// + /// A model to get the claim by id. + /// + public class GetClaimByIdQuery : IRequest> + { + /// + /// Gets or sets the claim id. + /// + public int Id { get; set; } + } +} diff --git a/BlazorShop.Application/Queries/ClaimQuery/GetClaimByValueQuery.cs b/BlazorShop.Application/Queries/ClaimQuery/GetClaimByValueQuery.cs new file mode 100644 index 00000000..a93c962d --- /dev/null +++ b/BlazorShop.Application/Queries/ClaimQuery/GetClaimByValueQuery.cs @@ -0,0 +1,17 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Queries.ClaimQuery +{ + /// + /// A model to get the claim by value. + /// + public class GetClaimByValueQuery : IRequest> + { + /// + /// Gets or sets the claim value. + /// + public string Value { get; set; } + } +} diff --git a/BlazorShop.Application/Queries/ClaimQuery/GetClaimsQuery.cs b/BlazorShop.Application/Queries/ClaimQuery/GetClaimsQuery.cs new file mode 100644 index 00000000..bf39f9fe --- /dev/null +++ b/BlazorShop.Application/Queries/ClaimQuery/GetClaimsQuery.cs @@ -0,0 +1,13 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Queries.ClaimQuery +{ + /// + /// A model to get the claims. + /// + public class GetClaimsQuery : IRequest> + { + } +} diff --git a/BlazorShop.Application/Responses/ClaimResponse.cs b/BlazorShop.Application/Responses/ClaimResponse.cs new file mode 100644 index 00000000..a982d3c4 --- /dev/null +++ b/BlazorShop.Application/Responses/ClaimResponse.cs @@ -0,0 +1,39 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Responses +{ + /// + /// A Claim response model. + /// + public class ClaimResponse : IMapFrom + { + /// + /// Gets or sets The id of the Claim. + /// + public int Id { get; set; } + + /// + /// Gets or sets The value of the Claim. + /// + public string Value { get; set; } + + /// + /// Gets or sets The type of the Claim. + /// + public string Type { get; set; } + + /// + /// Convert the entity (Data Access Layer) to model (Business Logic Layer). + /// + /// The profile to use for the mapping operation. + public void Mapping(Profile profile) + { + profile.CreateMap() + .ForMember(d => d.Id, opt => opt.MapFrom(s => s.Id)) + .ForMember(d => d.Value, opt => opt.MapFrom(s => s.ClaimValue)) + .ForMember(d => d.Type, opt => opt.MapFrom(s => s.ClaimType)); + } + } +} diff --git a/BlazorShop.Application/Responses/MusicResponse.cs b/BlazorShop.Application/Responses/MusicResponse.cs index 43f4acad..8224e21b 100644 --- a/BlazorShop.Application/Responses/MusicResponse.cs +++ b/BlazorShop.Application/Responses/MusicResponse.cs @@ -44,11 +44,6 @@ public class MusicResponse : IMapFrom /// public string ImagePath { get; set; } - /// - /// Gets or sets The access level of the music. - /// - public int AccessLevel { get; set; } - /// /// Convert the entity (Data Access Layer) to model (Business Logic Layer). /// @@ -62,7 +57,6 @@ public void Mapping(Profile profile) .ForMember(x => x.Author, opt => opt.MapFrom(s => s.Author)) .ForMember(x => x.DateRelease, opt => opt.MapFrom(s => s.DateRelease)) .ForMember(x => x.ImageName, opt => opt.MapFrom(s => s.ImageName)) - .ForMember(x => x.AccessLevel, opt => opt.MapFrom(s => s.AccessLevel)) .ForMember(x => x.ImagePath, opt => opt.MapFrom(s => s.ImagePath)); } } diff --git a/BlazorShop.Application/Validators/MusicValidator/CreateMusicCommandValidator.cs b/BlazorShop.Application/Validators/MusicValidator/CreateMusicCommandValidator.cs index ffb508ba..d6223346 100644 --- a/BlazorShop.Application/Validators/MusicValidator/CreateMusicCommandValidator.cs +++ b/BlazorShop.Application/Validators/MusicValidator/CreateMusicCommandValidator.cs @@ -50,9 +50,6 @@ public CreateMusicCommandValidator(IApplicationDbContext context) .MaximumLength(200).WithMessage("ImagePath maximum length exceeded") .NotEmpty().WithMessage("ImagePath must not be empty") .NotNull().WithMessage("ImagePath must not be null"); - - this.RuleFor(x => x.AccessLevel) - .GreaterThan(0).WithMessage("AccessLevel must be greater than 0"); } /// diff --git a/BlazorShop.Application/Validators/MusicValidator/UpdateMusicCommandValidator.cs b/BlazorShop.Application/Validators/MusicValidator/UpdateMusicCommandValidator.cs index 11eda46a..7ae49318 100644 --- a/BlazorShop.Application/Validators/MusicValidator/UpdateMusicCommandValidator.cs +++ b/BlazorShop.Application/Validators/MusicValidator/UpdateMusicCommandValidator.cs @@ -50,9 +50,6 @@ public UpdateMusicCommandValidator(IApplicationDbContext context) .MaximumLength(200).WithMessage("ImagePath maximum length exceeded") .NotEmpty().WithMessage("ImagePath must not be empty") .NotNull().WithMessage("ImagePath must not be null"); - - this.RuleFor(x => x.AccessLevel) - .GreaterThan(0).WithMessage("AccessLevel must be greater than 0"); } /// diff --git a/BlazorShop.Domain/Entities/CustomClaim.cs b/BlazorShop.Domain/Entities/CustomClaim.cs new file mode 100644 index 00000000..47481c78 --- /dev/null +++ b/BlazorShop.Domain/Entities/CustomClaim.cs @@ -0,0 +1,22 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Domain.Entities +{ + /// + /// A custom claim entity. + /// + public class CustomClaim : EntityBase + { + /// + /// Gets or sets the claim type. + /// + public string ClaimType { get; set; } + + /// + /// Gets or sets the claim value. + /// + public string ClaimValue { get; set; } + } +} diff --git a/BlazorShop.Domain/Entities/Music.cs b/BlazorShop.Domain/Entities/Music.cs index 6b4c73e5..7e59bc74 100644 --- a/BlazorShop.Domain/Entities/Music.cs +++ b/BlazorShop.Domain/Entities/Music.cs @@ -38,10 +38,5 @@ public class Music : EntityBase /// Gets or Sets the image path of the music. /// public string ImagePath { get; set; } - - /// - /// Gets or Sets the access level of the music. - /// - public int AccessLevel { get; set; } } } From 8a8d8f5b52e684db405857c547a78cd8cee972cc Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:30:08 +0100 Subject: [PATCH 08/14] fixing issues --- .../Common/Interfaces/IRoleService.cs | 4 ++-- BlazorShop.Infrastructure/Services/RoleService.cs | 4 ++-- BlazorShop.WebApi/Controllers/RolesController.cs | 12 ++++++------ BlazorShop.WebApi/_Imports.cs | 2 ++ BlazorShop.WebClient/Services/ClaimService.cs | 6 +++--- BlazorShop.WebClient/Services/RoleService.cs | 2 +- BlazorShop.WebClient/_Imports.cs | 1 + 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/BlazorShop.Application/Common/Interfaces/IRoleService.cs b/BlazorShop.Application/Common/Interfaces/IRoleService.cs index dfd998e0..2a1da74b 100644 --- a/BlazorShop.Application/Common/Interfaces/IRoleService.cs +++ b/BlazorShop.Application/Common/Interfaces/IRoleService.cs @@ -61,14 +61,14 @@ public interface IRoleService /// /// The name of the role. /// The created role. - Task CreateRoleAsync(CreateClaimCommand role); + Task CreateRoleAsync(CreateRoleCommand role); /// /// Updates the role data. /// /// The role data. /// The request response. - Task UpdateRoleAsync(UpdateClaimCommand role); + Task UpdateRoleAsync(UpdateRoleCommand role); /// /// Deletes a role. diff --git a/BlazorShop.Infrastructure/Services/RoleService.cs b/BlazorShop.Infrastructure/Services/RoleService.cs index ebf745da..b3420a56 100644 --- a/BlazorShop.Infrastructure/Services/RoleService.cs +++ b/BlazorShop.Infrastructure/Services/RoleService.cs @@ -149,7 +149,7 @@ public RoleResponse GetRoleByNormalizedName(string normalizedName) } /// - public async Task CreateRoleAsync(CreateClaimCommand command) + public async Task CreateRoleAsync(CreateRoleCommand command) { var role = await this.RoleManager.FindByNameAsync(command.Name); if (role != null) @@ -168,7 +168,7 @@ await this.RoleManager.CreateAsync(new Role } /// - public async Task UpdateRoleAsync(UpdateClaimCommand command) + public async Task UpdateRoleAsync(UpdateRoleCommand command) { var existsRole = await this.RoleManager.FindByNameAsync(command.Name); if (existsRole != null) diff --git a/BlazorShop.WebApi/Controllers/RolesController.cs b/BlazorShop.WebApi/Controllers/RolesController.cs index 9932d023..122375e6 100644 --- a/BlazorShop.WebApi/Controllers/RolesController.cs +++ b/BlazorShop.WebApi/Controllers/RolesController.cs @@ -25,7 +25,7 @@ public RolesController(IMediator mediator) /// The command. /// A representing the result of the asynchronous operation. [HttpPost("role")] - public async Task CreateRole([FromBody] CreateClaimCommand command) + public async Task CreateRole([FromBody] CreateRoleCommand command) { var result = await this.Mediator.Send(command); return result.Successful == true @@ -39,7 +39,7 @@ public async Task CreateRole([FromBody] CreateClaimCommand comman /// The command. /// A representing the result of the asynchronous operation. [HttpPut("role")] - public async Task UpdateRole([FromBody] UpdateClaimCommand command) + public async Task UpdateRole([FromBody] UpdateRoleCommand command) { var result = await this.Mediator.Send(command); return result.Successful == true @@ -55,7 +55,7 @@ public async Task UpdateRole([FromBody] UpdateClaimCommand comman [HttpDelete("role/{id}")] public async Task DeleteRole(int id) { - var result = await this.Mediator.Send(new DeleteClaimCommand { Id = id }); + var result = await this.Mediator.Send(new DeleteRoleCommand { Id = id }); return result.Successful == true ? this.Ok(result) : this.BadRequest(result); @@ -69,7 +69,7 @@ public async Task DeleteRole(int id) [HttpGet("role/{id}")] public async Task GetRoleById(int id) { - var result = await this.Mediator.Send(new GetClaimByIdQuery { Id = id }); + var result = await this.Mediator.Send(new GetRoleByIdQuery { Id = id }); return result.Successful == true ? this.Ok(result) : this.BadRequest(result); @@ -82,7 +82,7 @@ public async Task GetRoleById(int id) [HttpGet("roles")] public async Task GetRoles() { - var result = await this.Mediator.Send(new GetClaimsQuery { }); + var result = await this.Mediator.Send(new GetRolesQuery { }); return result.Successful == true ? this.Ok(result) : this.BadRequest(result); @@ -95,7 +95,7 @@ public async Task GetRoles() [HttpGet("rolesAdmin")] public async Task GetRolesForAdmin() { - var result = await this.Mediator.Send(new GetClaimByTypeQuery { }); + var result = await this.Mediator.Send(new GetRolesForAdminQuery { }); return result.Successful == true ? this.Ok(result) : this.BadRequest(result); diff --git a/BlazorShop.WebApi/_Imports.cs b/BlazorShop.WebApi/_Imports.cs index 0a3bb398..0d3c9e31 100644 --- a/BlazorShop.WebApi/_Imports.cs +++ b/BlazorShop.WebApi/_Imports.cs @@ -10,6 +10,7 @@ global using BlazorShop.Application; global using BlazorShop.Application.Commands.AccountCommand; global using BlazorShop.Application.Commands.CartCommand; +global using BlazorShop.Application.Commands.ClaimCommand; global using BlazorShop.Application.Commands.ClotheCommand; global using BlazorShop.Application.Commands.InvoiceCommand; global using BlazorShop.Application.Commands.MusicCommand; @@ -25,6 +26,7 @@ global using BlazorShop.Application.Common.Interfaces; global using BlazorShop.Application.Common.Models; global using BlazorShop.Application.Queries.CartQuery; +global using BlazorShop.Application.Queries.ClaimQuery; global using BlazorShop.Application.Queries.ClotheQuery; global using BlazorShop.Application.Queries.InvoiceQuery; global using BlazorShop.Application.Queries.MusicQuery; diff --git a/BlazorShop.WebClient/Services/ClaimService.cs b/BlazorShop.WebClient/Services/ClaimService.cs index eaa4632b..1c49deb2 100644 --- a/BlazorShop.WebClient/Services/ClaimService.cs +++ b/BlazorShop.WebClient/Services/ClaimService.cs @@ -117,9 +117,9 @@ public async Task UpdateClaim(ClaimResponse claim) { var data = new UpdateClaimCommand { - Id = Claim.Id, - Value = Claim.Value, - Type = Claim.Type, + Id = claim.Id, + Value = claim.Value, + Type = claim.Type, }; var response = await this.HttpClient.PutAsJsonAsync($"Claims/Claim", data); diff --git a/BlazorShop.WebClient/Services/RoleService.cs b/BlazorShop.WebClient/Services/RoleService.cs index 20fcef00..255a1fc1 100644 --- a/BlazorShop.WebClient/Services/RoleService.cs +++ b/BlazorShop.WebClient/Services/RoleService.cs @@ -133,7 +133,7 @@ public async Task> GetRolesForAdmin() /// public async Task UpdateRole(RoleResponse role) { - var data = new UpdateClaimCommand + var data = new UpdateRoleCommand { Id = role.Id, Name = role.Name, diff --git a/BlazorShop.WebClient/_Imports.cs b/BlazorShop.WebClient/_Imports.cs index b7adfbb6..8c0287d8 100644 --- a/BlazorShop.WebClient/_Imports.cs +++ b/BlazorShop.WebClient/_Imports.cs @@ -13,6 +13,7 @@ global using Blazored.Toast; global using Blazored.Toast.Services; global using BlazorShop.Application.Commands.AccountCommand; +global using BlazorShop.Application.Commands.ClaimCommand; global using BlazorShop.Application.Commands.RoleCommand; global using BlazorShop.Application.Commands.UserCommand; global using BlazorShop.Application.Common.Models; From f010d6283e334e6c2b4da1701fe46edacaefaaaa Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:45:44 +0100 Subject: [PATCH 09/14] creating claims commands --- .../ClaimHandler/CreateClaimCommandHandler.cs | 57 ++++++++++++++++++ .../ClaimHandler/DeleteClaimCommandHandler.cs | 59 +++++++++++++++++++ .../ClaimHandler/UpdateClaimCommandHandler.cs | 57 ++++++++++++++++++ 3 files changed, 173 insertions(+) create mode 100644 BlazorShop.Application/Handlers/Commands/ClaimHandler/CreateClaimCommandHandler.cs create mode 100644 BlazorShop.Application/Handlers/Commands/ClaimHandler/DeleteClaimCommandHandler.cs create mode 100644 BlazorShop.Application/Handlers/Commands/ClaimHandler/UpdateClaimCommandHandler.cs diff --git a/BlazorShop.Application/Handlers/Commands/ClaimHandler/CreateClaimCommandHandler.cs b/BlazorShop.Application/Handlers/Commands/ClaimHandler/CreateClaimCommandHandler.cs new file mode 100644 index 00000000..c8c408a8 --- /dev/null +++ b/BlazorShop.Application/Handlers/Commands/ClaimHandler/CreateClaimCommandHandler.cs @@ -0,0 +1,57 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Handlers.Commands.ClaimHandler +{ + /// + /// An implementation of the . + /// + public class CreateClaimCommandHandler : IRequestHandler + { + /// + /// Initializes a new instance of the class. + /// + /// Gets An instance of . + /// Gets An instance of . + /// Thrown if there is no logger provided. + public CreateClaimCommandHandler(IClaimService claimService, ILogger logger) + { + this.ClaimService = claimService; + this.Logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + /// + /// Gets An instance of . + /// + private IClaimService ClaimService { get; } + + /// + /// Gets An instance of . + /// + private ILogger Logger { get; } + + /// + /// An implementation of the handler for . + /// + /// The request object to handle. + /// The cancellation token. + /// A representing the result of the asynchronous operation. + public async Task Handle(CreateClaimCommand request, CancellationToken cancellationToken) + { + RequestResponse? response; + + try + { + response = await this.ClaimService.CreateClaimAsync(request); + } + catch (Exception ex) + { + this.Logger.LogError(ex, ErrorsManager.CreateClaimCommand); + response = RequestResponse.Failure($"{ErrorsManager.CreateClaimCommand}. {ex.Message}. {ex.InnerException?.Message}"); + } + + return response; + } + } +} diff --git a/BlazorShop.Application/Handlers/Commands/ClaimHandler/DeleteClaimCommandHandler.cs b/BlazorShop.Application/Handlers/Commands/ClaimHandler/DeleteClaimCommandHandler.cs new file mode 100644 index 00000000..c1e5492c --- /dev/null +++ b/BlazorShop.Application/Handlers/Commands/ClaimHandler/DeleteClaimCommandHandler.cs @@ -0,0 +1,59 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +using BlazorShop.Application.Common.Interfaces; + +namespace BlazorShop.Application.Handlers.Commands.ClaimHandler +{ + /// + /// An implementation of the . + /// + public class DeleteClaimCommandHandler : IRequestHandler + { + /// + /// Initializes a new instance of the class. + /// + /// Gets An instance of . + /// Gets An instance of . + /// Thrown if there is no logger provided. + public DeleteClaimCommandHandler(IClaimService claimService, ILogger logger) + { + this.ClaimService = claimService; + this.Logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + /// + /// Gets An instance of . + /// + private IClaimService ClaimService { get; } + + /// + /// Gets An instance of . + /// + private ILogger Logger { get; } + + /// + /// An implementation of the handler for . + /// + /// The request object to handle. + /// The cancellation token. + /// A representing the result of the asynchronous operation. + public async Task Handle(DeleteClaimCommand request, CancellationToken cancellationToken) + { + RequestResponse? response; + + try + { + response = await this.ClaimService.DeleteClaimAsync(request.Id); + } + catch (Exception ex) + { + this.Logger.LogError(ex, ErrorsManager.DeleteClaimCommand); + response = RequestResponse.Failure($"{ErrorsManager.DeleteClaimCommand}. {ex.Message}. {ex.InnerException?.Message}"); + } + + return response; + } + } +} diff --git a/BlazorShop.Application/Handlers/Commands/ClaimHandler/UpdateClaimCommandHandler.cs b/BlazorShop.Application/Handlers/Commands/ClaimHandler/UpdateClaimCommandHandler.cs new file mode 100644 index 00000000..8b87e3b2 --- /dev/null +++ b/BlazorShop.Application/Handlers/Commands/ClaimHandler/UpdateClaimCommandHandler.cs @@ -0,0 +1,57 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Handlers.Commands.ClaimHandler +{ + /// + /// An implementation of the . + /// + public class UpdateClaimCommandHandler : IRequestHandler + { + /// + /// Initializes a new instance of the class. + /// + /// Gets An instance of . + /// Gets An instance of . + /// Thrown if there is no logger provided. + public UpdateClaimCommandHandler(IClaimService claimService, ILogger logger) + { + this.ClaimService = claimService; + this.Logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + /// + /// Gets An instance of . + /// + private IClaimService ClaimService { get; } + + /// + /// Gets An instance of . + /// + private ILogger Logger { get; } + + /// + /// An implementation of the handler for . + /// + /// The request object to handle. + /// The cancellation token. + /// A representing the result of the asynchronous operation. + public async Task Handle(UpdateClaimCommand request, CancellationToken cancellationToken) + { + RequestResponse? response; + + try + { + response = await this.ClaimService.UpdateClaimAsync(request); + } + catch (Exception ex) + { + this.Logger.LogError(ex, ErrorsManager.UpdateClaimCommand); + response = RequestResponse.Failure($"{ErrorsManager.UpdateClaimCommand}. {ex.Message}. {ex.InnerException?.Message}"); + } + + return response; + } + } +} From 04a07d1ed5d54cc8aa756f4ccfdcbeeca4f5fda0 Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:46:03 +0100 Subject: [PATCH 10/14] settings and claim service --- .../Common/Interfaces/IClaimService.cs | 106 +++++++++++++++++ BlazorShop.Application/Utils/ErrorsManager.cs | 30 +++++ BlazorShop.Application/_Imports.cs | 2 + .../DependencyInjection.cs | 1 + .../Services/ClaimService.cs | 107 ++++++++++++++++++ BlazorShop.WebClient/Program.cs | 1 + 6 files changed, 247 insertions(+) create mode 100644 BlazorShop.Application/Common/Interfaces/IClaimService.cs create mode 100644 BlazorShop.Infrastructure/Services/ClaimService.cs diff --git a/BlazorShop.Application/Common/Interfaces/IClaimService.cs b/BlazorShop.Application/Common/Interfaces/IClaimService.cs new file mode 100644 index 00000000..26c35bdf --- /dev/null +++ b/BlazorShop.Application/Common/Interfaces/IClaimService.cs @@ -0,0 +1,106 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Common.Interfaces +{ + /// + /// A service to provide Claim features. + /// + public interface IClaimService + { + /// + /// Check the Claims of an user. + /// + /// The user data. + /// A list of user's Claims. + Task> CheckUserClaimsAsync(User user); + + /// + /// Gets the default Claim. + /// + /// The default entity Claim. + ClaimResponse GetDefaultClaim(); + + /// + /// Get the user Claim. + /// + /// The user Claim. + ClaimResponse GetUserClaim(); + + /// + /// Gets the admin Claim. + /// + /// The admin Claim. + ClaimResponse GetAdminClaim(); + + /// + /// Set the Claim to the user. + /// + /// The user data. + /// The Claim name. + /// The request response. + Task SetUserClaimAsync(User user, string claimValue); + + /// + /// Finding the Claim by id. + /// + /// The id of the Claim. + /// The Claim data. + Task FindClaimByIdAsync(int claimId); + + /// + /// Search the Claims by name. + /// + /// The name of the Claim. + /// The Claim. + Task FindClaimByNameAsync(string name); + + /// + /// Creates a new Claim. + /// + /// The name of the Claim. + /// The created Claim. + Task CreateClaimAsync(CreateClaimCommand claim); + + /// + /// Updates the Claim data. + /// + /// The Claim data. + /// The request response. + Task UpdateClaimAsync(UpdateClaimCommand claim); + + /// + /// Deletes a Claim. + /// + /// The id of the Claim. + /// The request response. + Task DeleteClaimAsync(int claimId); + + /// + /// Gets all the Claims for a non-admin user. + /// + /// The list of Claims. + List GetClaims(); + + /// + /// Gets all the Claims for admin user. + /// + /// The list of Claims. + List GetClaimsForAdmin(); + + /// + /// Find the Claim by id. + /// + /// The id of the Claim. + /// The Claim data. + ClaimResponse GetClaimById(int id); + + /// + /// Gets the Claim by normalized name. + /// + /// The normalized name of the Claim. + /// The Claim data. + ClaimResponse GetClaimByNormalizedName(string normalizedName); + } +} diff --git a/BlazorShop.Application/Utils/ErrorsManager.cs b/BlazorShop.Application/Utils/ErrorsManager.cs index b960c3d5..bbfaf67f 100644 --- a/BlazorShop.Application/Utils/ErrorsManager.cs +++ b/BlazorShop.Application/Utils/ErrorsManager.cs @@ -141,6 +141,21 @@ public static class ErrorsManager /// public const string? UpdateRoleCommand = "There was an error updating the role"; + /// + /// The error message for creating the claim. + /// + public const string? CreateClaimCommand = "There was an error creating the claim"; + + /// + /// The error message for deleting the claim. + /// + public const string? DeleteClaimCommand = "There was an error deleting the claim"; + + /// + /// The error message for updating the claim. + /// + public const string? UpdateClaimCommand = "There was an error updating the claim"; + /// /// The error message for creating the subscriber. /// @@ -328,6 +343,21 @@ public static class ErrorsManager /// public const string? GetRolesQuery = "There was an error getting the roles"; + /// + /// The error message for GetClaimByIdQuery. + /// + public const string? GetClaimByIdQuery = "There was an error getting the claim by id"; + + /// + /// The error message for GetClaimByValueQuery. + /// + public const string? GetClaimByValueQuery = "There was an error getting the claim by value"; + + /// + /// The error message for GetClaimsQuery. + /// + public const string? GetClaimsQuery = "There was an error getting the claims"; + /// /// The error message for GetSubscriberByIdQuery. /// diff --git a/BlazorShop.Application/_Imports.cs b/BlazorShop.Application/_Imports.cs index 15b5453f..605ce186 100644 --- a/BlazorShop.Application/_Imports.cs +++ b/BlazorShop.Application/_Imports.cs @@ -9,6 +9,7 @@ global using AutoMapper.QueryableExtensions; global using BlazorShop.Application.Commands.AccountCommand; global using BlazorShop.Application.Commands.CartCommand; +global using BlazorShop.Application.Commands.ClaimCommand; global using BlazorShop.Application.Commands.ClotheCommand; global using BlazorShop.Application.Commands.InvoiceCommand; global using BlazorShop.Application.Commands.MusicCommand; @@ -25,6 +26,7 @@ global using BlazorShop.Application.Common.Mappings; global using BlazorShop.Application.Common.Models; global using BlazorShop.Application.Queries.CartQuery; +global using BlazorShop.Application.Queries.ClaimQuery; global using BlazorShop.Application.Queries.ClotheQuery; global using BlazorShop.Application.Queries.InvoiceQuery; global using BlazorShop.Application.Queries.MusicQuery; diff --git a/BlazorShop.Infrastructure/DependencyInjection.cs b/BlazorShop.Infrastructure/DependencyInjection.cs index de57e4b0..1b0c366e 100644 --- a/BlazorShop.Infrastructure/DependencyInjection.cs +++ b/BlazorShop.Infrastructure/DependencyInjection.cs @@ -30,6 +30,7 @@ public static IServiceCollection AddInfrastructureLayer(this IServiceCollection services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/BlazorShop.Infrastructure/Services/ClaimService.cs b/BlazorShop.Infrastructure/Services/ClaimService.cs new file mode 100644 index 00000000..2940b8ff --- /dev/null +++ b/BlazorShop.Infrastructure/Services/ClaimService.cs @@ -0,0 +1,107 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +using BlazorShop.Application.Commands.ClaimCommand; + +namespace BlazorShop.Infrastructure.Services +{ + /// + /// An implementation of . + /// + public class ClaimService : IClaimService + { + /// + /// Initializes a new instance of the class. + /// + /// The instance of to use. + /// The instance of to use. + public ClaimService( + UserManager userManager, + IMapper mapper) + { + this.UserManager = userManager; + this.Mapper = mapper; + } + + /// + /// Gets the instance of to use. + /// + private UserManager UserManager { get; } + + /// + /// Gets the instance of to use. + /// + private IMapper Mapper { get; } + + public Task> CheckUserClaimsAsync(User user) + { + throw new NotImplementedException(); + } + + public Task CreateClaimAsync(CreateClaimCommand claim) + { + throw new NotImplementedException(); + } + + public Task DeleteClaimAsync(int claimId) + { + throw new NotImplementedException(); + } + + public Task FindClaimByIdAsync(int claimId) + { + throw new NotImplementedException(); + } + + public Task FindClaimByNameAsync(string name) + { + throw new NotImplementedException(); + } + + public ClaimResponse GetAdminClaim() + { + throw new NotImplementedException(); + } + + public ClaimResponse GetClaimById(int id) + { + throw new NotImplementedException(); + } + + public ClaimResponse GetClaimByNormalizedName(string normalizedName) + { + throw new NotImplementedException(); + } + + public List GetClaims() + { + throw new NotImplementedException(); + } + + public List GetClaimsForAdmin() + { + throw new NotImplementedException(); + } + + public ClaimResponse GetDefaultClaim() + { + throw new NotImplementedException(); + } + + public ClaimResponse GetUserClaim() + { + throw new NotImplementedException(); + } + + public Task SetUserClaimAsync(User user, string claimValue) + { + throw new NotImplementedException(); + } + + public Task UpdateClaimAsync(UpdateClaimCommand claim) + { + throw new NotImplementedException(); + } + } +} diff --git a/BlazorShop.WebClient/Program.cs b/BlazorShop.WebClient/Program.cs index b273e148..17f2597b 100644 --- a/BlazorShop.WebClient/Program.cs +++ b/BlazorShop.WebClient/Program.cs @@ -51,6 +51,7 @@ // Inject Services builder.Services.AddTransient(); builder.Services.AddTransient(); + builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); From 75d8de86da79ba9eda0f85a20ecf4b7bfe5b9594 Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:46:12 +0100 Subject: [PATCH 11/14] creating claims validators --- .../CreateClaimCommandValidator.cs | 28 +++++++++++++++++ .../DeleteClaimCommandValidator.cs | 21 +++++++++++++ .../GetClaimByIdQueryValidator.cs | 21 +++++++++++++ .../GetClaimByValueQueryValidator.cs | 23 ++++++++++++++ .../UpdateClaimCommandValidator.cs | 31 +++++++++++++++++++ 5 files changed, 124 insertions(+) create mode 100644 BlazorShop.Application/Validators/ClaimValidator/CreateClaimCommandValidator.cs create mode 100644 BlazorShop.Application/Validators/ClaimValidator/DeleteClaimCommandValidator.cs create mode 100644 BlazorShop.Application/Validators/ClaimValidator/GetClaimByIdQueryValidator.cs create mode 100644 BlazorShop.Application/Validators/ClaimValidator/GetClaimByValueQueryValidator.cs create mode 100644 BlazorShop.Application/Validators/ClaimValidator/UpdateClaimCommandValidator.cs diff --git a/BlazorShop.Application/Validators/ClaimValidator/CreateClaimCommandValidator.cs b/BlazorShop.Application/Validators/ClaimValidator/CreateClaimCommandValidator.cs new file mode 100644 index 00000000..f9ba1754 --- /dev/null +++ b/BlazorShop.Application/Validators/ClaimValidator/CreateClaimCommandValidator.cs @@ -0,0 +1,28 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Validators.ClaimValidator +{ + /// + /// An implementation of the . + /// + public class CreateClaimCommandValidator : AbstractValidator + { + /// + /// Initializes a new instance of the class. + /// + public CreateClaimCommandValidator() + { + this.RuleFor(v => v.Value) + .MaximumLength(50).WithMessage("Value maximum length exceeded") + .NotEmpty().WithMessage("Value must not be empty") + .NotNull().WithMessage("Value must not be null"); + + this.RuleFor(v => v.Type) + .MaximumLength(250).WithMessage("Type maximum length exceeded") + .NotEmpty().WithMessage("Type must not be empty") + .NotNull().WithMessage("Type must not be null"); + } + } +} diff --git a/BlazorShop.Application/Validators/ClaimValidator/DeleteClaimCommandValidator.cs b/BlazorShop.Application/Validators/ClaimValidator/DeleteClaimCommandValidator.cs new file mode 100644 index 00000000..ec55c60c --- /dev/null +++ b/BlazorShop.Application/Validators/ClaimValidator/DeleteClaimCommandValidator.cs @@ -0,0 +1,21 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Validators.ClaimValidator +{ + /// + /// An implementation of the . + /// + public class DeleteClaimCommandValidator : AbstractValidator + { + /// + /// Initializes a new instance of the class. + /// + public DeleteClaimCommandValidator() + { + this.RuleFor(v => v.Id) + .GreaterThan(0).WithMessage("Id must be greater than 0"); + } + } +} diff --git a/BlazorShop.Application/Validators/ClaimValidator/GetClaimByIdQueryValidator.cs b/BlazorShop.Application/Validators/ClaimValidator/GetClaimByIdQueryValidator.cs new file mode 100644 index 00000000..39a64ed1 --- /dev/null +++ b/BlazorShop.Application/Validators/ClaimValidator/GetClaimByIdQueryValidator.cs @@ -0,0 +1,21 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Validators.ClaimValidator +{ + /// + /// An implementation of the . + /// + public class GetClaimByIdQueryValidator : AbstractValidator + { + /// + /// Initializes a new instance of the class. + /// + public GetClaimByIdQueryValidator() + { + this.RuleFor(v => v.Id) + .GreaterThan(0).WithMessage("Id must be greater than 0"); + } + } +} diff --git a/BlazorShop.Application/Validators/ClaimValidator/GetClaimByValueQueryValidator.cs b/BlazorShop.Application/Validators/ClaimValidator/GetClaimByValueQueryValidator.cs new file mode 100644 index 00000000..133ff0de --- /dev/null +++ b/BlazorShop.Application/Validators/ClaimValidator/GetClaimByValueQueryValidator.cs @@ -0,0 +1,23 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Validators.ClaimValidator +{ + /// + /// An implementation of the . + /// + public class GetClaimByValueQueryValidator : AbstractValidator + { + /// + /// Initializes a new instance of the class. + /// + public GetClaimByValueQueryValidator() + { + this.RuleFor(v => v.Value) + .MaximumLength(50).WithMessage("Value maximum length exceeded") + .NotEmpty().WithMessage("Value must not be empty") + .NotNull().WithMessage("Value must not be null"); + } + } +} diff --git a/BlazorShop.Application/Validators/ClaimValidator/UpdateClaimCommandValidator.cs b/BlazorShop.Application/Validators/ClaimValidator/UpdateClaimCommandValidator.cs new file mode 100644 index 00000000..ac204e93 --- /dev/null +++ b/BlazorShop.Application/Validators/ClaimValidator/UpdateClaimCommandValidator.cs @@ -0,0 +1,31 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Validators.ClaimValidator +{ + /// + /// An implementation of the . + /// + public class UpdateClaimCommandValidator : AbstractValidator + { + /// + /// Initializes a new instance of the class. + /// + public UpdateClaimCommandValidator() + { + this.RuleFor(v => v.Id) + .GreaterThan(0).WithMessage("Id must be greater than 0"); + + this.RuleFor(v => v.Value) + .MaximumLength(50).WithMessage("Value maximum length exceeded") + .NotEmpty().WithMessage("Value must not be empty") + .NotNull().WithMessage("Value must not be null"); + + this.RuleFor(v => v.Type) + .MaximumLength(150).WithMessage("Type maximum length exceeded") + .NotEmpty().WithMessage("Type must not be empty") + .NotNull().WithMessage("Type must not be null"); + } + } +} From 01d677ea6f6d26399818e30b7cb4c4f434ffe722 Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Mon, 18 Sep 2023 22:50:40 +0100 Subject: [PATCH 12/14] creating queries for claims --- .../ClaimHandler/GetClaimByIdQueryHandler.cs | 66 +++++++++++++++++++ .../GetClaimByValueQueryHandler.cs | 66 +++++++++++++++++++ .../ClaimHandler/GetClaimsQueryHandler.cs | 66 +++++++++++++++++++ 3 files changed, 198 insertions(+) create mode 100644 BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByIdQueryHandler.cs create mode 100644 BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByValueQueryHandler.cs create mode 100644 BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimsQueryHandler.cs diff --git a/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByIdQueryHandler.cs b/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByIdQueryHandler.cs new file mode 100644 index 00000000..b96c2b8b --- /dev/null +++ b/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByIdQueryHandler.cs @@ -0,0 +1,66 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Handlers.Queries.ClaimHandler +{ + /// + /// An implementation of the . + /// + public class GetClaimByIdQueryHandler : IRequestHandler> + { + /// + /// Initializes a new instance of the class. + /// + /// Gets An instance of . + /// Gets An instance of . + /// Thrown if there is no logger provided. + public GetClaimByIdQueryHandler(IClaimService claimService, ILogger logger) + { + this.ClaimService = claimService; + this.Logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + /// + /// Gets An instance of . + /// + private IClaimService ClaimService { get; } + + /// + /// Gets An instance of . + /// + private ILogger Logger { get; } + + /// + /// An implementation of the handler for . + /// + /// The request object to handle. + /// The cancellation token. + /// A . + public Task> Handle(GetClaimByIdQuery request, CancellationToken cancellationToken) + { + Result? response; + + try + { + var result = this.ClaimService.GetClaimById(request.Id); + + response = new Result + { + Successful = true, + Item = result ?? new ClaimResponse(), + }; + } + catch (Exception ex) + { + this.Logger.LogError(ex, ErrorsManager.GetClaimByIdQuery); + response = new Result + { + Error = $"{ErrorsManager.GetClaimByIdQuery}. {ex.Message}. {ex.InnerException?.Message}", + }; + } + + return Task.FromResult(response); + } + } +} diff --git a/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByValueQueryHandler.cs b/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByValueQueryHandler.cs new file mode 100644 index 00000000..b674f141 --- /dev/null +++ b/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByValueQueryHandler.cs @@ -0,0 +1,66 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Handlers.Queries.ClaimHandler +{ + /// + /// An implementation of the . + /// + public class GetClaimByValueQueryHandler : IRequestHandler> + { + /// + /// Initializes a new instance of the class. + /// + /// Gets An instance of . + /// Gets An instance of . + /// Thrown if there is no logger provided. + public GetClaimByValueQueryHandler(IClaimService claimService, ILogger logger) + { + this.ClaimService = claimService; + this.Logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + /// + /// Gets An instance of . + /// + private IClaimService ClaimService { get; } + + /// + /// Gets An instance of . + /// + private ILogger Logger { get; } + + /// + /// An implementation of the handler for . + /// + /// The request object to handle. + /// The cancellation token. + /// A . + public Task> Handle(GetClaimByValueQuery request, CancellationToken cancellationToken) + { + Result? response; + + try + { + var result = this.ClaimService.GetClaimByNormalizedName(request.Value); + + response = new Result + { + Successful = true, + Item = result ?? new ClaimResponse(), + }; + } + catch (Exception ex) + { + this.Logger.LogError(ex, ErrorsManager.GetClaimByValueQuery); + response = new Result + { + Error = $"{ErrorsManager.GetClaimByValueQuery}. {ex.Message}. {ex.InnerException?.Message}", + }; + } + + return Task.FromResult(response); + } + } +} diff --git a/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimsQueryHandler.cs b/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimsQueryHandler.cs new file mode 100644 index 00000000..422fe984 --- /dev/null +++ b/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimsQueryHandler.cs @@ -0,0 +1,66 @@ +// +// Copyright (c) Beniamin Jitca. All rights reserved. +// + +namespace BlazorShop.Application.Handlers.Queries.ClaimHandler +{ + /// + /// An implementation of the . + /// + public class GetClaimsQueryHandler : IRequestHandler> + { + /// + /// Initializes a new instance of the class. + /// + /// Gets An instance of . + /// Gets An instance of . + /// Thrown if there is no logger provided. + public GetClaimsQueryHandler(IClaimService claimService, ILogger logger) + { + this.ClaimService = claimService; + this.Logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + /// + /// Gets An instance of . + /// + private IClaimService ClaimService { get; } + + /// + /// Gets An instance of . + /// + private ILogger Logger { get; } + + /// + /// An implementation of the handler for . + /// + /// The request object to handle. + /// The cancellation token. + /// A . + public Task> Handle(GetClaimsQuery request, CancellationToken cancellationToken) + { + Result? response; + + try + { + var result = this.ClaimService.GetClaims(); + + response = new Result + { + Successful = true, + Items = result ?? new List(), + }; + } + catch (Exception ex) + { + this.Logger.LogError(ex, ErrorsManager.GetClaimsQuery); + response = new Result + { + Error = $"{ErrorsManager.GetClaimsQuery}. {ex.Message}. {ex.InnerException?.Message}", + }; + } + + return Task.FromResult(response); + } + } +} From ce52475fe4268f7aae771c170cff8ab1ff04c930 Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Tue, 19 Sep 2023 21:17:16 +0100 Subject: [PATCH 13/14] fix issues with Claims --- .../Common/Interfaces/IClaimService.cs | 44 ++----------- .../GetClaimByValueQueryHandler.cs | 2 +- .../Services/ClaimService.cs | 66 ++++++++++--------- BlazorShop.Infrastructure/_Imports.cs | 1 + .../Controllers/ClaimsController.cs | 10 +-- BlazorShop.WebClient/Services/ClaimService.cs | 10 +-- 6 files changed, 52 insertions(+), 81 deletions(-) diff --git a/BlazorShop.Application/Common/Interfaces/IClaimService.cs b/BlazorShop.Application/Common/Interfaces/IClaimService.cs index 26c35bdf..665b2ada 100644 --- a/BlazorShop.Application/Common/Interfaces/IClaimService.cs +++ b/BlazorShop.Application/Common/Interfaces/IClaimService.cs @@ -16,24 +16,12 @@ public interface IClaimService /// A list of user's Claims. Task> CheckUserClaimsAsync(User user); - /// - /// Gets the default Claim. - /// - /// The default entity Claim. - ClaimResponse GetDefaultClaim(); - /// /// Get the user Claim. /// /// The user Claim. ClaimResponse GetUserClaim(); - /// - /// Gets the admin Claim. - /// - /// The admin Claim. - ClaimResponse GetAdminClaim(); - /// /// Set the Claim to the user. /// @@ -42,38 +30,24 @@ public interface IClaimService /// The request response. Task SetUserClaimAsync(User user, string claimValue); - /// - /// Finding the Claim by id. - /// - /// The id of the Claim. - /// The Claim data. - Task FindClaimByIdAsync(int claimId); - - /// - /// Search the Claims by name. - /// - /// The name of the Claim. - /// The Claim. - Task FindClaimByNameAsync(string name); - /// /// Creates a new Claim. /// - /// The name of the Claim. + /// The name of the Claim. /// The created Claim. Task CreateClaimAsync(CreateClaimCommand claim); /// /// Updates the Claim data. /// - /// The Claim data. + /// The Claim data. /// The request response. Task UpdateClaimAsync(UpdateClaimCommand claim); /// /// Deletes a Claim. /// - /// The id of the Claim. + /// The id of the Claim. /// The request response. Task DeleteClaimAsync(int claimId); @@ -83,12 +57,6 @@ public interface IClaimService /// The list of Claims. List GetClaims(); - /// - /// Gets all the Claims for admin user. - /// - /// The list of Claims. - List GetClaimsForAdmin(); - /// /// Find the Claim by id. /// @@ -97,10 +65,10 @@ public interface IClaimService ClaimResponse GetClaimById(int id); /// - /// Gets the Claim by normalized name. + /// Gets the Claim by value. /// - /// The normalized name of the Claim. + /// The value of the Claim. /// The Claim data. - ClaimResponse GetClaimByNormalizedName(string normalizedName); + ClaimResponse GetClaimByValue(string claimValue); } } diff --git a/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByValueQueryHandler.cs b/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByValueQueryHandler.cs index b674f141..bbf07c5f 100644 --- a/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByValueQueryHandler.cs +++ b/BlazorShop.Application/Handlers/Queries/ClaimHandler/GetClaimByValueQueryHandler.cs @@ -43,7 +43,7 @@ public Task> Handle(GetClaimByValueQuery request, Cancella try { - var result = this.ClaimService.GetClaimByNormalizedName(request.Value); + var result = this.ClaimService.GetClaimByValue(request.Value); response = new Result { diff --git a/BlazorShop.Infrastructure/Services/ClaimService.cs b/BlazorShop.Infrastructure/Services/ClaimService.cs index 2940b8ff..c9966e88 100644 --- a/BlazorShop.Infrastructure/Services/ClaimService.cs +++ b/BlazorShop.Infrastructure/Services/ClaimService.cs @@ -2,8 +2,6 @@ // Copyright (c) Beniamin Jitca. All rights reserved. // -using BlazorShop.Application.Commands.ClaimCommand; - namespace BlazorShop.Infrastructure.Services { /// @@ -16,12 +14,15 @@ public class ClaimService : IClaimService /// /// The instance of to use. /// The instance of to use. + /// The instance of to use. public ClaimService( UserManager userManager, - IMapper mapper) + IMapper mapper, + IApplicationDbContext dbContext) { this.UserManager = userManager; this.Mapper = mapper; + this.DbContext = dbContext; } /// @@ -34,71 +35,72 @@ public ClaimService( /// private IMapper Mapper { get; } + /// + /// Gets the instance of to use. + /// + private IApplicationDbContext DbContext { get; } + + /// public Task> CheckUserClaimsAsync(User user) { throw new NotImplementedException(); } + /// public Task CreateClaimAsync(CreateClaimCommand claim) { throw new NotImplementedException(); } + /// public Task DeleteClaimAsync(int claimId) { throw new NotImplementedException(); } - public Task FindClaimByIdAsync(int claimId) - { - throw new NotImplementedException(); - } - - public Task FindClaimByNameAsync(string name) - { - throw new NotImplementedException(); - } - - public ClaimResponse GetAdminClaim() - { - throw new NotImplementedException(); - } - + /// public ClaimResponse GetClaimById(int id) { - throw new NotImplementedException(); + var result = this.DbContext.CustomClaims + .TagWith(nameof(this.GetClaimById)) + .ProjectTo(this.Mapper.ConfigurationProvider) + .FirstOrDefault(c => c.Id == id); + return result; } - public ClaimResponse GetClaimByNormalizedName(string normalizedName) + /// + public ClaimResponse GetClaimByValue(string claimValue) { - throw new NotImplementedException(); + var result = this.DbContext.CustomClaims + .TagWith(nameof(this.GetClaimById)) + .ProjectTo(this.Mapper.ConfigurationProvider) + .FirstOrDefault(c => c.Value.Equals(claimValue, StringComparison.OrdinalIgnoreCase)); + return result; } + /// public List GetClaims() { - throw new NotImplementedException(); - } - - public List GetClaimsForAdmin() - { - throw new NotImplementedException(); - } - - public ClaimResponse GetDefaultClaim() - { - throw new NotImplementedException(); + var result = this.DbContext.CustomClaims + .TagWith(nameof(this.GetClaims)) + .ProjectTo(this.Mapper.ConfigurationProvider) + .ToList(); + return result; } + /// public ClaimResponse GetUserClaim() { throw new NotImplementedException(); } + /// public Task SetUserClaimAsync(User user, string claimValue) { throw new NotImplementedException(); } + /// public Task UpdateClaimAsync(UpdateClaimCommand claim) { throw new NotImplementedException(); diff --git a/BlazorShop.Infrastructure/_Imports.cs b/BlazorShop.Infrastructure/_Imports.cs index b7b73ec5..774eacbc 100644 --- a/BlazorShop.Infrastructure/_Imports.cs +++ b/BlazorShop.Infrastructure/_Imports.cs @@ -13,6 +13,7 @@ global using AutoMapper; global using AutoMapper.QueryableExtensions; global using BlazorShop.Application.Commands.AccountCommand; +global using BlazorShop.Application.Commands.ClaimCommand; global using BlazorShop.Application.Commands.RoleCommand; global using BlazorShop.Application.Commands.UserCommand; global using BlazorShop.Application.Common.Interfaces; diff --git a/BlazorShop.WebApi/Controllers/ClaimsController.cs b/BlazorShop.WebApi/Controllers/ClaimsController.cs index 6c315ffd..26a265d8 100644 --- a/BlazorShop.WebApi/Controllers/ClaimsController.cs +++ b/BlazorShop.WebApi/Controllers/ClaimsController.cs @@ -24,7 +24,7 @@ public ClaimsController(IMediator mediator) /// /// The command. /// A representing the result of the asynchronous operation. - [HttpPost("Claim")] + [HttpPost("claim")] public async Task CreateClaim([FromBody] CreateClaimCommand command) { var result = await this.Mediator.Send(command); @@ -38,7 +38,7 @@ public async Task CreateClaim([FromBody] CreateClaimCommand comma /// /// The command. /// A representing the result of the asynchronous operation. - [HttpPut("Claim")] + [HttpPut("claim")] public async Task UpdateClaim([FromBody] UpdateClaimCommand command) { var result = await this.Mediator.Send(command); @@ -52,7 +52,7 @@ public async Task UpdateClaim([FromBody] UpdateClaimCommand comma /// /// The id of the Claim. /// A representing the result of the asynchronous operation. - [HttpDelete("Claim/{id}")] + [HttpDelete("claim/{id}")] public async Task DeleteClaim(int id) { var result = await this.Mediator.Send(new DeleteClaimCommand { Id = id }); @@ -66,7 +66,7 @@ public async Task DeleteClaim(int id) /// /// The id of the Claim. /// A representing the result of the asynchronous operation. - [HttpGet("Claim/{id}")] + [HttpGet("claim/{id}")] public async Task GetClaimById(int id) { var result = await this.Mediator.Send(new GetClaimByIdQuery { Id = id }); @@ -79,7 +79,7 @@ public async Task GetClaimById(int id) /// Get the user Claims for a non admin Claim. /// /// A representing the result of the asynchronous operation. - [HttpGet("Claims")] + [HttpGet("claims")] public async Task GetClaims() { var result = await this.Mediator.Send(new GetClaimsQuery { }); diff --git a/BlazorShop.WebClient/Services/ClaimService.cs b/BlazorShop.WebClient/Services/ClaimService.cs index 1c49deb2..bdc9fd1d 100644 --- a/BlazorShop.WebClient/Services/ClaimService.cs +++ b/BlazorShop.WebClient/Services/ClaimService.cs @@ -39,7 +39,7 @@ public ClaimService(HttpClient httpClient, ISnackbar snackBar) /// public async Task AddClaim(ClaimResponse claim) { - var response = await this.HttpClient.PostAsJsonAsync($"Claims/Claim", claim); + var response = await this.HttpClient.PostAsJsonAsync($"Claims/claim", claim); var responseResult = await response.Content.ReadAsStringAsync(); var result = JsonSerializer.Deserialize( responseResult, this.Options); @@ -59,7 +59,7 @@ public async Task AddClaim(ClaimResponse claim) /// public async Task DeleteClaim(int id) { - var response = await this.HttpClient.DeleteAsync($"Claims/Claim/{id}"); + var response = await this.HttpClient.DeleteAsync($"Claims/claim/{id}"); var responseResult = await response.Content.ReadAsStringAsync(); var result = JsonSerializer.Deserialize( responseResult, this.Options); @@ -79,7 +79,7 @@ public async Task DeleteClaim(int id) /// public async Task GetClaim(int id) { - var response = await this.HttpClient.GetAsync($"Claims/Claim/{id}"); + var response = await this.HttpClient.GetAsync($"Claims/claim/{id}"); var responseResult = await response.Content.ReadAsStringAsync(); var result = JsonSerializer.Deserialize>( responseResult, this.Options); @@ -97,7 +97,7 @@ public async Task GetClaim(int id) /// public async Task> GetClaims() { - var response = await this.HttpClient.GetAsync("Claims/Claims"); + var response = await this.HttpClient.GetAsync("Claims/claims"); var responseResult = await response.Content.ReadAsStringAsync(); var result = JsonSerializer.Deserialize>( responseResult, this.Options); @@ -122,7 +122,7 @@ public async Task UpdateClaim(ClaimResponse claim) Type = claim.Type, }; - var response = await this.HttpClient.PutAsJsonAsync($"Claims/Claim", data); + var response = await this.HttpClient.PutAsJsonAsync($"Claims/claim", data); var responseResult = await response.Content.ReadAsStringAsync(); var result = JsonSerializer.Deserialize( responseResult, this.Options); From 993640c5199f94965e292e90efb2e6512a70e061 Mon Sep 17 00:00:00 2001 From: Jitca Beniamin Date: Tue, 19 Sep 2023 21:17:34 +0100 Subject: [PATCH 14/14] small changes on razor pages - claims --- BlazorShop.WebClient/Pages/Admin/Claims/Claims.razor | 2 +- BlazorShop.WebClient/Pages/Admin/Users/AddEditUser.razor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BlazorShop.WebClient/Pages/Admin/Claims/Claims.razor b/BlazorShop.WebClient/Pages/Admin/Claims/Claims.razor index 2b6dd793..a27b2d34 100644 --- a/BlazorShop.WebClient/Pages/Admin/Claims/Claims.razor +++ b/BlazorShop.WebClient/Pages/Admin/Claims/Claims.razor @@ -16,7 +16,7 @@
- Add Claim + Add Claim
diff --git a/BlazorShop.WebClient/Pages/Admin/Users/AddEditUser.razor b/BlazorShop.WebClient/Pages/Admin/Users/AddEditUser.razor index 7afeb74e..82e8e1ea 100644 --- a/BlazorShop.WebClient/Pages/Admin/Users/AddEditUser.razor +++ b/BlazorShop.WebClient/Pages/Admin/Users/AddEditUser.razor @@ -43,7 +43,7 @@
- @foreach (var role in roles)