diff --git a/BlueWest.Api/BlueWest.Api.csproj b/BlueWest.Api/BlueWest.Api.csproj index aff487f..fd088be 100644 --- a/BlueWest.Api/BlueWest.Api.csproj +++ b/BlueWest.Api/BlueWest.Api.csproj @@ -43,7 +43,6 @@ - diff --git a/BlueWest.Api/Context/ApplicationUserDbContext.cs b/BlueWest.Api/Context/ApplicationUserDbContext.cs index 9a88c5b..7d4a80c 100644 --- a/BlueWest.Api/Context/ApplicationUserDbContext.cs +++ b/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; - -/// -/// Application User Db Context -/// -public class ApplicationUserDbContext : IdentityDbContext< - ApplicationUser, - ApplicationRole, - string, - ApplicationUserClaim, - ApplicationUserRole, - ApplicationUserLogin, - ApplicationRoleClaim, - ApplicationUserToken> +namespace BlueWest.WebApi.Context { - /// - public sealed override DbSet UserClaims { get; set; } - - /// - public sealed override DbSet UserRoles { get; set; } - - /// - public sealed override DbSet Roles { get; set; } - - /// - public sealed override DbSet RoleClaims { get; set; } - - - /// - public ApplicationUserDbContext(DbContextOptions options) : base(options) + /// + /// Application User Db Context + /// + [EfGenerator] + public class ApplicationUserDbContext : IdentityDbContext< + ApplicationUser, + ApplicationRole, + string, + ApplicationUserClaim, + ApplicationUserRole, + ApplicationUserLogin, + ApplicationRoleClaim, + ApplicationUserToken> { - Database.EnsureCreated(); + /// + [EfGetMany(typeof(ApplicationUserClaim))] + public sealed override DbSet UserClaims { get; set; } + + [EfGetMany(typeof(ApplicationUserRole))] + /// + public sealed override DbSet UserRoles { get; set; } + + [EfGetMany(typeof(ApplicationRole))] + /// + public sealed override DbSet Roles { get; set; } + + [EfGetMany(typeof(ApplicationRoleClaim))] + /// + public sealed override DbSet RoleClaims { get; set; } + + + /// + public ApplicationUserDbContext(DbContextOptions options) : base(options) + { + Database.EnsureCreated(); + } + + + /// + protected override void OnModelCreating(ModelBuilder builder) + { + base.OnModelCreating(builder); + + builder.Entity().ToTable("UserRoles"); + builder.Entity(b => + { + b.HasMany() + .WithOne() + .HasForeignKey(ur => ur.UserId).IsRequired(); + }); + + builder.Entity().ToTable("ApplicationUser") + .HasKey(x => x.Id); + + + builder.Entity(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().WithOne().HasForeignKey(ur => ur.RoleId).IsRequired(); + b.HasMany().WithOne().HasForeignKey(rc => rc.RoleId).IsRequired(); + }); + + builder.Entity(b => + { + b.HasKey(rc => rc.Id); + b.ToTable("RoleClaims"); + }); + + builder.Entity(b => + { + b.HasKey(r => new {r.UserId, r.RoleId}); + b.ToTable("UserRoles"); + }); + + builder.Entity(b => b.HasOne() + .WithMany(x => x.Users) + .HasForeignKey(x => x.ApplicationUserId)); + + builder.Entity().ToTable("RoleClaims"); + builder.Entity().ToTable("UserRole"); + + + builder.ConfigureCurrentDbModel(); + } } - - - /// - protected override void OnModelCreating(ModelBuilder builder) - { - base.OnModelCreating(builder); - - builder.Entity().ToTable("UserRoles"); - builder.Entity(b => - { - b.HasMany() - .WithOne() - .HasForeignKey(ur => ur.UserId).IsRequired(); - }); - - builder.Entity().ToTable("ApplicationUser") - .HasKey(x => x.Id); - - - - builder.Entity(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().WithOne().HasForeignKey(ur => ur.RoleId).IsRequired(); - b.HasMany().WithOne().HasForeignKey(rc => rc.RoleId).IsRequired(); - }); - - builder.Entity(b => - { - b.HasKey(rc => rc.Id); - b.ToTable("RoleClaims"); - }); - - builder.Entity(b => - { - b.HasKey(r => new { r.UserId, r.RoleId }); - b.ToTable("UserRoles"); - }); - - builder.Entity(b => b.HasOne() - .WithMany(x => x.Users) - .HasForeignKey(x => x.ApplicationUserId)); - - builder.Entity().ToTable("RoleClaims"); - builder.Entity().ToTable("UserRole"); - - - builder.ConfigureCurrentDbModel(); - } - } \ No newline at end of file diff --git a/BlueWest.Api/Users/Crypto/BaseCryptoItem.cs b/BlueWest.Api/Crypto/BaseCryptoItem.cs similarity index 100% rename from BlueWest.Api/Users/Crypto/BaseCryptoItem.cs rename to BlueWest.Api/Crypto/BaseCryptoItem.cs diff --git a/BlueWest.Api/Users/Crypto/Hasher.cs b/BlueWest.Api/Crypto/Hasher.cs similarity index 99% rename from BlueWest.Api/Users/Crypto/Hasher.cs rename to BlueWest.Api/Crypto/Hasher.cs index f6d5ad8..500cc84 100644 --- a/BlueWest.Api/Users/Crypto/Hasher.cs +++ b/BlueWest.Api/Crypto/Hasher.cs @@ -1,6 +1,5 @@ using System; -using BlueWest.Data; using BlueWest.WebApi.Context.Users; using Microsoft.AspNetCore.Identity; diff --git a/BlueWest.Api/Users/Crypto/IHasher.cs b/BlueWest.Api/Crypto/IHasher.cs similarity index 97% rename from BlueWest.Api/Users/Crypto/IHasher.cs rename to BlueWest.Api/Crypto/IHasher.cs index 30fbec4..0c473c8 100644 --- a/BlueWest.Api/Users/Crypto/IHasher.cs +++ b/BlueWest.Api/Crypto/IHasher.cs @@ -1,4 +1,3 @@ -using BlueWest.Data; using BlueWest.WebApi.Context.Users; using Microsoft.AspNetCore.Identity; diff --git a/BlueWest.Api/Users/Jwt/IJwtFactory.cs b/BlueWest.Api/Crypto/Jwt/IJwtFactory.cs similarity index 100% rename from BlueWest.Api/Users/Jwt/IJwtFactory.cs rename to BlueWest.Api/Crypto/Jwt/IJwtFactory.cs diff --git a/BlueWest.Api/Users/Jwt/IJwtTokenHandler.cs b/BlueWest.Api/Crypto/Jwt/IJwtTokenHandler.cs similarity index 100% rename from BlueWest.Api/Users/Jwt/IJwtTokenHandler.cs rename to BlueWest.Api/Crypto/Jwt/IJwtTokenHandler.cs diff --git a/BlueWest.Api/Users/Jwt/ITokenFactory.cs b/BlueWest.Api/Crypto/Jwt/ITokenFactory.cs similarity index 100% rename from BlueWest.Api/Users/Jwt/ITokenFactory.cs rename to BlueWest.Api/Crypto/Jwt/ITokenFactory.cs diff --git a/BlueWest.Api/Users/Jwt/JwtFactory.cs b/BlueWest.Api/Crypto/Jwt/JwtFactory.cs similarity index 100% rename from BlueWest.Api/Users/Jwt/JwtFactory.cs rename to BlueWest.Api/Crypto/Jwt/JwtFactory.cs diff --git a/BlueWest.Api/Users/Jwt/JwtIssuerOptions.cs b/BlueWest.Api/Crypto/Jwt/JwtIssuerOptions.cs similarity index 100% rename from BlueWest.Api/Users/Jwt/JwtIssuerOptions.cs rename to BlueWest.Api/Crypto/Jwt/JwtIssuerOptions.cs diff --git a/BlueWest.Api/Users/Jwt/JwtTokenHandler.cs b/BlueWest.Api/Crypto/Jwt/JwtTokenHandler.cs similarity index 100% rename from BlueWest.Api/Users/Jwt/JwtTokenHandler.cs rename to BlueWest.Api/Crypto/Jwt/JwtTokenHandler.cs diff --git a/BlueWest.Api/Users/Crypto/SHA_512.cs b/BlueWest.Api/Crypto/SHA_512.cs similarity index 97% rename from BlueWest.Api/Users/Crypto/SHA_512.cs rename to BlueWest.Api/Crypto/SHA_512.cs index 999a711..24d0759 100644 --- a/BlueWest.Api/Users/Crypto/SHA_512.cs +++ b/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); diff --git a/BlueWest.Api/StartupExtensions.cs b/BlueWest.Api/StartupExtensions.cs index 0bffff7..85f9247 100644 --- a/BlueWest.Api/StartupExtensions.cs +++ b/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; diff --git a/BlueWest.Api/Users/ApplicationUserManager.cs b/BlueWest.Api/Users/ApplicationUserManager.cs index fac7d11..96fa33f 100644 --- a/BlueWest.Api/Users/ApplicationUserManager.cs +++ b/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; diff --git a/BlueWest.Api/Users/Auth/AuthManager.cs b/BlueWest.Api/Users/Auth/AuthManager.cs index b4731a8..3225359 100644 --- a/BlueWest.Api/Users/Auth/AuthManager.cs +++ b/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; diff --git a/BlueWest.Api/Users/Auth/IAuthManager.cs b/BlueWest.Api/Users/Auth/IAuthManager.cs index 32ca9b9..bf18985 100644 --- a/BlueWest.Api/Users/Auth/IAuthManager.cs +++ b/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; diff --git a/BlueWest.Api/Users/Claims/ClaimsDbExtensions.cs b/BlueWest.Api/Users/Claims/ClaimsDbExtensions.cs deleted file mode 100644 index a3ef2fd..0000000 --- a/BlueWest.Api/Users/Claims/ClaimsDbExtensions.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace BlueWest.WebApi.Context.Users - -{ - internal class ClaimsDbExtensions - { - } -} - diff --git a/BlueWest.Api/Users/IUserManager.cs b/BlueWest.Api/Users/IUserManager.cs index 78d2bfa..9b2ac56 100644 --- a/BlueWest.Api/Users/IUserManager.cs +++ b/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 diff --git a/BlueWest.Api/Users/Roles/RoleManager.cs b/BlueWest.Api/Users/RoleManager.cs similarity index 100% rename from BlueWest.Api/Users/Roles/RoleManager.cs rename to BlueWest.Api/Users/RoleManager.cs diff --git a/BlueWest.Api/Users/Roles/RoleStore.cs b/BlueWest.Api/Users/RoleStore.cs similarity index 100% rename from BlueWest.Api/Users/Roles/RoleStore.cs rename to BlueWest.Api/Users/RoleStore.cs diff --git a/BlueWest.Api/Users/Roles/ApplicationRoleClaim.cs b/BlueWest.Api/Users/Roles/ApplicationRoleClaim.cs deleted file mode 100644 index f4be47f..0000000 --- a/BlueWest.Api/Users/Roles/ApplicationRoleClaim.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using Microsoft.AspNetCore.Identity; - -namespace BlueWest.WebApi.Context.Users; - -/// -public class ApplicationRoleClaim : IdentityRoleClaim -{ - - 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; } - -} \ No newline at end of file diff --git a/BlueWest.Api/Users/Roles/ApplicationUserRole.cs b/BlueWest.Api/Users/Roles/ApplicationUserRole.cs deleted file mode 100644 index 001cfee..0000000 --- a/BlueWest.Api/Users/Roles/ApplicationUserRole.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Microsoft.AspNetCore.Identity; - -namespace BlueWest.WebApi.Context.Users; - -/// -public class ApplicationUserRole : IdentityUserRole -{ - /// - public sealed override string UserId { get; set; } - - /// - public sealed override string RoleId { get; set; } -} \ No newline at end of file diff --git a/BlueWest.Api/Users/UserRepository.cs b/BlueWest.Api/Users/UserRepository.cs index c3362b2..7710a12 100644 --- a/BlueWest.Api/Users/UserRepository.cs +++ b/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; diff --git a/BlueWest.Api/Users/Roles/ApplicationRole.cs b/BlueWest.Data.Capital/Application/ApplicationRole/ApplicationRole.cs similarity index 66% rename from BlueWest.Api/Users/Roles/ApplicationRole.cs rename to BlueWest.Data.Capital/Application/ApplicationRole/ApplicationRole.cs index f65b5b9..01a1f29 100644 --- a/BlueWest.Api/Users/Roles/ApplicationRole.cs +++ b/BlueWest.Data.Capital/Application/ApplicationRole/ApplicationRole.cs @@ -14,6 +14,13 @@ namespace BlueWest.WebApi.Context.Users /// public sealed override string NormalizedName { get; set; } + public ApplicationRole(ApplicationRole applicationRole) + { + Id = applicationRole.Id; + Name = applicationRole.Name; + NormalizedName = applicationRole.NormalizedName; + } + } } diff --git a/BlueWest.Data.Capital/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs b/BlueWest.Data.Capital/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs new file mode 100644 index 0000000..70440b9 --- /dev/null +++ b/BlueWest.Data.Capital/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs @@ -0,0 +1,33 @@ +using System; +using Microsoft.AspNetCore.Identity; + +namespace BlueWest.WebApi.Context.Users; + +/// +public class ApplicationRoleClaim : IdentityRoleClaim +{ + + 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; + } + +} \ No newline at end of file diff --git a/BlueWest.Api/Users/Roles/ApplicationUserClaim.cs b/BlueWest.Data.Capital/Application/ApplicationUserClaim/ApplicationUserClaim.cs similarity index 77% rename from BlueWest.Api/Users/Roles/ApplicationUserClaim.cs rename to BlueWest.Data.Capital/Application/ApplicationUserClaim/ApplicationUserClaim.cs index 710b315..556760c 100644 --- a/BlueWest.Api/Users/Roles/ApplicationUserClaim.cs +++ b/BlueWest.Data.Capital/Application/ApplicationUserClaim/ApplicationUserClaim.cs @@ -8,9 +8,17 @@ public class ApplicationUserClaim : IdentityUserClaim /// public sealed override int Id { get; set; } + #region User /// public sealed override string UserId { get; set; } - + + /// + /// Application User entity + /// + public ApplicationUser ApplicationUser { get; set; } + + #endregion + /// public sealed override string ClaimType { get; set; } @@ -21,6 +29,7 @@ public class ApplicationUserClaim : IdentityUserClaim { Id = applicationUserClaim.Id; UserId = applicationUserClaim.UserId; + ApplicationUser = applicationUserClaim.ApplicationUser; ClaimType = applicationUserClaim.ClaimType; ClaimValue = applicationUserClaim.ClaimValue; } diff --git a/BlueWest.Api/Users/Roles/ApplicationUserLogin.cs b/BlueWest.Data.Capital/Application/ApplicationUserLogin/ApplicationUserLogin.cs similarity index 100% rename from BlueWest.Api/Users/Roles/ApplicationUserLogin.cs rename to BlueWest.Data.Capital/Application/ApplicationUserLogin/ApplicationUserLogin.cs diff --git a/BlueWest.Data.Capital/Application/ApplicationUserRole/ApplicationUserRole.cs b/BlueWest.Data.Capital/Application/ApplicationUserRole/ApplicationUserRole.cs new file mode 100644 index 0000000..48dc5c4 --- /dev/null +++ b/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; + +/// +public class ApplicationUserRole : IdentityUserRole +{ + /// + /// User entity of this role + /// + public ApplicationUser User { get; set; } + + public ApplicationRole ApplicationRole { get; set; } + + /// + public sealed override string UserId { get; set; } + + /// + 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; + } +} \ No newline at end of file diff --git a/BlueWest.Api/Users/Roles/ApplicationUserToken.cs b/BlueWest.Data.Capital/Application/ApplicationUserToken/ApplicationUserToken.cs similarity index 100% rename from BlueWest.Api/Users/Roles/ApplicationUserToken.cs rename to BlueWest.Data.Capital/Application/ApplicationUserToken/ApplicationUserToken.cs diff --git a/BlueWest.Api/Users/ApplicationUser.cs b/BlueWest.Data.Capital/ApplicationUser.cs similarity index 100% rename from BlueWest.Api/Users/ApplicationUser.cs rename to BlueWest.Data.Capital/ApplicationUser.cs diff --git a/BlueWest.Data.Capital/BlueWest.Data.Capital.csproj b/BlueWest.Data.Capital/BlueWest.Data.Capital.csproj index 1309c49..d48dde3 100644 --- a/BlueWest.Data.Capital/BlueWest.Data.Capital.csproj +++ b/BlueWest.Data.Capital/BlueWest.Data.Capital.csproj @@ -15,6 +15,16 @@ + + + + + + + + + + diff --git a/BlueWest.Data.Capital/Company/Company.cs b/BlueWest.Data.Capital/Capital/Company/Company.cs similarity index 100% rename from BlueWest.Data.Capital/Company/Company.cs rename to BlueWest.Data.Capital/Capital/Company/Company.cs diff --git a/BlueWest.Data.Capital/Company/CompanyCreate.cs b/BlueWest.Data.Capital/Capital/Company/CompanyCreate.cs similarity index 100% rename from BlueWest.Data.Capital/Company/CompanyCreate.cs rename to BlueWest.Data.Capital/Capital/Company/CompanyCreate.cs diff --git a/BlueWest.Data.Capital/Company/CompanyType/CompanyType.cs b/BlueWest.Data.Capital/Capital/Company/CompanyType/CompanyType.cs similarity index 100% rename from BlueWest.Data.Capital/Company/CompanyType/CompanyType.cs rename to BlueWest.Data.Capital/Capital/Company/CompanyType/CompanyType.cs diff --git a/BlueWest.Data.Capital/Company/CompanyType/CompanyTypeCreate.cs b/BlueWest.Data.Capital/Capital/Company/CompanyType/CompanyTypeCreate.cs similarity index 100% rename from BlueWest.Data.Capital/Company/CompanyType/CompanyTypeCreate.cs rename to BlueWest.Data.Capital/Capital/Company/CompanyType/CompanyTypeCreate.cs diff --git a/BlueWest.Data.Capital/Company/CompanyUnique.cs b/BlueWest.Data.Capital/Capital/Company/CompanyUnique.cs similarity index 100% rename from BlueWest.Data.Capital/Company/CompanyUnique.cs rename to BlueWest.Data.Capital/Capital/Company/CompanyUnique.cs diff --git a/BlueWest.Data.Capital/Company/CompanyUpdate.cs b/BlueWest.Data.Capital/Capital/Company/CompanyUpdate.cs similarity index 100% rename from BlueWest.Data.Capital/Company/CompanyUpdate.cs rename to BlueWest.Data.Capital/Capital/Company/CompanyUpdate.cs diff --git a/BlueWest.Data.Capital/Company/Product/Product.cs b/BlueWest.Data.Capital/Capital/Company/Product/Product.cs similarity index 100% rename from BlueWest.Data.Capital/Company/Product/Product.cs rename to BlueWest.Data.Capital/Capital/Company/Product/Product.cs diff --git a/BlueWest.Data.Capital/Company/Product/ProductCreate.cs b/BlueWest.Data.Capital/Capital/Company/Product/ProductCreate.cs similarity index 100% rename from BlueWest.Data.Capital/Company/Product/ProductCreate.cs rename to BlueWest.Data.Capital/Capital/Company/Product/ProductCreate.cs diff --git a/BlueWest.Data.Capital/Company/Product/ProductUnique.cs b/BlueWest.Data.Capital/Capital/Company/Product/ProductUnique.cs similarity index 100% rename from BlueWest.Data.Capital/Company/Product/ProductUnique.cs rename to BlueWest.Data.Capital/Capital/Company/Product/ProductUnique.cs diff --git a/BlueWest.Data.Capital/Company/Product/ProductUpdate.cs b/BlueWest.Data.Capital/Capital/Company/Product/ProductUpdate.cs similarity index 100% rename from BlueWest.Data.Capital/Company/Product/ProductUpdate.cs rename to BlueWest.Data.Capital/Capital/Company/Product/ProductUpdate.cs diff --git a/BlueWest.Data.Capital/Country/Country.cs b/BlueWest.Data.Capital/Capital/Country/Country.cs similarity index 100% rename from BlueWest.Data.Capital/Country/Country.cs rename to BlueWest.Data.Capital/Capital/Country/Country.cs diff --git a/BlueWest.Data.Capital/Country/CountryCreate.cs b/BlueWest.Data.Capital/Capital/Country/CountryCreate.cs similarity index 100% rename from BlueWest.Data.Capital/Country/CountryCreate.cs rename to BlueWest.Data.Capital/Capital/Country/CountryCreate.cs diff --git a/BlueWest.Data.Capital/Country/CountryUnique.cs b/BlueWest.Data.Capital/Capital/Country/CountryUnique.cs similarity index 100% rename from BlueWest.Data.Capital/Country/CountryUnique.cs rename to BlueWest.Data.Capital/Capital/Country/CountryUnique.cs diff --git a/BlueWest.Data.Capital/Country/CountryUpdate.cs b/BlueWest.Data.Capital/Capital/Country/CountryUpdate.cs similarity index 100% rename from BlueWest.Data.Capital/Country/CountryUpdate.cs rename to BlueWest.Data.Capital/Capital/Country/CountryUpdate.cs diff --git a/BlueWest.Data.Capital/Country/generated/GeneratedCountries.cs b/BlueWest.Data.Capital/Capital/Country/generated/GeneratedCountries.cs similarity index 100% rename from BlueWest.Data.Capital/Country/generated/GeneratedCountries.cs rename to BlueWest.Data.Capital/Capital/Country/generated/GeneratedCountries.cs diff --git a/BlueWest.Data.Capital/Currency/Currency.cs b/BlueWest.Data.Capital/Capital/Currency/Currency.cs similarity index 100% rename from BlueWest.Data.Capital/Currency/Currency.cs rename to BlueWest.Data.Capital/Capital/Currency/Currency.cs diff --git a/BlueWest.Data.Capital/Currency/CurrencyCreate.cs b/BlueWest.Data.Capital/Capital/Currency/CurrencyCreate.cs similarity index 100% rename from BlueWest.Data.Capital/Currency/CurrencyCreate.cs rename to BlueWest.Data.Capital/Capital/Currency/CurrencyCreate.cs diff --git a/BlueWest.Data.Capital/Currency/CurrencyUnique.cs b/BlueWest.Data.Capital/Capital/Currency/CurrencyUnique.cs similarity index 100% rename from BlueWest.Data.Capital/Currency/CurrencyUnique.cs rename to BlueWest.Data.Capital/Capital/Currency/CurrencyUnique.cs diff --git a/BlueWest.Data.Capital/Currency/CurrencyUpdate.cs b/BlueWest.Data.Capital/Capital/Currency/CurrencyUpdate.cs similarity index 100% rename from BlueWest.Data.Capital/Currency/CurrencyUpdate.cs rename to BlueWest.Data.Capital/Capital/Currency/CurrencyUpdate.cs diff --git a/BlueWest.Data.Capital/Industry/Industry.cs b/BlueWest.Data.Capital/Capital/Industry/Industry.cs similarity index 100% rename from BlueWest.Data.Capital/Industry/Industry.cs rename to BlueWest.Data.Capital/Capital/Industry/Industry.cs diff --git a/BlueWest.Data.Capital/Industry/IndustryCreate.cs b/BlueWest.Data.Capital/Capital/Industry/IndustryCreate.cs similarity index 100% rename from BlueWest.Data.Capital/Industry/IndustryCreate.cs rename to BlueWest.Data.Capital/Capital/Industry/IndustryCreate.cs diff --git a/BlueWest.Data.Capital/Industry/IndustryUnique.cs b/BlueWest.Data.Capital/Capital/Industry/IndustryUnique.cs similarity index 100% rename from BlueWest.Data.Capital/Industry/IndustryUnique.cs rename to BlueWest.Data.Capital/Capital/Industry/IndustryUnique.cs diff --git a/BlueWest.Data.Capital/Industry/IndustryUpdate.cs b/BlueWest.Data.Capital/Capital/Industry/IndustryUpdate.cs similarity index 100% rename from BlueWest.Data.Capital/Industry/IndustryUpdate.cs rename to BlueWest.Data.Capital/Capital/Industry/IndustryUpdate.cs diff --git a/BlueWest.Data.Capital/Media/MediaSource.cs b/BlueWest.Data.Capital/Capital/Media/MediaSource.cs similarity index 100% rename from BlueWest.Data.Capital/Media/MediaSource.cs rename to BlueWest.Data.Capital/Capital/Media/MediaSource.cs diff --git a/BlueWest.Data.Capital/Media/MediaSourceType.cs b/BlueWest.Data.Capital/Capital/Media/MediaSourceType.cs similarity index 100% rename from BlueWest.Data.Capital/Media/MediaSourceType.cs rename to BlueWest.Data.Capital/Capital/Media/MediaSourceType.cs diff --git a/BlueWest.Data.Capital/Media/Website.cs b/BlueWest.Data.Capital/Capital/Media/Website.cs similarity index 100% rename from BlueWest.Data.Capital/Media/Website.cs rename to BlueWest.Data.Capital/Capital/Media/Website.cs diff --git a/BlueWest.Data.Geography/Coordinate.cs b/BlueWest.Data.Capital/Geo/Coordinate.cs similarity index 95% rename from BlueWest.Data.Geography/Coordinate.cs rename to BlueWest.Data.Capital/Geo/Coordinate.cs index c18978e..20b9ee7 100644 --- a/BlueWest.Data.Geography/Coordinate.cs +++ b/BlueWest.Data.Capital/Geo/Coordinate.cs @@ -1,3 +1,5 @@ +using System; + namespace BlueWest.Data.Geography { public partial class Coordinate diff --git a/BlueWest.Frontend b/BlueWest.Frontend index 34cd3cc..2afc7cc 160000 --- a/BlueWest.Frontend +++ b/BlueWest.Frontend @@ -1 +1 @@ -Subproject commit 34cd3cc52a676cf2d9cacfb3c83a3413ac94b726 +Subproject commit 2afc7cc1eb60369db3d2db021d514647baba93dc diff --git a/BlueWest.sln b/BlueWest.sln index ac37144..98d9c29 100644 --- a/BlueWest.sln +++ b/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