Refactor, move data to respective project

BlueWest.Api/BlueWest.Api.csproj

@@ -43,7 +43,6 @@
   
   <ItemGroup>
     <ProjectReference Include="..\BlueWest.Data.Capital\BlueWest.Data.Capital.csproj" />
-    <ProjectReference Include="..\BlueWest.Data.Geography\BlueWest.Data.Geography.csproj" />
     <ProjectReference Include="..\BlueWest\BlueWest.csproj" />
     <ProjectReference Include="..\include\BlueWest.EfMethods\src\BlueWest.EfMethods\BlueWest.EfMethods.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
 

BlueWest.Api/Context/ApplicationUserDbContext.cs

@@ -1,97 +1,102 @@
 using BlueWest.Data;
+using BlueWest.EfMethods;
 using BlueWest.WebApi.Context.Users;
 using BlueWest.WebApi.EF.Model;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
-namespace BlueWest.WebApi.Context;
+namespace BlueWest.WebApi.Context
-
-/// <summary>
-/// Application User Db Context
-/// </summary>
-public class ApplicationUserDbContext : IdentityDbContext<
-    ApplicationUser,
-    ApplicationRole,
-    string,
-    ApplicationUserClaim,
-    ApplicationUserRole,
-    ApplicationUserLogin,
-    ApplicationRoleClaim,
-    ApplicationUserToken>
 {
-    /// <inheritdoc />
+    /// <summary>
-    public sealed override DbSet<ApplicationUserClaim> UserClaims { get; set; }
+    /// Application User Db Context
-
+    /// </summary>
-    /// <inheritdoc />
+    [EfGenerator]
-    public sealed override DbSet<ApplicationUserRole> UserRoles { get; set; }
+    public class ApplicationUserDbContext : IdentityDbContext<
-
+        ApplicationUser,
-    /// <inheritdoc />
+        ApplicationRole,
-    public sealed override DbSet<ApplicationRole> Roles { get; set; }
+        string,
-
+        ApplicationUserClaim,
-    /// <inheritdoc />
+        ApplicationUserRole,
-    public sealed override DbSet<ApplicationRoleClaim> RoleClaims { get; set; }
+        ApplicationUserLogin,
-
+        ApplicationRoleClaim,
-
+        ApplicationUserToken>
-    /// <inheritdoc />
-    public ApplicationUserDbContext(DbContextOptions<ApplicationUserDbContext> options) : base(options)
     {
-        Database.EnsureCreated();
+        /// <inheritdoc />
+        [EfGetMany(typeof(ApplicationUserClaim))]
+        public sealed override DbSet<ApplicationUserClaim> UserClaims { get; set; }
+
+        [EfGetMany(typeof(ApplicationUserRole))]
+        /// <inheritdoc />
+        public sealed override DbSet<ApplicationUserRole> UserRoles { get; set; }
+
+        [EfGetMany(typeof(ApplicationRole))]
+        /// <inheritdoc />
+        public sealed override DbSet<ApplicationRole> Roles { get; set; }
+
+        [EfGetMany(typeof(ApplicationRoleClaim))]
+        /// <inheritdoc />
+        public sealed override DbSet<ApplicationRoleClaim> RoleClaims { get; set; }
+        
+
+        /// <inheritdoc />
+        public ApplicationUserDbContext(DbContextOptions<ApplicationUserDbContext> options) : base(options)
+        {
+            Database.EnsureCreated();
+        }
+
+
+        /// <inheritdoc />
+        protected override void OnModelCreating(ModelBuilder builder)
+        {
+            base.OnModelCreating(builder);
+
+            builder.Entity<ApplicationUserRole>().ToTable("UserRoles");
+            builder.Entity<ApplicationUser>(b =>
+            {
+                b.HasMany<ApplicationUserRole>()
+                    .WithOne()
+                    .HasForeignKey(ur => ur.UserId).IsRequired();
+            });
+
+            builder.Entity<ApplicationUser>().ToTable("ApplicationUser")
+                .HasKey(x => x.Id);
+
+
+            builder.Entity<ApplicationRole>(b =>
+            {
+                b.HasKey(r => r.Id);
+                b.HasIndex(r => r.NormalizedName).HasDatabaseName("RoleNameIndex").IsUnique();
+                b.ToTable("Roles");
+                b.Property(r => r.ConcurrencyStamp).IsConcurrencyToken();
+
+                b.Property(u => u.Name).HasMaxLength(256);
+                b.Property(u => u.NormalizedName).HasMaxLength(256);
+
+                b.HasMany<ApplicationUserRole>().WithOne().HasForeignKey(ur => ur.RoleId).IsRequired();
+                b.HasMany<ApplicationRoleClaim>().WithOne().HasForeignKey(rc => rc.RoleId).IsRequired();
+            });
+
+            builder.Entity<ApplicationRoleClaim>(b =>
+            {
+                b.HasKey(rc => rc.Id);
+                b.ToTable("RoleClaims");
+            });
+
+            builder.Entity<ApplicationUserRole>(b =>
+            {
+                b.HasKey(r => new {r.UserId, r.RoleId});
+                b.ToTable("UserRoles");
+            });
+
+            builder.Entity<User>(b => b.HasOne<ApplicationUser>()
+                .WithMany(x => x.Users)
+                .HasForeignKey(x => x.ApplicationUserId));
+
+            builder.Entity<ApplicationRoleClaim>().ToTable("RoleClaims");
+            builder.Entity<ApplicationUserRole>().ToTable("UserRole");
+
+
+            builder.ConfigureCurrentDbModel();
+        }
     }
-
-
-    /// <inheritdoc />
-    protected override void OnModelCreating(ModelBuilder builder)
-    {
-        base.OnModelCreating(builder);
-
-        builder.Entity<ApplicationUserRole>().ToTable("UserRoles");
-        builder.Entity<ApplicationUser>(b =>
-        {
-            b.HasMany<ApplicationUserRole>()
-                .WithOne()
-                .HasForeignKey(ur => ur.UserId).IsRequired();
-        });
-
-        builder.Entity<ApplicationUser>().ToTable("ApplicationUser")
-            .HasKey(x => x.Id);
-
-
-
-        builder.Entity<ApplicationRole>(b =>
-        {
-            b.HasKey(r => r.Id);
-            b.HasIndex(r => r.NormalizedName).HasDatabaseName("RoleNameIndex").IsUnique();
-            b.ToTable("Roles");
-            b.Property(r => r.ConcurrencyStamp).IsConcurrencyToken();
-
-            b.Property(u => u.Name).HasMaxLength(256);
-            b.Property(u => u.NormalizedName).HasMaxLength(256);
-
-            b.HasMany<ApplicationUserRole>().WithOne().HasForeignKey(ur => ur.RoleId).IsRequired();
-            b.HasMany<ApplicationRoleClaim>().WithOne().HasForeignKey(rc => rc.RoleId).IsRequired();
-        });
-
-        builder.Entity<ApplicationRoleClaim>(b =>
-        {
-            b.HasKey(rc => rc.Id);
-            b.ToTable("RoleClaims");
-        });
-
-        builder.Entity<ApplicationUserRole>(b =>
-        {
-            b.HasKey(r => new { r.UserId, r.RoleId });
-            b.ToTable("UserRoles");
-        });
-
-        builder.Entity<User>(b => b.HasOne<ApplicationUser>()
-            .WithMany(x => x.Users)
-            .HasForeignKey(x => x.ApplicationUserId));
-
-        builder.Entity<ApplicationRoleClaim>().ToTable("RoleClaims");
-        builder.Entity<ApplicationUserRole>().ToTable("UserRole");
-
-
-        builder.ConfigureCurrentDbModel();
-    }
-
 }

BlueWest.Api/Crypto/Hasher.cs

@@ -1,6 +1,5 @@
 
 using System;
-using BlueWest.Data;
 using BlueWest.WebApi.Context.Users;
 using Microsoft.AspNetCore.Identity;
 

BlueWest.Api/Crypto/IHasher.cs

@@ -1,4 +1,3 @@
-using BlueWest.Data;
 using BlueWest.WebApi.Context.Users;
 using Microsoft.AspNetCore.Identity;
 

BlueWest.Api/Crypto/SHA_512.cs

@@ -20,7 +20,7 @@ namespace BlueWest.Cryptography
             var fullText = string.Concat(text, salt);
             var data = Encoding.UTF8.GetBytes(fullText);
             string hash;
-            using SHA512 sha = new SHA512Managed();
+            using SHA512 sha = SHA512.Create();
             var hashBytes = sha.ComputeHash(data);
             var asString = ByteArrayToString(hashBytes);
 

BlueWest.Api/StartupExtensions.cs

@@ -2,7 +2,6 @@ using System;
 using System.Text;
 using System.Threading.Tasks;
 using BlueWest.Cryptography;
-using BlueWest.Data;
 using BlueWest.WebApi.Context;
 using BlueWest.WebApi.Context.Users;
 using BlueWest.WebApi.EF;

BlueWest.Api/Users/ApplicationUserManager.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using BlueWest.Cryptography;
-using BlueWest.Data;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;

BlueWest.Api/Users/Auth/AuthManager.cs

@@ -1,7 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using BlueWest.Cryptography;
-using BlueWest.Data;
 using Microsoft.AspNetCore.Identity;
 
 namespace BlueWest.WebApi.Context.Users;

BlueWest.Api/Users/Auth/IAuthManager.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using BlueWest.Data;
 using Microsoft.AspNetCore.Identity;
 
 namespace BlueWest.WebApi.Context.Users;

BlueWest.Api/Users/Claims/ClaimsDbExtensions.cs

@@ -1,8 +0,0 @@
-namespace BlueWest.WebApi.Context.Users
-
-{
-    internal class ClaimsDbExtensions
-    {
-    }
-}
-

BlueWest.Api/Users/IUserManager.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using BlueWest.Data;
 using Microsoft.AspNetCore.Identity;
 
 namespace BlueWest.WebApi.Context.Users

BlueWest.Api/Users/Roles/ApplicationRoleClaim.cs

@@ -1,17 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Identity;
-
-namespace BlueWest.WebApi.Context.Users;
-
-/// <inheritdoc />
-public class ApplicationRoleClaim : IdentityRoleClaim<string>
-{
-
-    public sealed override int Id { get; set; }
-    public sealed override string RoleId { get; set; }
-
-    public sealed override string ClaimType { get; set; }
-
-    public sealed override string ClaimValue { get; set; }
-    
-}

BlueWest.Api/Users/Roles/ApplicationUserRole.cs

@@ -1,14 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Identity;
-
-namespace BlueWest.WebApi.Context.Users;
-
-/// <inheritdoc />
-public class ApplicationUserRole : IdentityUserRole<string>
-{
-    /// <inheritdoc />
-    public sealed override string UserId { get; set; }
-
-    /// <inheritdoc />
-    public sealed override string RoleId { get; set; }
-}

BlueWest.Api/Users/UserRepository.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using BlueWest.Data;
 using BlueWest.WebApi.EF;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;

BlueWest.Data.Capital/Application/ApplicationRole/ApplicationRole.cs

@@ -14,6 +14,13 @@ namespace BlueWest.WebApi.Context.Users
         /// <inheritdoc />
         public sealed override string NormalizedName { get; set; }
 
+        public ApplicationRole(ApplicationRole applicationRole)
+        {
+            Id = applicationRole.Id;
+            Name = applicationRole.Name;
+            NormalizedName = applicationRole.NormalizedName;
+        }
+
     }
 }
 

BlueWest.Data.Capital/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs

@@ -0,0 +1,33 @@
+using System;
+using Microsoft.AspNetCore.Identity;
+
+namespace BlueWest.WebApi.Context.Users;
+
+/// <inheritdoc />
+public class ApplicationRoleClaim : IdentityRoleClaim<string>
+{
+
+    public sealed override int Id { get; set; }
+
+    #region ApplicationRole
+    public sealed override string RoleId { get; set; }
+    public ApplicationRole ApplicationRole { get; set; }
+
+    #endregion
+
+    public sealed override string ClaimType { get; set; }
+
+    public sealed override string ClaimValue { get; set; }
+
+    public ApplicationRoleClaim() { }
+
+    public ApplicationRoleClaim(ApplicationRoleClaim applicationRoleClaim)
+    {
+        Id = applicationRoleClaim.Id;
+        RoleId = applicationRoleClaim.RoleId;
+        ApplicationRole = applicationRoleClaim.ApplicationRole;
+        ClaimType = applicationRoleClaim.ClaimType;
+        ClaimValue = applicationRoleClaim.ClaimValue;
+    }
+    
+}

BlueWest.Data.Capital/Application/ApplicationUserClaim/ApplicationUserClaim.cs

@@ -8,9 +8,17 @@ public class ApplicationUserClaim : IdentityUserClaim<string>
     /// <inheritdoc />
     public sealed override int Id { get; set; }
 
+    #region User
     /// <inheritdoc />
     public sealed override string UserId { get; set; }
-
+    
+    /// <summary>
+    /// Application User entity
+    /// </summary>
+    public ApplicationUser ApplicationUser { get; set; }
+    
+    #endregion
+    
     /// <inheritdoc />
     public sealed override string ClaimType { get; set; }
 
@@ -21,6 +29,7 @@ public class ApplicationUserClaim : IdentityUserClaim<string>
     {
         Id = applicationUserClaim.Id;
         UserId = applicationUserClaim.UserId;
+        ApplicationUser = applicationUserClaim.ApplicationUser;
         ClaimType = applicationUserClaim.ClaimType;
         ClaimValue = applicationUserClaim.ClaimValue;
     }

BlueWest.Data.Capital/Application/ApplicationUserRole/ApplicationUserRole.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Identity;
+
+namespace BlueWest.WebApi.Context.Users;
+
+/// <inheritdoc />
+public class ApplicationUserRole : IdentityUserRole<string>
+{
+    /// <summary>
+    /// User entity of this role
+    /// </summary>
+    public ApplicationUser User { get; set; }
+    
+    public ApplicationRole ApplicationRole { get; set; }
+
+    /// <inheritdoc />
+    public sealed override string UserId { get; set; }
+
+    /// <inheritdoc />
+    public sealed override string RoleId { get; set; }
+    
+
+    public ApplicationUserRole() { }
+
+    public ApplicationUserRole(ApplicationUserRole applicationUserRole)
+    {
+        User = applicationUserRole.User;
+        UserId = applicationUserRole.UserId;
+        RoleId = applicationUserRole.RoleId;
+        ApplicationRole = applicationUserRole.ApplicationRole;
+    }
+}

BlueWest.Data.Capital/BlueWest.Data.Capital.csproj

@@ -15,6 +15,16 @@
     <ItemGroup>
       <Content Include="obj\rider.project.restore.info" />
     </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="6.0.7" />
+      <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.7" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Application" />
+      <Folder Include="Capital" />
+    </ItemGroup>
     <Import Project="..\include\BlueWest.MapTo\src\BlueWest.MapTo\MapTo.props" />
 
 </Project>

BlueWest.Data.Capital/Geo/Coordinate.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace BlueWest.Data.Geography
 {
     public partial class Coordinate

BlueWest.Frontend

@@ -1 +1 @@
-Subproject commit 34cd3cc52a676cf2d9cacfb3c83a3413ac94b726
+Subproject commit 2afc7cc1eb60369db3d2db021d514647baba93dc

BlueWest.sln

@@ -34,8 +34,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{552B9217-4
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueWest.Api.Gateway", "BlueWest.Api.Gateway\BlueWest.Api.Gateway.csproj", "{A78343AF-77C6-48FD-A9C4-F8B7CBA56212}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueWest.Data.Geography", "BlueWest.Data.Geography\BlueWest.Data.Geography.csproj", "{D5924A3F-0AA1-4AF4-AEDB-3B9F91E6531E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueWest.EfMethods", "include\BlueWest.EfMethods\src\BlueWest.EfMethods\BlueWest.EfMethods.csproj", "{BBF5E860-A880-450B-B6C9-EF92F6421B3D}"
 EndProject
 Global
@@ -76,10 +74,6 @@ Global
 		{A78343AF-77C6-48FD-A9C4-F8B7CBA56212}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A78343AF-77C6-48FD-A9C4-F8B7CBA56212}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A78343AF-77C6-48FD-A9C4-F8B7CBA56212}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5924A3F-0AA1-4AF4-AEDB-3B9F91E6531E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5924A3F-0AA1-4AF4-AEDB-3B9F91E6531E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5924A3F-0AA1-4AF4-AEDB-3B9F91E6531E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5924A3F-0AA1-4AF4-AEDB-3B9F91E6531E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BBF5E860-A880-450B-B6C9-EF92F6421B3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BBF5E860-A880-450B-B6C9-EF92F6421B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BBF5E860-A880-450B-B6C9-EF92F6421B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU