Skip to content

Commit ccd1215

Browse files
committed
Add Identity and Change some entity configuration
1 parent 6f0f740 commit ccd1215

29 files changed

+2008
-129
lines changed

src/CoinyProject.Core.Domain/Entities/AlbumElement.cs

-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ public class AlbumElement
1515
public string Description { get; set; }
1616
public byte[] Image { get; set; }
1717
public int AlbumId { get; set; }
18-
public int AccessibilityId { get; set; }
1918

2019
public virtual Album Album { get; set; }
21-
public virtual AlbumElementAccessibility Accessibility { get; set; }
2220
public virtual Auction Auction { get; set; }
2321
}
2422
}

src/CoinyProject.Core.Domain/Entities/AlbumElementAccessibility.cs

-17
This file was deleted.

src/CoinyProject.Core.Domain/Entities/Auction.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public class Auction
1111
{
1212
public int Id { get; set; }
1313
public int AlbumElementId { get; set; }
14-
public float StartPrice { get; set; }
15-
public float BetDelta { get; set; }
14+
public decimal StartPrice { get; set; }
15+
public decimal BetDelta { get; set; }
1616
public DateTime StartTime { get; set; }
1717
public DateTime ExpirationTime { get; set; }
1818
public bool IsSoldEarlier { get; set; }

src/CoinyProject.Core.Domain/Entities/AuctionBet.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace CoinyProject.Core.Domain.Entities
1010
public class AuctionBet
1111
{
1212
public int Id { get; set; }
13-
public float Price { get; set; }
13+
public decimal Price { get; set; }
1414
public string UserId { get; set; }
1515
public int AuctionId { get; set; }
1616

src/CoinyProject.Core.Domain/Entities/User.cs

-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ public class User : IdentityUser
1111
{
1212
public string FirstName { get; set; }
1313
public string LastName { get; set; }
14-
public int UserRoleId { get; set; }
1514

16-
public virtual UserRole Role { get; set; }
1715
public virtual ICollection<Album> Albums { get; set; }
1816
public virtual ICollection<AuctionBet> AuctionBets { get; set; }
1917
public virtual ICollection<FavoriteAlbums> FavoriteAlbums { get; set; }

src/CoinyProject.Core.Domain/Entities/UserRole.cs

-17
This file was deleted.

src/CoinyProject.Infrastructure.Data/ApplicationDBContext.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using CoinyProject.Core.Domain.Entities;
2+
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
23
using Microsoft.EntityFrameworkCore;
34
using System;
45
using System.Collections.Generic;
@@ -9,15 +10,12 @@
910

1011
namespace CoinyProject.Infrastructure.Data
1112
{
12-
public class ApplicationDBContext : DbContext
13+
public class ApplicationDBContext : IdentityDbContext<User>
1314
{
1415
public ApplicationDBContext(DbContextOptions<ApplicationDBContext> options) : base(options) { }
1516

16-
public DbSet<UserRole> UserRoles { get; set; }
17-
public DbSet<User> Users { get; set; }
1817
public DbSet<Album> Albums { get; set; }
1918
public DbSet<AlbumElement> AlbumElements { get; set; }
20-
public DbSet<AlbumElementAccessibility> AlbumElementAccessibilities { get; set; }
2119
public DbSet<Auction> Auctions { get; set; }
2220
public DbSet<AuctionBet> AuctionBets { get; set; }
2321
public DbSet<Discussion> Discussions { get; set; }

src/CoinyProject.Infrastructure.Data/CoinyProject.Infrastructure.Data.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.2" />
12+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.2" />
1113
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
1214
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
1315
<PrivateAssets>all</PrivateAssets>

src/CoinyProject.Infrastructure.Data/ConnectionExtensions.cs

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.EntityFrameworkCore;
1+
using CoinyProject.Core.Domain.Entities;
2+
using Microsoft.EntityFrameworkCore;
23
using Microsoft.Extensions.Configuration;
34
using Microsoft.Extensions.DependencyInjection;
45
using System;
@@ -11,15 +12,13 @@ namespace CoinyProject.Infrastructure.Data
1112
{
1213
public static class ConnectionExtensions
1314
{
14-
public static void AddDBConnection(this IServiceCollection service, IConfiguration configuration)
15+
public static void AddDBConnection(this IServiceCollection services, IConfiguration configuration)
1516
{
16-
IServiceCollection serviceCollection = service.AddDbContext<ApplicationDBContext>(options =>
17-
18-
options.UseSqlServer(configuration.GetConnectionString("DefaultConnection"))
19-
/*options.UseLazyLoadingProxies();
20-
options.Use*/
17+
services.AddDbContext<ApplicationDBContext>(options =>
18+
options.UseSqlServer(configuration.GetConnectionString("DefaultConnection")));
2119

22-
);
20+
services.AddDefaultIdentity<User>(options => options.SignIn.RequireConfirmedAccount = false)
21+
.AddEntityFrameworkStores<ApplicationDBContext>();
2322
}
2423
}
2524

src/CoinyProject.Infrastructure.Data/EntityTypeConfiguration/AuctionBetConfiguration.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@ public void Configure(EntityTypeBuilder<AuctionBet> builder)
1616
{
1717
builder.HasKey(al => al.Id);
1818

19+
builder.Property(x => x.Price)
20+
.HasColumnType("decimal(10,2)");
21+
1922
builder.HasOne(auctionBet => auctionBet.User)
20-
.WithMany(user => user.AuctionBets)
21-
.HasForeignKey(auctionBet => auctionBet.UserId)
22-
.OnDelete(DeleteBehavior.NoAction);
23+
.WithMany(user => user.AuctionBets)
24+
.HasForeignKey(auctionBet => auctionBet.UserId)
25+
.OnDelete(DeleteBehavior.NoAction);
2326

2427

2528

src/CoinyProject.Infrastructure.Data/EntityTypeConfiguration/AuctionConfiguration.cs

+5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ public void Configure(EntityTypeBuilder<Auction> builder)
1515
{
1616
builder.HasKey(x => x.Id);
1717

18+
builder.Property(x => x.StartPrice)
19+
.HasColumnType("decimal(10,2)");
20+
builder.Property(x => x.BetDelta)
21+
.HasColumnType("decimal(10,2)");
22+
1823
builder.Property(x => x.StartTime)
1924
.HasDefaultValueSql("getdate()");
2025
}

src/CoinyProject.Infrastructure.Data/EntityTypeConfiguration/UserConfiguration.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Text;
88
using System.Threading.Tasks;
99

10-
namespace CoinyProject.Infrastructure.Data.EntityTypeConfiguration
10+
namespace CoinyProject.IdentityServer.Infrastructure.EntityTypeConfiguration
1111
{
1212
internal class UserConfiguration : IEntityTypeConfiguration<User>
1313
{

0 commit comments

Comments
 (0)