From 964a0f6d17c3d8796ce987b7600c721e9dc5f49b Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Wed, 1 Dec 2021 18:33:47 +0300 Subject: [PATCH] Updated solution-wide migration checker and handlers --- .../AdministrationServiceDatabaseMigrationChecker.cs | 4 ++-- ...nistrationServiceDatabaseMigrationEventHandler.cs | 4 ++-- .../CatalogServiceHttpApiHostModule.cs | 4 ++-- .../CatalogServiceDatabaseMigrationChecker.cs | 7 +++---- .../CatalogServiceDatabaseMigrationEventHandler.cs | 12 +++++++----- .../EShopOnAbp.CatalogService.HttpApi.Host.csproj | 2 +- .../IdentityServiceDatabaseMigrationChecker.cs | 4 ++-- .../IdentityServiceDatabaseMigrationEventHandler.cs | 4 ++-- .../OrderingServiceDatabaseMigrationChecker.cs | 4 ++-- .../OrderingServiceDatabaseMigrationEventHandler.cs | 4 ++-- .../PaymentServiceDatabaseMigrationChecker.cs | 8 ++------ .../PaymentServiceDatabaseMigrationEventHandler.cs | 4 ++-- 12 files changed, 29 insertions(+), 32 deletions(-) diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationChecker.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationChecker.cs index 09c172d6..c99ac38b 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationChecker.cs +++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationChecker.cs @@ -1,13 +1,13 @@ using EShopOnAbp.AdministrationService.EntityFrameworkCore; -using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations; using System; +using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations.EfCore; using Volo.Abp.EventBus.Distributed; using Volo.Abp.MultiTenancy; using Volo.Abp.Uow; namespace EShopOnAbp.AdministrationService.DbMigrations { - public class AdministrationServiceDatabaseMigrationChecker : PendingMigrationsCheckerBase + public class AdministrationServiceDatabaseMigrationChecker : PendingEfCoreMigrationsChecker { public AdministrationServiceDatabaseMigrationChecker( IUnitOfWorkManager unitOfWorkManager, diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationEventHandler.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationEventHandler.cs index b5f8c7d8..4640dfcf 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationEventHandler.cs +++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationEventHandler.cs @@ -1,8 +1,8 @@ using EShopOnAbp.AdministrationService.EntityFrameworkCore; -using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations; using System; using System.Linq; using System.Threading.Tasks; +using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations.EfCore; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Data; using Volo.Abp.EventBus.Distributed; @@ -13,7 +13,7 @@ using Volo.Abp.Uow; namespace EShopOnAbp.AdministrationService.DbMigrations { public class AdministrationServiceDatabaseMigrationEventHandler - : DatabaseMigrationEventHandlerBase, + : DatabaseEfCoreMigrationEventHandler, IDistributedEventHandler, IDistributedEventHandler { diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/CatalogServiceHttpApiHostModule.cs b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/CatalogServiceHttpApiHostModule.cs index ca4bdc4a..37193d47 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/CatalogServiceHttpApiHostModule.cs +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/CatalogServiceHttpApiHostModule.cs @@ -1,5 +1,4 @@ using EShopOnAbp.CatalogService.DbMigrations; -using EShopOnAbp.CatalogService.EntityFrameworkCore; using EShopOnAbp.Shared.Hosting.AspNetCore; using EShopOnAbp.Shared.Hosting.Microservices; using Microsoft.AspNetCore.Builder; @@ -9,6 +8,7 @@ using Microsoft.Extensions.Hosting; using System; using System.Collections.Generic; using System.Linq; +using EShopOnAbp.CatalogService.MongoDB; using Volo.Abp; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.Modularity; @@ -19,7 +19,7 @@ namespace EShopOnAbp.CatalogService [DependsOn( typeof(CatalogServiceHttpApiModule), typeof(CatalogServiceApplicationModule), - typeof(CatalogServiceEntityFrameworkCoreModule), + typeof(CatalogServiceMongoDbModule), typeof(EShopOnAbpSharedHostingMicroservicesModule) )] public class CatalogServiceHttpApiHostModule : AbpModule diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/DbMigrations/CatalogServiceDatabaseMigrationChecker.cs b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/DbMigrations/CatalogServiceDatabaseMigrationChecker.cs index 5c085c40..1764271e 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/DbMigrations/CatalogServiceDatabaseMigrationChecker.cs +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/DbMigrations/CatalogServiceDatabaseMigrationChecker.cs @@ -1,14 +1,13 @@ -using EShopOnAbp.CatalogService.EntityFrameworkCore; +using System; +using EShopOnAbp.CatalogService.MongoDB; using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations; -using System; -using System.Threading.Tasks; using Volo.Abp.EventBus.Distributed; using Volo.Abp.MultiTenancy; using Volo.Abp.Uow; namespace EShopOnAbp.CatalogService.DbMigrations { - public class CatalogServiceDatabaseMigrationChecker : PendingMigrationsCheckerBase + public class CatalogServiceDatabaseMigrationChecker : PendingMongoDbMigrationsChecker { public CatalogServiceDatabaseMigrationChecker( IUnitOfWorkManager unitOfWorkManager, diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/DbMigrations/CatalogServiceDatabaseMigrationEventHandler.cs b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/DbMigrations/CatalogServiceDatabaseMigrationEventHandler.cs index ee8cda8c..df17f17e 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/DbMigrations/CatalogServiceDatabaseMigrationEventHandler.cs +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/DbMigrations/CatalogServiceDatabaseMigrationEventHandler.cs @@ -1,7 +1,8 @@ -using EShopOnAbp.CatalogService.EntityFrameworkCore; -using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations; +using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations; using System; using System.Threading.Tasks; +using EShopOnAbp.CatalogService.MongoDB; +using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations.MongoDb; using Volo.Abp.Data; using Volo.Abp.EventBus.Distributed; using Volo.Abp.MultiTenancy; @@ -10,20 +11,21 @@ using Volo.Abp.Uow; namespace EShopOnAbp.CatalogService.DbMigrations { public class CatalogServiceDatabaseMigrationEventHandler - : DatabaseMigrationEventHandlerBase, + : DatabaseMongoDbMigrationEventHandler, IDistributedEventHandler { public CatalogServiceDatabaseMigrationEventHandler( ICurrentTenant currentTenant, IUnitOfWorkManager unitOfWorkManager, ITenantStore tenantStore, - IDistributedEventBus distributedEventBus + IDistributedEventBus distributedEventBus, + IServiceProvider serviceProvider ) : base( currentTenant, unitOfWorkManager, tenantStore, distributedEventBus, - CatalogServiceDbProperties.ConnectionStringName) + CatalogServiceDbProperties.ConnectionStringName,serviceProvider) { } diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj index 5024ad55..b7e561d5 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj @@ -11,7 +11,7 @@ - + diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationChecker.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationChecker.cs index f09f9baa..75c16423 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationChecker.cs +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationChecker.cs @@ -1,7 +1,7 @@ using EShopOnAbp.IdentityService.EntityFrameworkCore; -using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations; using System; using System.Threading.Tasks; +using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations.EfCore; using Volo.Abp.EventBus.Distributed; using Volo.Abp.EventBus.Local; using Volo.Abp.MultiTenancy; @@ -9,7 +9,7 @@ using Volo.Abp.Uow; namespace EShopOnAbp.IdentityService.DbMigrations { - public class IdentityServiceDatabaseMigrationChecker : PendingMigrationsCheckerBase + public class IdentityServiceDatabaseMigrationChecker : PendingEfCoreMigrationsChecker { protected ILocalEventBus LocalEventBus { get; } diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationEventHandler.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationEventHandler.cs index f028b895..17d8dd98 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationEventHandler.cs +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationEventHandler.cs @@ -1,9 +1,9 @@ using EShopOnAbp.IdentityService.EntityFrameworkCore; -using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations; using Serilog; using System; using System.Collections.Generic; using System.Threading.Tasks; +using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations.EfCore; using Volo.Abp.Data; using Volo.Abp.EventBus.Distributed; using Volo.Abp.EventBus.Local; @@ -14,7 +14,7 @@ using Volo.Abp.Uow; namespace EShopOnAbp.IdentityService.DbMigrations { public class IdentityServiceDatabaseMigrationEventHandler - : DatabaseMigrationEventHandlerBase, + : DatabaseEfCoreMigrationEventHandler, IDistributedEventHandler, IDistributedEventHandler { diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/DbMigrations/OrderingServiceDatabaseMigrationChecker.cs b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/DbMigrations/OrderingServiceDatabaseMigrationChecker.cs index 3acd7d62..ef8b92b9 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/DbMigrations/OrderingServiceDatabaseMigrationChecker.cs +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/DbMigrations/OrderingServiceDatabaseMigrationChecker.cs @@ -1,13 +1,13 @@ using EShopOnAbp.OrderingService.EntityFrameworkCore; -using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations; using System; +using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations.EfCore; using Volo.Abp.EventBus.Distributed; using Volo.Abp.MultiTenancy; using Volo.Abp.Uow; namespace EShopOnAbp.OrderingService.DbMigrations { - public class OrderingServiceDatabaseMigrationChecker : PendingMigrationsCheckerBase + public class OrderingServiceDatabaseMigrationChecker : PendingEfCoreMigrationsChecker { public OrderingServiceDatabaseMigrationChecker( IUnitOfWorkManager unitOfWorkManager, diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/DbMigrations/OrderingServiceDatabaseMigrationEventHandler.cs b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/DbMigrations/OrderingServiceDatabaseMigrationEventHandler.cs index a6c61851..845ab7d6 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/DbMigrations/OrderingServiceDatabaseMigrationEventHandler.cs +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/DbMigrations/OrderingServiceDatabaseMigrationEventHandler.cs @@ -1,7 +1,7 @@ using EShopOnAbp.OrderingService.EntityFrameworkCore; -using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations; using System; using System.Threading.Tasks; +using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations.EfCore; using Volo.Abp.Data; using Volo.Abp.EventBus.Distributed; using Volo.Abp.MultiTenancy; @@ -10,7 +10,7 @@ using Volo.Abp.Uow; namespace EShopOnAbp.OrderingService.DbMigrations { public class OrderingServiceDatabaseMigrationEventHandler - : DatabaseMigrationEventHandlerBase, + : DatabaseEfCoreMigrationEventHandler, IDistributedEventHandler { public OrderingServiceDatabaseMigrationEventHandler( diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/DbMigrations/PaymentServiceDatabaseMigrationChecker.cs b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/DbMigrations/PaymentServiceDatabaseMigrationChecker.cs index d771e75f..85c2a026 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/DbMigrations/PaymentServiceDatabaseMigrationChecker.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/DbMigrations/PaymentServiceDatabaseMigrationChecker.cs @@ -1,17 +1,13 @@ using EShopOnAbp.PaymentService.EntityFrameworkCore; -using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations.EfCore; using Volo.Abp.EventBus.Distributed; using Volo.Abp.MultiTenancy; using Volo.Abp.Uow; namespace EShopOnAbp.PaymentService.DbMigrations { - public class PaymentServiceDatabaseMigrationChecker : PendingMigrationsCheckerBase + public class PaymentServiceDatabaseMigrationChecker : PendingEfCoreMigrationsChecker { public PaymentServiceDatabaseMigrationChecker( IUnitOfWorkManager unitOfWorkManager, diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/DbMigrations/PaymentServiceDatabaseMigrationEventHandler.cs b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/DbMigrations/PaymentServiceDatabaseMigrationEventHandler.cs index 6b06f8b5..7fd87b4f 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/DbMigrations/PaymentServiceDatabaseMigrationEventHandler.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/DbMigrations/PaymentServiceDatabaseMigrationEventHandler.cs @@ -1,7 +1,7 @@ using EShopOnAbp.PaymentService.EntityFrameworkCore; -using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations; using System; using System.Threading.Tasks; +using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations.EfCore; using Volo.Abp.Data; using Volo.Abp.EventBus.Distributed; using Volo.Abp.MultiTenancy; @@ -10,7 +10,7 @@ using Volo.Abp.Uow; namespace EShopOnAbp.PaymentService.DbMigrations { public class PaymentServiceDatabaseMigrationEventHandler - : DatabaseMigrationEventHandlerBase, + : DatabaseEfCoreMigrationEventHandler, IDistributedEventHandler { public PaymentServiceDatabaseMigrationEventHandler(