From a6167b3a478a5ffc3831f2f7207f181aee71f52f Mon Sep 17 00:00:00 2001 From: Pc Date: Fri, 12 May 2023 23:16:03 +0330 Subject: [PATCH] refactor: Refactor db-context base --- src/BuildingBlocks/EFCore/AppDbContextBase.cs | 39 ------------------- src/BuildingBlocks/EFCore/IDbContext.cs | 3 -- .../Flight/Features/CreateFlightTests.cs | 2 - .../src/Identity/Data/IdentityContext.cs | 39 ------------------- 4 files changed, 83 deletions(-) diff --git a/src/BuildingBlocks/EFCore/AppDbContextBase.cs b/src/BuildingBlocks/EFCore/AppDbContextBase.cs index eb9d69c..4a2684c 100644 --- a/src/BuildingBlocks/EFCore/AppDbContextBase.cs +++ b/src/BuildingBlocks/EFCore/AppDbContextBase.cs @@ -24,45 +24,6 @@ public abstract class AppDbContextBase : DbContext, IDbContext { } - public async Task BeginTransactionalAsync(CancellationToken cancellationToken = default) - { - _currentTransaction ??= await Database.BeginTransactionAsync(IsolationLevel.ReadCommitted, cancellationToken); - } - - //ref: https://learn.microsoft.com/en-us/ef/core/miscellaneous/connection-resiliency#execution-strategies-and-transactions - public async Task CommitTransactionalAsync(CancellationToken cancellationToken = default) - { - try - { - await SaveChangesAsync(cancellationToken); - await _currentTransaction?.CommitAsync(cancellationToken)!; - } - catch - { - await _currentTransaction?.RollbackAsync(cancellationToken)!; - throw; - } - finally - { - _currentTransaction?.Dispose(); - _currentTransaction = null; - } - } - - - public async Task RollbackTransactionAsync(CancellationToken cancellationToken = default) - { - try - { - await _currentTransaction?.RollbackAsync(cancellationToken)!; - } - finally - { - _currentTransaction?.Dispose(); - _currentTransaction = null; - } - } - //ref: https://learn.microsoft.com/en-us/ef/core/miscellaneous/connection-resiliency#execution-strategies-and-transactions public Task ExecuteTransactionalAsync(CancellationToken cancellationToken = default) { diff --git a/src/BuildingBlocks/EFCore/IDbContext.cs b/src/BuildingBlocks/EFCore/IDbContext.cs index b9afe22..48ac238 100644 --- a/src/BuildingBlocks/EFCore/IDbContext.cs +++ b/src/BuildingBlocks/EFCore/IDbContext.cs @@ -7,9 +7,6 @@ public interface IDbContext { DbSet Set() where TEntity : class; IReadOnlyList GetDomainEvents(); - public Task BeginTransactionalAsync(CancellationToken cancellationToken = default); - public Task CommitTransactionalAsync(CancellationToken cancellationToken = default); - public Task RollbackTransactionAsync(CancellationToken cancellationToken = default); Task ExecuteTransactionalAsync(CancellationToken cancellationToken = default); Task SaveChangesAsync(CancellationToken cancellationToken = default); } diff --git a/src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs b/src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs index 0d454e9..ddac881 100644 --- a/src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs +++ b/src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs @@ -9,8 +9,6 @@ using Xunit; namespace Integration.Test.Flight.Features; -using global::Flight.Flights.Features.CreatingFlight.V1; - public class CreateFlightTests : FlightIntegrationTestBase { public CreateFlightTests( diff --git a/src/Services/Identity/src/Identity/Data/IdentityContext.cs b/src/Services/Identity/src/Identity/Data/IdentityContext.cs index 6178a4e..ff67c9a 100644 --- a/src/Services/Identity/src/Identity/Data/IdentityContext.cs +++ b/src/Services/Identity/src/Identity/Data/IdentityContext.cs @@ -34,45 +34,6 @@ public sealed class IdentityContext : IdentityDbContext