From 8da853a351d7e89f257a61b0f113bed010764152 Mon Sep 17 00:00:00 2001 From: hello Date: Tue, 25 Mar 2025 21:17:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=BF=81=E7=A7=BB=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/HelloShop.AppHost/Program.cs | 3 +- src/HelloShop.BasketService/Program.cs | 2 - .../DataSeeding/UserDataSeedingProvider.cs | 76 ---------------- ... 20250325130953_InitialCreate.Designer.cs} | 4 +- ...ate.cs => 20250325130953_InitialCreate.cs} | 0 .../IdentityServiceDbContextModelSnapshot.cs | 2 +- src/HelloShop.IdentityService/Program.cs | 10 ++- .../Services/MigrationService.cs | 49 ++++++++++ .../Workers/DataSeeder.cs | 89 +++++++++++++++++++ .../OrderingDataSeedingProvider.cs | 16 ---- .../Extensions/Extensions.cs | 5 +- ... 20250325131032_InitialCreate.Designer.cs} | 4 +- ...ate.cs => 20250325131032_InitialCreate.cs} | 0 .../OrderingServiceDbContextModelSnapshot.cs | 2 +- src/HelloShop.OrderingService/Program.cs | 6 +- .../Services/MigrationService.cs | 49 ++++++++++ .../Workers/DataSeeder.cs | 14 +++ .../DataSeeding/ProductDataSeedingProvider.cs | 56 ------------ ... 20250325131047_InitialCreate.Designer.cs} | 4 +- ...ate.cs => 20250325131047_InitialCreate.cs} | 0 .../ProductServiceDbContextModelSnapshot.cs | 2 +- src/HelloShop.ProductService/Program.cs | 9 +- .../Services/MigrationService.cs | 49 ++++++++++ .../Workers/DataSeeder.cs | 65 ++++++++++++++ .../SetupCatalogSamples.json | 0 .../Extensions/DataSeedingExtensions.cs | 38 -------- .../Infrastructure/IDataSeedingProvider.cs | 12 --- 27 files changed, 345 insertions(+), 221 deletions(-) delete mode 100644 src/HelloShop.IdentityService/DataSeeding/UserDataSeedingProvider.cs rename src/HelloShop.IdentityService/Infrastructure/Migrations/{20241123020852_InitialCreate.Designer.cs => 20250325130953_InitialCreate.Designer.cs} (99%) rename src/HelloShop.IdentityService/Infrastructure/Migrations/{20241123020852_InitialCreate.cs => 20250325130953_InitialCreate.cs} (100%) create mode 100644 src/HelloShop.IdentityService/Services/MigrationService.cs create mode 100644 src/HelloShop.IdentityService/Workers/DataSeeder.cs delete mode 100644 src/HelloShop.OrderingService/DataSeeding/OrderingDataSeedingProvider.cs rename src/HelloShop.OrderingService/Infrastructure/Migrations/{20241123020913_InitialCreate.Designer.cs => 20250325131032_InitialCreate.Designer.cs} (99%) rename src/HelloShop.OrderingService/Infrastructure/Migrations/{20241123020913_InitialCreate.cs => 20250325131032_InitialCreate.cs} (100%) create mode 100644 src/HelloShop.OrderingService/Services/MigrationService.cs create mode 100644 src/HelloShop.OrderingService/Workers/DataSeeder.cs delete mode 100644 src/HelloShop.ProductService/DataSeeding/ProductDataSeedingProvider.cs rename src/HelloShop.ProductService/Infrastructure/Migrations/{20241123020927_InitialCreate.Designer.cs => 20250325131047_InitialCreate.Designer.cs} (97%) rename src/HelloShop.ProductService/Infrastructure/Migrations/{20241123020927_InitialCreate.cs => 20250325131047_InitialCreate.cs} (100%) create mode 100644 src/HelloShop.ProductService/Services/MigrationService.cs create mode 100644 src/HelloShop.ProductService/Workers/DataSeeder.cs rename src/HelloShop.ProductService/{DataSeeding => Workers}/SetupCatalogSamples.json (100%) delete mode 100644 src/HelloShop.ServiceDefaults/Extensions/DataSeedingExtensions.cs delete mode 100644 src/HelloShop.ServiceDefaults/Infrastructure/IDataSeedingProvider.cs diff --git a/src/HelloShop.AppHost/Program.cs b/src/HelloShop.AppHost/Program.cs index 2a4aba6..2558785 100644 --- a/src/HelloShop.AppHost/Program.cs +++ b/src/HelloShop.AppHost/Program.cs @@ -8,8 +8,7 @@ var builder = DistributedApplication.CreateBuilder(args); var postgreUser = builder.AddParameter("postgreUser", secret: true); var postgrePassword = builder.AddParameter("postgrePassword", secret: true); -var postgres = builder.AddPostgres("postgres", postgreUser, postgrePassword, port: 5432).WithPgAdmin() - .WithLifetime(ContainerLifetime.Persistent); +var postgres = builder.AddPostgres("postgres", postgreUser, postgrePassword, port: 5432).WithPgAdmin(); var identitydb = postgres.AddDatabase("identitydb"); var productdb = postgres.AddDatabase("productdb"); var orderingdb = postgres.AddDatabase("orderingdb"); diff --git a/src/HelloShop.BasketService/Program.cs b/src/HelloShop.BasketService/Program.cs index a7630eb..966bc47 100644 --- a/src/HelloShop.BasketService/Program.cs +++ b/src/HelloShop.BasketService/Program.cs @@ -34,7 +34,6 @@ builder.Services.AddGrpc().AddJsonTranscoding(); builder.Services.AddGrpcSwagger(); builder.Services.AddOpenApi(); -builder.Services.AddDataSeedingProviders(); builder.Services.AddCustomLocalization(); builder.Services.AddModelMapper().AddModelValidator(); builder.Services.AddLocalization().AddPermissionDefinitions(); @@ -59,7 +58,6 @@ app.MapDaprEventBus(); app.UseAuthentication().UseAuthorization(); app.MapGrpcService(); app.MapGrpcService(); -app.UseDataSeedingProviders(); app.UseCustomLocalization(); app.UseOpenApi(); app.MapGroup("api/Permissions").MapPermissionDefinitions("Permissions"); diff --git a/src/HelloShop.IdentityService/DataSeeding/UserDataSeedingProvider.cs b/src/HelloShop.IdentityService/DataSeeding/UserDataSeedingProvider.cs deleted file mode 100644 index 80b2283..0000000 --- a/src/HelloShop.IdentityService/DataSeeding/UserDataSeedingProvider.cs +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (c) HelloShop Corporation. All rights reserved. -// See the license file in the project root for more information. - -using HelloShop.IdentityService.Entities; -using HelloShop.IdentityService.Infrastructure; -using HelloShop.ServiceDefaults.Infrastructure; -using Microsoft.AspNetCore.Identity; -using Microsoft.EntityFrameworkCore; - -namespace HelloShop.IdentityService.DataSeeding -{ - public class UserDataSeedingProvider(UserManager userManager, RoleManager roleManager) : IDataSeedingProvider - { - public async Task SeedingAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken = default) - { - await serviceProvider.GetRequiredService().Database.EnsureCreatedAsync(cancellationToken); - - var adminRole = await roleManager.Roles.SingleOrDefaultAsync(x => x.Name == "AdminRole", cancellationToken); - - if (adminRole == null) - { - adminRole = new Role { Name = "AdminRole", }; - await roleManager.CreateAsync(adminRole); - } - - var guestRole = await roleManager.Roles.SingleOrDefaultAsync(x => x.Name == "GuestRole", cancellationToken: cancellationToken); - - if (guestRole == null) - { - guestRole = new Role { Name = "GuestRole", }; - await roleManager.CreateAsync(guestRole); - } - - var adminUser = await userManager.FindByNameAsync("admin"); - - if (adminUser == null) - { - adminUser = new User - { - UserName = "admin", - Email = "admin@test.com" - }; - await userManager.CreateAsync(adminUser, adminUser.UserName); - } - - await userManager.AddToRolesAsync(adminUser, ["AdminRole", "GuestRole"]); - - var guestUser = await userManager.FindByNameAsync("guest"); - - if (guestUser == null) - { - guestUser = new User - { - UserName = "guest", - Email = "guest@test.com" - }; - await userManager.CreateAsync(guestUser, guestUser.UserName); - } - - await userManager.AddToRoleAsync(guestUser, "GuestRole"); - - if (userManager.Users.Count() < 30) - { - for (int i = 0; i < 30; i++) - { - var user = new User - { - UserName = $"user{i}", - Email = $"test{i}@test.com", - }; - await userManager.CreateAsync(user, user.UserName); - } - } - } - } -} diff --git a/src/HelloShop.IdentityService/Infrastructure/Migrations/20241123020852_InitialCreate.Designer.cs b/src/HelloShop.IdentityService/Infrastructure/Migrations/20250325130953_InitialCreate.Designer.cs similarity index 99% rename from src/HelloShop.IdentityService/Infrastructure/Migrations/20241123020852_InitialCreate.Designer.cs rename to src/HelloShop.IdentityService/Infrastructure/Migrations/20250325130953_InitialCreate.Designer.cs index c88c935..ea6bab4 100644 --- a/src/HelloShop.IdentityService/Infrastructure/Migrations/20241123020852_InitialCreate.Designer.cs +++ b/src/HelloShop.IdentityService/Infrastructure/Migrations/20250325130953_InitialCreate.Designer.cs @@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace HelloShop.IdentityService.Infrastructure.Migrations { [DbContext(typeof(IdentityServiceDbContext))] - [Migration("20241123020852_InitialCreate")] + [Migration("20250325130953_InitialCreate")] partial class InitialCreate { /// @@ -20,7 +20,7 @@ namespace HelloShop.IdentityService.Infrastructure.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.10") + .HasAnnotation("ProductVersion", "9.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); diff --git a/src/HelloShop.IdentityService/Infrastructure/Migrations/20241123020852_InitialCreate.cs b/src/HelloShop.IdentityService/Infrastructure/Migrations/20250325130953_InitialCreate.cs similarity index 100% rename from src/HelloShop.IdentityService/Infrastructure/Migrations/20241123020852_InitialCreate.cs rename to src/HelloShop.IdentityService/Infrastructure/Migrations/20250325130953_InitialCreate.cs diff --git a/src/HelloShop.IdentityService/Infrastructure/Migrations/IdentityServiceDbContextModelSnapshot.cs b/src/HelloShop.IdentityService/Infrastructure/Migrations/IdentityServiceDbContextModelSnapshot.cs index 0d846b0..19342d6 100644 --- a/src/HelloShop.IdentityService/Infrastructure/Migrations/IdentityServiceDbContextModelSnapshot.cs +++ b/src/HelloShop.IdentityService/Infrastructure/Migrations/IdentityServiceDbContextModelSnapshot.cs @@ -17,7 +17,7 @@ namespace HelloShop.IdentityService.Infrastructure.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.10") + .HasAnnotation("ProductVersion", "9.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); diff --git a/src/HelloShop.IdentityService/Program.cs b/src/HelloShop.IdentityService/Program.cs index dca06e9..b74140d 100644 --- a/src/HelloShop.IdentityService/Program.cs +++ b/src/HelloShop.IdentityService/Program.cs @@ -6,6 +6,8 @@ using HelloShop.IdentityService.Authorization; using HelloShop.IdentityService.Constants; using HelloShop.IdentityService.Entities; using HelloShop.IdentityService.Infrastructure; +using HelloShop.IdentityService.Services; +using HelloShop.IdentityService.Workers; using HelloShop.ServiceDefaults.Authorization; using HelloShop.ServiceDefaults.Extensions; using Microsoft.AspNetCore.Authentication.JwtBearer; @@ -28,6 +30,8 @@ builder.AddNpgsqlDbContext(connectionName: DbConstants options.UseSnakeCaseNamingConvention(); }); +builder.Services.AddSingleton>().AddHostedService(); + builder.Services.AddIdentity(options => { options.Password.RequireDigit = false; @@ -57,7 +61,6 @@ builder.Services.AddAuthentication(options => options.SecurityAlgorithm = SecurityAlgorithms.HmacSha256; }); -builder.Services.AddDataSeedingProviders(); builder.Services.AddOpenApi(); builder.Services.AddPermissionDefinitions(); builder.Services.AddAuthorization().AddDistributedMemoryCache().AddHttpClient().AddHttpContextAccessor().AddTransient().AddCustomAuthorization(); @@ -75,9 +78,10 @@ app.UseCors(options => options.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader( app.MapControllers(); -app.UseDataSeedingProviders(); app.UseOpenApi(); app.MapGroup("api/Permissions").MapPermissionDefinitions("Permissions"); app.UseCustomLocalization(); -app.Run(); +await app.Services.GetRequiredService>().ExecuteAsync(); + +await app.RunAsync(); diff --git a/src/HelloShop.IdentityService/Services/MigrationService.cs b/src/HelloShop.IdentityService/Services/MigrationService.cs new file mode 100644 index 0000000..0498c70 --- /dev/null +++ b/src/HelloShop.IdentityService/Services/MigrationService.cs @@ -0,0 +1,49 @@ +// Copyright (c) HelloShop Corporation. All rights reserved. +// See the license file in the project root for more information. + +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage; +using System.Diagnostics; + +namespace HelloShop.IdentityService.Services +{ + public class MigrationService(IServiceScopeFactory scopeFactory) where TDbContext : DbContext + { + public const string ActivitySourceName = "Migrations"; + private static readonly ActivitySource s_activitySource = new(ActivitySourceName); + + public async ValueTask ExecuteAsync(CancellationToken cancellationToken = default) + { + using var activity = s_activitySource.StartActivity("Migrating database", ActivityKind.Client); + + try + { + using var scope = scopeFactory.CreateScope(); + var dbContext = scope.ServiceProvider.GetRequiredService(); + await RunMigrationAsync(dbContext, cancellationToken); + } + catch (Exception ex) + { + activity?.AddException(ex); + } + } + + private static async ValueTask RunMigrationAsync(TDbContext dbContext, CancellationToken cancellationToken) + { + var strategy = dbContext.Database.CreateExecutionStrategy(); + var dbCreator = dbContext.GetService(); + var historyRepository = dbContext.GetService(); + await strategy.ExecuteAsync(async () => + { + if (!await dbCreator.ExistsAsync(cancellationToken)) + { + await dbCreator.CreateAsync(cancellationToken); + } + await historyRepository.CreateIfNotExistsAsync(); + await dbContext.Database.MigrateAsync(cancellationToken); + }); + } + } +} diff --git a/src/HelloShop.IdentityService/Workers/DataSeeder.cs b/src/HelloShop.IdentityService/Workers/DataSeeder.cs new file mode 100644 index 0000000..ba25046 --- /dev/null +++ b/src/HelloShop.IdentityService/Workers/DataSeeder.cs @@ -0,0 +1,89 @@ +// Copyright (c) HelloShop Corporation. All rights reserved. +// See the license file in the project root for more information. + + +using HelloShop.IdentityService.Entities; +using HelloShop.IdentityService.Infrastructure; +using Microsoft.AspNetCore.Identity; +using Microsoft.EntityFrameworkCore; + +namespace HelloShop.IdentityService.Workers +{ + public class DataSeeder(IServiceScopeFactory scopeFactory) : BackgroundService + { + protected override async Task ExecuteAsync(CancellationToken stoppingToken) + { + using var scope = scopeFactory.CreateScope(); + + var dbContext = scope.ServiceProvider.GetRequiredService(); + var roleManager = scope.ServiceProvider.GetRequiredService>(); + var userManager = scope.ServiceProvider.GetRequiredService>(); + TimeProvider timeProvider = scope.ServiceProvider.GetRequiredService(); + + await dbContext.Database.CreateExecutionStrategy().ExecuteAsync(async () => + { + await using var transaction = await dbContext.Database.BeginTransactionAsync(stoppingToken); + + var adminRole = await roleManager.Roles.SingleOrDefaultAsync(x => x.Name == "AdminRole", stoppingToken); + + if (adminRole == null) + { + adminRole = new Role { Name = "AdminRole", CreationTime = timeProvider.GetUtcNow() }; + await roleManager.CreateAsync(adminRole); + } + + var guestRole = await roleManager.Roles.SingleOrDefaultAsync(x => x.Name == "GuestRole", stoppingToken); + + if (guestRole == null) + { + guestRole = new Role { Name = "GuestRole", CreationTime = timeProvider.GetUtcNow() }; + await roleManager.CreateAsync(guestRole); + } + + var adminUser = await userManager.FindByNameAsync("admin"); + + if (adminUser == null) + { + adminUser = new User + { + UserName = "admin", + Email = "admin@test.com", + CreationTime = timeProvider.GetUtcNow() + }; + await userManager.CreateAsync(adminUser, adminUser.UserName); + } + + await userManager.AddToRolesAsync(adminUser, ["AdminRole", "GuestRole"]); + + var guestUser = await userManager.FindByNameAsync("guest"); + + if (guestUser == null) + { + guestUser = new User + { + UserName = "guest", + Email = "guest@test.com", + CreationTime = timeProvider.GetUtcNow() + }; + await userManager.CreateAsync(guestUser, guestUser.UserName); + } + + await userManager.AddToRoleAsync(guestUser, "GuestRole"); + + if (!await dbContext.Set().AnyAsync(cancellationToken: stoppingToken)) + { + dbContext.AddRange( + new PermissionGranted { PermissionName = "Catalog.Products", RoleId = 1 }, + new PermissionGranted { PermissionName = "Catalog.Products.Create", RoleId = 1 }, + new PermissionGranted { PermissionName = "Catalog.Products.Update", RoleId = 1 }, + new PermissionGranted { PermissionName = "Catalog.Products.Delete", RoleId = 1 }, + new PermissionGranted { PermissionName = "Catalog.Products.Details", RoleId = 1 } + ); + await dbContext.SaveChangesAsync(stoppingToken); + } + + await transaction.CommitAsync(stoppingToken); + }); + } + } +} diff --git a/src/HelloShop.OrderingService/DataSeeding/OrderingDataSeedingProvider.cs b/src/HelloShop.OrderingService/DataSeeding/OrderingDataSeedingProvider.cs deleted file mode 100644 index 569b1b0..0000000 --- a/src/HelloShop.OrderingService/DataSeeding/OrderingDataSeedingProvider.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) HelloShop Corporation. All rights reserved. -// See the license file in the project root for more information. - -using HelloShop.OrderingService.Infrastructure; -using HelloShop.ServiceDefaults.Infrastructure; - -namespace HelloShop.OrderingService.DataSeeding -{ - public class OrderingDataSeedingProvider(OrderingServiceDbContext dbContext) : IDataSeedingProvider - { - public async Task SeedingAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken = default) - { - await dbContext.Database.EnsureCreatedAsync(cancellationToken); - } - } -} diff --git a/src/HelloShop.OrderingService/Extensions/Extensions.cs b/src/HelloShop.OrderingService/Extensions/Extensions.cs index 8d96300..f81a088 100644 --- a/src/HelloShop.OrderingService/Extensions/Extensions.cs +++ b/src/HelloShop.OrderingService/Extensions/Extensions.cs @@ -33,14 +33,14 @@ namespace HelloShop.OrderingService.Extensions builder.Services.AddHttpContextAccessor(); - builder.Services.AddDataSeedingProviders(); - builder.AddNpgsqlDbContext(connectionName: DbConstants.MasterConnectionStringName, configureDbContextOptions: options => { new NpgsqlDbContextOptionsBuilder(options).MigrationsHistoryTable(DbConstants.MigrationsHistoryTableName); options.UseSnakeCaseNamingConvention(); }); + builder.Services.AddSingleton>().AddHostedService(); + builder.Services.AddScoped(); builder.Services.AddMediatR(options => @@ -78,7 +78,6 @@ namespace HelloShop.OrderingService.Extensions { app.UseCors(options => options.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader()); app.UseOpenApi(); - app.UseDataSeedingProviders(); app.MapDaprEventBus(); return app; diff --git a/src/HelloShop.OrderingService/Infrastructure/Migrations/20241123020913_InitialCreate.Designer.cs b/src/HelloShop.OrderingService/Infrastructure/Migrations/20250325131032_InitialCreate.Designer.cs similarity index 99% rename from src/HelloShop.OrderingService/Infrastructure/Migrations/20241123020913_InitialCreate.Designer.cs rename to src/HelloShop.OrderingService/Infrastructure/Migrations/20250325131032_InitialCreate.Designer.cs index 9b1f81c..c3949f3 100644 --- a/src/HelloShop.OrderingService/Infrastructure/Migrations/20241123020913_InitialCreate.Designer.cs +++ b/src/HelloShop.OrderingService/Infrastructure/Migrations/20250325131032_InitialCreate.Designer.cs @@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace HelloShop.OrderingService.Infrastructure.Migrations { [DbContext(typeof(OrderingServiceDbContext))] - [Migration("20241123020913_InitialCreate")] + [Migration("20250325131032_InitialCreate")] partial class InitialCreate { /// @@ -20,7 +20,7 @@ namespace HelloShop.OrderingService.Infrastructure.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.10") + .HasAnnotation("ProductVersion", "9.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); diff --git a/src/HelloShop.OrderingService/Infrastructure/Migrations/20241123020913_InitialCreate.cs b/src/HelloShop.OrderingService/Infrastructure/Migrations/20250325131032_InitialCreate.cs similarity index 100% rename from src/HelloShop.OrderingService/Infrastructure/Migrations/20241123020913_InitialCreate.cs rename to src/HelloShop.OrderingService/Infrastructure/Migrations/20250325131032_InitialCreate.cs diff --git a/src/HelloShop.OrderingService/Infrastructure/Migrations/OrderingServiceDbContextModelSnapshot.cs b/src/HelloShop.OrderingService/Infrastructure/Migrations/OrderingServiceDbContextModelSnapshot.cs index c3721e3..ac2a830 100644 --- a/src/HelloShop.OrderingService/Infrastructure/Migrations/OrderingServiceDbContextModelSnapshot.cs +++ b/src/HelloShop.OrderingService/Infrastructure/Migrations/OrderingServiceDbContextModelSnapshot.cs @@ -17,7 +17,7 @@ namespace HelloShop.OrderingService.Infrastructure.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.10") + .HasAnnotation("ProductVersion", "9.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); diff --git a/src/HelloShop.OrderingService/Program.cs b/src/HelloShop.OrderingService/Program.cs index 7c4ae8a..a24156d 100644 --- a/src/HelloShop.OrderingService/Program.cs +++ b/src/HelloShop.OrderingService/Program.cs @@ -2,6 +2,8 @@ // See the license file in the project root for more information. using HelloShop.OrderingService.Extensions; +using HelloShop.OrderingService.Infrastructure; +using HelloShop.OrderingService.Services; var builder = WebApplication.CreateBuilder(args); @@ -19,4 +21,6 @@ app.MapApplicationEndpoints(); app.MapControllers(); -app.Run(); +await app.Services.GetRequiredService>().ExecuteAsync(); + +await app.RunAsync(); diff --git a/src/HelloShop.OrderingService/Services/MigrationService.cs b/src/HelloShop.OrderingService/Services/MigrationService.cs new file mode 100644 index 0000000..57ccafc --- /dev/null +++ b/src/HelloShop.OrderingService/Services/MigrationService.cs @@ -0,0 +1,49 @@ +// Copyright (c) HelloShop Corporation. All rights reserved. +// See the license file in the project root for more information. + +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage; +using System.Diagnostics; + +namespace HelloShop.OrderingService.Services +{ + public class MigrationService(IServiceScopeFactory scopeFactory) where TDbContext : DbContext + { + public const string ActivitySourceName = "Migrations"; + private static readonly ActivitySource s_activitySource = new(ActivitySourceName); + + public async ValueTask ExecuteAsync(CancellationToken cancellationToken = default) + { + using var activity = s_activitySource.StartActivity("Migrating database", ActivityKind.Client); + + try + { + using var scope = scopeFactory.CreateScope(); + var dbContext = scope.ServiceProvider.GetRequiredService(); + await RunMigrationAsync(dbContext, cancellationToken); + } + catch (Exception ex) + { + activity?.AddException(ex); + } + } + + private static async ValueTask RunMigrationAsync(TDbContext dbContext, CancellationToken cancellationToken) + { + var strategy = dbContext.Database.CreateExecutionStrategy(); + var dbCreator = dbContext.GetService(); + var historyRepository = dbContext.GetService(); + await strategy.ExecuteAsync(async () => + { + if (!await dbCreator.ExistsAsync(cancellationToken)) + { + await dbCreator.CreateAsync(cancellationToken); + } + await historyRepository.CreateIfNotExistsAsync(); + await dbContext.Database.MigrateAsync(cancellationToken); + }); + } + } +} diff --git a/src/HelloShop.OrderingService/Workers/DataSeeder.cs b/src/HelloShop.OrderingService/Workers/DataSeeder.cs new file mode 100644 index 0000000..fc11601 --- /dev/null +++ b/src/HelloShop.OrderingService/Workers/DataSeeder.cs @@ -0,0 +1,14 @@ +// Copyright (c) HelloShop Corporation. All rights reserved. +// See the license file in the project root for more information. + + +namespace HelloShop.OrderingService.Workers +{ + public class DataSeeder : BackgroundService + { + protected override async Task ExecuteAsync(CancellationToken stoppingToken) + { + await Task.CompletedTask; + } + } +} diff --git a/src/HelloShop.ProductService/DataSeeding/ProductDataSeedingProvider.cs b/src/HelloShop.ProductService/DataSeeding/ProductDataSeedingProvider.cs deleted file mode 100644 index 8fa617a..0000000 --- a/src/HelloShop.ProductService/DataSeeding/ProductDataSeedingProvider.cs +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) HelloShop Corporation. All rights reserved. -// See the license file in the project root for more information. - -using HelloShop.ProductService.Entities.Products; -using HelloShop.ProductService.Infrastructure; -using HelloShop.ServiceDefaults.Infrastructure; -using Microsoft.EntityFrameworkCore; -using System.Text.Json; - -namespace HelloShop.ProductService.DataSeeding -{ - public class ProductDataSeedingProvider(ProductServiceDbContext dbContext, IWebHostEnvironment env, ILogger logger) : IDataSeedingProvider - { - public record CatalogSourceEntry(int Id, string Name, string Type, string Brand, string Description, decimal Price); - - public async Task SeedingAsync(IServiceProvider ServiceProvider, CancellationToken cancellationToken = default) - { - await dbContext.Database.EnsureCreatedAsync(cancellationToken); - - if (!dbContext.Set().Any()) - { - string sourcePath = Path.Combine(env.ContentRootPath, "DataSeeding", "SetupCatalogSamples.json"); - string sourceJson = await File.ReadAllTextAsync(sourcePath, cancellationToken); - var catalogItems = JsonSerializer.Deserialize>(sourceJson); - - if (catalogItems != null && catalogItems.Any()) - { - dbContext.RemoveRange(dbContext.Set()); - - await dbContext.Set().AddRangeAsync(catalogItems.DistinctBy(x => x.Type).Select(x => new Brand { Name = x.Type }), cancellationToken); - - await dbContext.SaveChangesAsync(cancellationToken); - - var brandIdsByName = await dbContext.Set().ToDictionaryAsync(x => x.Name, x => x.Id, cancellationToken: cancellationToken); - - logger.LogInformation("Seeded catalog with {NumBrands} brands", brandIdsByName.Count); - - await dbContext.Set().AddRangeAsync(catalogItems.Select(x => new Product - { - Id = x.Id, - Name = x.Name, - Description = x.Description, - Price = x.Price, - BrandId = brandIdsByName[x.Type], - ImageUrl = $"https://oss.xcode.me/notes/helloshop/products/{x.Id}.webp", - AvailableStock = 100 - }), cancellationToken); - - int result = await dbContext.SaveChangesAsync(cancellationToken); - - logger.LogInformation("Seeded catalog with {NumItems} items", result); - } - } - } - } -} \ No newline at end of file diff --git a/src/HelloShop.ProductService/Infrastructure/Migrations/20241123020927_InitialCreate.Designer.cs b/src/HelloShop.ProductService/Infrastructure/Migrations/20250325131047_InitialCreate.Designer.cs similarity index 97% rename from src/HelloShop.ProductService/Infrastructure/Migrations/20241123020927_InitialCreate.Designer.cs rename to src/HelloShop.ProductService/Infrastructure/Migrations/20250325131047_InitialCreate.Designer.cs index 2ad9426..56b12a7 100644 --- a/src/HelloShop.ProductService/Infrastructure/Migrations/20241123020927_InitialCreate.Designer.cs +++ b/src/HelloShop.ProductService/Infrastructure/Migrations/20250325131047_InitialCreate.Designer.cs @@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace HelloShop.ProductService.Infrastructure.Migrations { [DbContext(typeof(ProductServiceDbContext))] - [Migration("20241123020927_InitialCreate")] + [Migration("20250325131047_InitialCreate")] partial class InitialCreate { /// @@ -20,7 +20,7 @@ namespace HelloShop.ProductService.Infrastructure.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.10") + .HasAnnotation("ProductVersion", "9.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); diff --git a/src/HelloShop.ProductService/Infrastructure/Migrations/20241123020927_InitialCreate.cs b/src/HelloShop.ProductService/Infrastructure/Migrations/20250325131047_InitialCreate.cs similarity index 100% rename from src/HelloShop.ProductService/Infrastructure/Migrations/20241123020927_InitialCreate.cs rename to src/HelloShop.ProductService/Infrastructure/Migrations/20250325131047_InitialCreate.cs diff --git a/src/HelloShop.ProductService/Infrastructure/Migrations/ProductServiceDbContextModelSnapshot.cs b/src/HelloShop.ProductService/Infrastructure/Migrations/ProductServiceDbContextModelSnapshot.cs index 3ce966b..a7aae9b 100644 --- a/src/HelloShop.ProductService/Infrastructure/Migrations/ProductServiceDbContextModelSnapshot.cs +++ b/src/HelloShop.ProductService/Infrastructure/Migrations/ProductServiceDbContextModelSnapshot.cs @@ -17,7 +17,7 @@ namespace HelloShop.ProductService.Infrastructure.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.10") + .HasAnnotation("ProductVersion", "9.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); diff --git a/src/HelloShop.ProductService/Program.cs b/src/HelloShop.ProductService/Program.cs index 61b8c36..2792c3f 100644 --- a/src/HelloShop.ProductService/Program.cs +++ b/src/HelloShop.ProductService/Program.cs @@ -6,6 +6,8 @@ using HelloShop.EventBus.Abstractions; using HelloShop.EventBus.Dapr; using HelloShop.ProductService.Constants; using HelloShop.ProductService.Infrastructure; +using HelloShop.ProductService.Services; +using HelloShop.ProductService.Workers; using HelloShop.ServiceDefaults.Extensions; using Microsoft.EntityFrameworkCore; using Microsoft.IdentityModel.Tokens; @@ -35,8 +37,8 @@ builder.AddNpgsqlDbContext(connectionName: DbConstants. new NpgsqlDbContextOptionsBuilder(options).MigrationsHistoryTable(DbConstants.MigrationsHistoryTableName); options.UseSnakeCaseNamingConvention(); }); +builder.Services.AddSingleton>().AddHostedService(); builder.Services.AddHttpClient().AddHttpContextAccessor().AddDistributedMemoryCache(); -builder.Services.AddDataSeedingProviders(); builder.Services.AddCustomLocalization(); builder.Services.AddOpenApi(); builder.Services.AddModelMapper().AddModelValidator(); @@ -58,14 +60,15 @@ app.UseCors(options => options.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader( app.MapControllers(); // Configure extensions request pipeline. -app.UseDataSeedingProviders(); app.UseCustomLocalization(); app.UseOpenApi(); app.MapGroup("api/Permissions").MapPermissionDefinitions("Permissions"); app.MapDaprEventBus(); // End configure extensions request pipeline. -app.Run(); +await app.Services.GetRequiredService>().ExecuteAsync(); + +await app.RunAsync(); /// /// The test project requires a public Program type. diff --git a/src/HelloShop.ProductService/Services/MigrationService.cs b/src/HelloShop.ProductService/Services/MigrationService.cs new file mode 100644 index 0000000..32adcb1 --- /dev/null +++ b/src/HelloShop.ProductService/Services/MigrationService.cs @@ -0,0 +1,49 @@ +// Copyright (c) HelloShop Corporation. All rights reserved. +// See the license file in the project root for more information. + +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage; +using System.Diagnostics; + +namespace HelloShop.ProductService.Services +{ + public class MigrationService(IServiceScopeFactory scopeFactory) where TDbContext : DbContext + { + public const string ActivitySourceName = "Migrations"; + private static readonly ActivitySource s_activitySource = new(ActivitySourceName); + + public async ValueTask ExecuteAsync(CancellationToken cancellationToken = default) + { + using var activity = s_activitySource.StartActivity("Migrating database", ActivityKind.Client); + + try + { + using var scope = scopeFactory.CreateScope(); + var dbContext = scope.ServiceProvider.GetRequiredService(); + await RunMigrationAsync(dbContext, cancellationToken); + } + catch (Exception ex) + { + activity?.AddException(ex); + } + } + + private static async ValueTask RunMigrationAsync(TDbContext dbContext, CancellationToken cancellationToken) + { + var strategy = dbContext.Database.CreateExecutionStrategy(); + var dbCreator = dbContext.GetService(); + var historyRepository = dbContext.GetService(); + await strategy.ExecuteAsync(async () => + { + if (!await dbCreator.ExistsAsync(cancellationToken)) + { + await dbCreator.CreateAsync(cancellationToken); + } + await historyRepository.CreateIfNotExistsAsync(); + await dbContext.Database.MigrateAsync(cancellationToken); + }); + } + } +} diff --git a/src/HelloShop.ProductService/Workers/DataSeeder.cs b/src/HelloShop.ProductService/Workers/DataSeeder.cs new file mode 100644 index 0000000..19392e4 --- /dev/null +++ b/src/HelloShop.ProductService/Workers/DataSeeder.cs @@ -0,0 +1,65 @@ +// Copyright (c) HelloShop Corporation. All rights reserved. +// See the license file in the project root for more information. + +using HelloShop.ProductService.Entities.Products; +using HelloShop.ProductService.Infrastructure; +using Microsoft.EntityFrameworkCore; +using System.Text.Json; + +namespace HelloShop.ProductService.Workers +{ + public class DataSeeder(IServiceScopeFactory scopeFactory) : BackgroundService + { + protected override async Task ExecuteAsync(CancellationToken stoppingToken) + { + using var scope = scopeFactory.CreateScope(); + + var dbContext = scope.ServiceProvider.GetRequiredService(); + var strategy = dbContext.Database.CreateExecutionStrategy(); + var env = scope.ServiceProvider.GetRequiredService(); + var timeProvider = scope.ServiceProvider.GetRequiredService(); + var logger = scope.ServiceProvider.GetRequiredService>(); + + await strategy.ExecuteAsync(async () => + { + await using var transaction = await dbContext.Database.BeginTransactionAsync(stoppingToken); + + if (!dbContext.Set().Any()) + { + string sourcePath = Path.Combine(env.ContentRootPath, "Workers", "SetupCatalogSamples.json"); + using var stream = new FileStream(sourcePath, FileMode.Open, FileAccess.Read, FileShare.Read, bufferSize: 4096, useAsync: true); + var catalogItems = await JsonSerializer.DeserializeAsync>(stream, cancellationToken: stoppingToken); + + if (catalogItems != null && catalogItems.Any()) + { + dbContext.RemoveRange(dbContext.Set()); + await dbContext.Set().AddRangeAsync(catalogItems.DistinctBy(x => x.Type).Select(x => new Brand { Name = x.Type }), stoppingToken); + await dbContext.SaveChangesAsync(stoppingToken); + var brandIdsByName = await dbContext.Set().ToDictionaryAsync(x => x.Name, x => x.Id, cancellationToken: stoppingToken); + + logger.LogInformation("Seeded catalog with {NumBrands} brands.", brandIdsByName.Count); + + await dbContext.Set().AddRangeAsync(catalogItems.Select(x => new Product + { + Id = x.Id, + Name = x.Name, + Description = x.Description, + Price = x.Price, + BrandId = brandIdsByName[x.Type], + ImageUrl = $"https://oss.xcode.me/notes/helloshop/products/{x.Id}.webp", + AvailableStock = 100, + CreationTime = timeProvider.GetUtcNow() + }), stoppingToken); + int result = await dbContext.SaveChangesAsync(stoppingToken); + + logger.LogInformation("Seeded catalog with {NumItems} items.", result); + } + } + + await transaction.CommitAsync(stoppingToken); + }); + } + + private record CatalogSourceEntry(int Id, string Name, string Type, string Brand, string Description, decimal Price); + } +} diff --git a/src/HelloShop.ProductService/DataSeeding/SetupCatalogSamples.json b/src/HelloShop.ProductService/Workers/SetupCatalogSamples.json similarity index 100% rename from src/HelloShop.ProductService/DataSeeding/SetupCatalogSamples.json rename to src/HelloShop.ProductService/Workers/SetupCatalogSamples.json diff --git a/src/HelloShop.ServiceDefaults/Extensions/DataSeedingExtensions.cs b/src/HelloShop.ServiceDefaults/Extensions/DataSeedingExtensions.cs deleted file mode 100644 index cd97ed1..0000000 --- a/src/HelloShop.ServiceDefaults/Extensions/DataSeedingExtensions.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) HelloShop Corporation. All rights reserved. -// See the license file in the project root for more information. - -using HelloShop.ServiceDefaults.Infrastructure; -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using System.Reflection; - -namespace HelloShop.ServiceDefaults.Extensions -{ - public static class DataSeedingExtensions - { - public static IServiceCollection AddDataSeedingProviders(this IServiceCollection services, Assembly? assembly = null) - { - assembly ??= Assembly.GetCallingAssembly(); - - var dataSeedProviders = assembly.ExportedTypes.Where(t => t.IsAssignableTo(typeof(IDataSeedingProvider)) && t.IsClass); - - dataSeedProviders.ToList().ForEach(t => services.AddTransient(typeof(IDataSeedingProvider), t)); - - return services; - } - - public static IApplicationBuilder UseDataSeedingProviders(this IApplicationBuilder app) - { - using var serviceScope = app.ApplicationServices.CreateScope(); - - var dataSeedingProviders = serviceScope.ServiceProvider.GetServices().OrderBy(x => x.Order); - - foreach (var dataSeedingProvider in dataSeedingProviders) - { - dataSeedingProvider.SeedingAsync(serviceScope.ServiceProvider).Wait(); - } - - return app; - } - } -} diff --git a/src/HelloShop.ServiceDefaults/Infrastructure/IDataSeedingProvider.cs b/src/HelloShop.ServiceDefaults/Infrastructure/IDataSeedingProvider.cs deleted file mode 100644 index 72fe0bc..0000000 --- a/src/HelloShop.ServiceDefaults/Infrastructure/IDataSeedingProvider.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) HelloShop Corporation. All rights reserved. -// See the license file in the project root for more information. - -namespace HelloShop.ServiceDefaults.Infrastructure -{ - public interface IDataSeedingProvider - { - int Order => default; - - Task SeedingAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken = default); - } -}