From b4ac28aed5010201ad2501ec7e943d73e54ef3d8 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Mon, 16 Sep 2024 11:09:25 +0000 Subject: [PATCH 1/2] Restyled by astyle --- .../UnitOfWork/GenericUnitOfWorkInfo.cs | 8 +- src/mix.heart/UnitOfWork/UnitOfWorkInfo.cs | 154 +++++++++--------- 2 files changed, 84 insertions(+), 78 deletions(-) diff --git a/src/mix.heart/UnitOfWork/GenericUnitOfWorkInfo.cs b/src/mix.heart/UnitOfWork/GenericUnitOfWorkInfo.cs index 4bd34f9..bca2a30 100644 --- a/src/mix.heart/UnitOfWork/GenericUnitOfWorkInfo.cs +++ b/src/mix.heart/UnitOfWork/GenericUnitOfWorkInfo.cs @@ -2,8 +2,8 @@ namespace Mix.Heart.UnitOfWork { - public class UnitOfWorkInfo(T dbContext) : UnitOfWorkInfo(dbContext) where T : DbContext - { - public T DbContext => (T)ActiveDbContext; - } +public class UnitOfWorkInfo(T dbContext) : UnitOfWorkInfo(dbContext) where T : DbContext +{ + public T DbContext => (T)ActiveDbContext; +} } diff --git a/src/mix.heart/UnitOfWork/UnitOfWorkInfo.cs b/src/mix.heart/UnitOfWork/UnitOfWorkInfo.cs index 8b60061..8d3d380 100644 --- a/src/mix.heart/UnitOfWork/UnitOfWorkInfo.cs +++ b/src/mix.heart/UnitOfWork/UnitOfWorkInfo.cs @@ -6,110 +6,116 @@ namespace Mix.Heart.UnitOfWork { - public class UnitOfWorkInfo(DbContext dbContext) : IUnitOfWorkInfo - { - public DbContext ActiveDbContext { get; private set; } = dbContext; - - public IDbContextTransaction ActiveTransaction { get; private set; } +public class UnitOfWorkInfo(DbContext dbContext) : IUnitOfWorkInfo +{ + public DbContext ActiveDbContext { + get; + private set; + } = dbContext; + + public IDbContextTransaction ActiveTransaction { + get; + private set; + } - public void SetDbContext(DbContext dbContext) - { - ActiveDbContext = dbContext; - } + public void SetDbContext(DbContext dbContext) + { + ActiveDbContext = dbContext; + } - public void SetTransaction(IDbContextTransaction dbContextTransaction) - { - ActiveTransaction = dbContextTransaction; - } + public void SetTransaction(IDbContextTransaction dbContextTransaction) + { + ActiveTransaction = dbContextTransaction; + } - public void Begin() + public void Begin() + { + if (ActiveTransaction == null) { - if (ActiveTransaction == null) - { - SetTransaction( - ActiveDbContext.Database.CurrentTransaction - ?? ActiveDbContext.Database.BeginTransaction()); - } + SetTransaction( + ActiveDbContext.Database.CurrentTransaction + ?? ActiveDbContext.Database.BeginTransaction()); } + } - public void Close() - { - ActiveTransaction?.Dispose(); - } + public void Close() + { + ActiveTransaction?.Dispose(); + } - public async Task CloseAsync() + public async Task CloseAsync() + { + if (ActiveTransaction != null) { - if (ActiveTransaction != null) - { - await ActiveTransaction.DisposeAsync(); - } + await ActiveTransaction.DisposeAsync(); } + } - public void Complete() + public void Complete() + { + if (ActiveDbContext != null && ActiveTransaction != null) { - if (ActiveDbContext != null && ActiveTransaction != null) - { - ActiveDbContext.SaveChanges(); - ActiveTransaction.Commit(); + ActiveDbContext.SaveChanges(); + ActiveTransaction.Commit(); - ActiveTransaction.Dispose(); - ActiveDbContext.Dispose(); + ActiveTransaction.Dispose(); + ActiveDbContext.Dispose(); - ActiveTransaction = null; - ActiveDbContext = null; - } + ActiveTransaction = null; + ActiveDbContext = null; } + } - public void Rollback() + public void Rollback() + { + if (ActiveDbContext != null && ActiveTransaction != null) { - if (ActiveDbContext != null && ActiveTransaction != null) - { - ActiveTransaction.Rollback(); + ActiveTransaction.Rollback(); - ActiveTransaction.Dispose(); - ActiveDbContext.Dispose(); + ActiveTransaction.Dispose(); + ActiveDbContext.Dispose(); - ActiveTransaction = null; - ActiveDbContext = null; - } + ActiveTransaction = null; + ActiveDbContext = null; } + } - public async Task CompleteAsync(CancellationToken cancellationToken = default) + public async Task CompleteAsync(CancellationToken cancellationToken = default) + { + if (ActiveDbContext != null && ActiveTransaction != null) { - if (ActiveDbContext != null && ActiveTransaction != null) - { - await ActiveDbContext.SaveChangesAsync(cancellationToken); - await ActiveTransaction.CommitAsync(cancellationToken); + await ActiveDbContext.SaveChangesAsync(cancellationToken); + await ActiveTransaction.CommitAsync(cancellationToken); - await ActiveTransaction.DisposeAsync(); - await ActiveDbContext.DisposeAsync(); + await ActiveTransaction.DisposeAsync(); + await ActiveDbContext.DisposeAsync(); - ActiveTransaction = null; - ActiveDbContext = null; - } + ActiveTransaction = null; + ActiveDbContext = null; } + } - public async Task RollbackAsync(CancellationToken cancellationToken = default) + public async Task RollbackAsync(CancellationToken cancellationToken = default) + { + if (ActiveDbContext != null && ActiveTransaction != null) { - if (ActiveDbContext != null && ActiveTransaction != null) - { - await ActiveTransaction.RollbackAsync(cancellationToken); + await ActiveTransaction.RollbackAsync(cancellationToken); - await ActiveTransaction.DisposeAsync(); - await ActiveDbContext.DisposeAsync(); + await ActiveTransaction.DisposeAsync(); + await ActiveDbContext.DisposeAsync(); - ActiveTransaction = null; - ActiveDbContext = null; - } + ActiveTransaction = null; + ActiveDbContext = null; } + } - public void Dispose() - { - ActiveTransaction?.Dispose(); - ActiveDbContext?.Dispose(); + public void Dispose() + { + ActiveTransaction?.Dispose(); + ActiveDbContext?.Dispose(); - GC.SuppressFinalize(this); - GC.WaitForPendingFinalizers(); - } + GC.SuppressFinalize(this); + GC.WaitForPendingFinalizers(); } } +} From 1189ebf84f448226fe518d8ed5ccf24fdd69e85a Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Mon, 16 Sep 2024 11:09:26 +0000 Subject: [PATCH 2/2] Restyled by clang-format --- .../UnitOfWork/GenericUnitOfWorkInfo.cs | 10 +- src/mix.heart/UnitOfWork/UnitOfWorkInfo.cs | 150 ++++++++---------- 2 files changed, 66 insertions(+), 94 deletions(-) diff --git a/src/mix.heart/UnitOfWork/GenericUnitOfWorkInfo.cs b/src/mix.heart/UnitOfWork/GenericUnitOfWorkInfo.cs index bca2a30..f703c7a 100644 --- a/src/mix.heart/UnitOfWork/GenericUnitOfWorkInfo.cs +++ b/src/mix.heart/UnitOfWork/GenericUnitOfWorkInfo.cs @@ -1,9 +1,7 @@ using Microsoft.EntityFrameworkCore; -namespace Mix.Heart.UnitOfWork -{ -public class UnitOfWorkInfo(T dbContext) : UnitOfWorkInfo(dbContext) where T : DbContext -{ - public T DbContext => (T)ActiveDbContext; -} +namespace Mix.Heart.UnitOfWork { +public class UnitOfWorkInfo(T dbContext) : UnitOfWorkInfo +(dbContext) + where T : DbContext { public T DbContext => (T)ActiveDbContext; } } diff --git a/src/mix.heart/UnitOfWork/UnitOfWorkInfo.cs b/src/mix.heart/UnitOfWork/UnitOfWorkInfo.cs index 8d3d380..a375ba4 100644 --- a/src/mix.heart/UnitOfWork/UnitOfWorkInfo.cs +++ b/src/mix.heart/UnitOfWork/UnitOfWorkInfo.cs @@ -4,118 +4,92 @@ using System.Threading; using System.Threading.Tasks; -namespace Mix.Heart.UnitOfWork -{ -public class UnitOfWorkInfo(DbContext dbContext) : IUnitOfWorkInfo -{ - public DbContext ActiveDbContext { - get; - private set; - } = dbContext; - - public IDbContextTransaction ActiveTransaction { - get; - private set; - } +namespace Mix.Heart.UnitOfWork { +public class UnitOfWorkInfo +(DbContext dbContext) : IUnitOfWorkInfo { + public DbContext ActiveDbContext { get; private set; } = dbContext; - public void SetDbContext(DbContext dbContext) - { - ActiveDbContext = dbContext; - } + public IDbContextTransaction ActiveTransaction { get; private set; } - public void SetTransaction(IDbContextTransaction dbContextTransaction) - { - ActiveTransaction = dbContextTransaction; - } + public void SetDbContext(DbContext dbContext) { ActiveDbContext = dbContext; } - public void Begin() - { - if (ActiveTransaction == null) - { - SetTransaction( - ActiveDbContext.Database.CurrentTransaction - ?? ActiveDbContext.Database.BeginTransaction()); - } - } + public void SetTransaction(IDbContextTransaction dbContextTransaction) { + ActiveTransaction = dbContextTransaction; + } - public void Close() - { - ActiveTransaction?.Dispose(); + public void Begin() { + if (ActiveTransaction == null) { + SetTransaction(ActiveDbContext.Database.CurrentTransaction ?? + ActiveDbContext.Database.BeginTransaction()); } + } + + public void Close() { ActiveTransaction?.Dispose(); } - public async Task CloseAsync() - { - if (ActiveTransaction != null) - { - await ActiveTransaction.DisposeAsync(); - } + public async Task CloseAsync() { + if (ActiveTransaction != null) { + await ActiveTransaction.DisposeAsync(); } + } - public void Complete() - { - if (ActiveDbContext != null && ActiveTransaction != null) - { - ActiveDbContext.SaveChanges(); - ActiveTransaction.Commit(); + public void Complete() { + if (ActiveDbContext != null && ActiveTransaction != null) { + ActiveDbContext.SaveChanges(); + ActiveTransaction.Commit(); - ActiveTransaction.Dispose(); - ActiveDbContext.Dispose(); + ActiveTransaction.Dispose(); + ActiveDbContext.Dispose(); - ActiveTransaction = null; - ActiveDbContext = null; - } + ActiveTransaction = null; + ActiveDbContext = null; } + } - public void Rollback() - { - if (ActiveDbContext != null && ActiveTransaction != null) - { - ActiveTransaction.Rollback(); + public void Rollback() { + if (ActiveDbContext != null && ActiveTransaction != null) { + ActiveTransaction.Rollback(); - ActiveTransaction.Dispose(); - ActiveDbContext.Dispose(); + ActiveTransaction.Dispose(); + ActiveDbContext.Dispose(); - ActiveTransaction = null; - ActiveDbContext = null; - } + ActiveTransaction = null; + ActiveDbContext = null; } + } - public async Task CompleteAsync(CancellationToken cancellationToken = default) - { - if (ActiveDbContext != null && ActiveTransaction != null) - { - await ActiveDbContext.SaveChangesAsync(cancellationToken); - await ActiveTransaction.CommitAsync(cancellationToken); + public async Task CompleteAsync(CancellationToken cancellationToken = + default) { + if (ActiveDbContext != null && ActiveTransaction != null) { + await ActiveDbContext.SaveChangesAsync(cancellationToken); + await ActiveTransaction.CommitAsync(cancellationToken); - await ActiveTransaction.DisposeAsync(); - await ActiveDbContext.DisposeAsync(); + await ActiveTransaction.DisposeAsync(); + await ActiveDbContext.DisposeAsync(); - ActiveTransaction = null; - ActiveDbContext = null; - } + ActiveTransaction = null; + ActiveDbContext = null; } + } - public async Task RollbackAsync(CancellationToken cancellationToken = default) - { - if (ActiveDbContext != null && ActiveTransaction != null) - { - await ActiveTransaction.RollbackAsync(cancellationToken); + public async Task RollbackAsync(CancellationToken cancellationToken = + default) { + if (ActiveDbContext != null && ActiveTransaction != null) { + await ActiveTransaction.RollbackAsync(cancellationToken); - await ActiveTransaction.DisposeAsync(); - await ActiveDbContext.DisposeAsync(); + await ActiveTransaction.DisposeAsync(); + await ActiveDbContext.DisposeAsync(); - ActiveTransaction = null; - ActiveDbContext = null; - } + ActiveTransaction = null; + ActiveDbContext = null; } + } - public void Dispose() - { - ActiveTransaction?.Dispose(); - ActiveDbContext?.Dispose(); + public void Dispose() { + ActiveTransaction?.Dispose(); + ActiveDbContext?.Dispose(); - GC.SuppressFinalize(this); - GC.WaitForPendingFinalizers(); - } + GC.SuppressFinalize(this); + GC.WaitForPendingFinalizers(); + } } }