Skip to content

Commit

Permalink
Merge pull request #19 from rpaschoal/feature/mongodb-transaction-imp…
Browse files Browse the repository at this point in the history 
…rovements

MongoDB transaction improvements and ambient transaction support
  • Loading branch information
@rpaschoal
rpaschoal authored Aug 1, 2022
2 parents be9f1a8 + 851c2d5 commit ad41519
Show file tree
Hide file tree
Showing 12 changed files with 277 additions and 110 deletions.
14 changes: 5 additions & 9 deletions DynamicRepository.MongoDB/DynamicRepository.MongoDB.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<Version>1.3.4</Version>
<Version>1.3.6</Version>
<Authors>Rafael Carvalho</Authors>
<Description>Dynamic repository with many built-in data access methods for Repository Pattern implementation for .NET projects using EF6, EF Core or MongoDB.</Description>
<PackageProjectUrl>https://github.com/rpaschoal/DynamicRepository</PackageProjectUrl>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DynamicRepository" Version="1.3.5" />
<PackageReference Include="MongoDB.Driver" Version="2.11.1" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.11.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DynamicRepository\DynamicRepository.csproj" />
<PackageReference Include="DynamicRepository" Version="1.3.6" />
<PackageReference Include="MongoDB.Driver" Version="2.17.1" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.17.1" />
</ItemGroup>

</Project>
125 changes: 112 additions & 13 deletions DynamicRepository.MongoDB/MongoDBRepository.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using DynamicRepository.Filter;
using DynamicRepository.MongoDB.Transaction;
using DynamicRepository.Transaction;
using MongoDB.Bson;
using MongoDB.Driver;
Expand All @@ -8,6 +9,7 @@
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using System.Transactions;

namespace DynamicRepository.MongoDB
{
Expand Down Expand Up @@ -57,18 +59,28 @@ namespace DynamicRepository.MongoDB
/// </summary>
protected string CollectionName { get; }


private readonly object _transactionLock = new object();
private MongoDBTransaction _transactionInstance;
private MongoDBTransaction Transaction
{
private MongoDBTransaction Transaction
{
get
{
if (_transactionInstance != null && _transactionInstance.HasBeenDisposed)
lock (_transactionLock)
{
_transactionInstance = null;
}
if (_transactionInstance != null && _transactionInstance.HasBeenDisposed)
{
_transactionInstance = null;
}

return _transactionInstance;
return _transactionInstance;
}
}
set
{
lock (_transactionLock)
{
_transactionInstance = value;
}
}
}

Expand Down Expand Up @@ -144,16 +156,45 @@ protected FilterDefinition<Entity> GetIdFilter(Key id)
return Builders<Entity>.Filter.Eq(_idPropertyName, id);
}

public TransactionScope StartTransactionScope() => new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);

public ITransaction StartTransaction()
{
_transactionInstance = new MongoDBTransaction(_mongoDatabase.Client);
Transaction = new MongoDBTransaction(_mongoDatabase.Client);

return Transaction;
}

public void RegisterTransaction(ITransaction transaction)
{
_transactionInstance = transaction as MongoDBTransaction;
Transaction = transaction as MongoDBTransaction;
}

private void EnlistWithCurrentTransactionScope()
{
if (System.Transactions.Transaction.Current != null)
{
var ambientTransactionId = System.Transactions.Transaction.Current.TransactionInformation.LocalIdentifier;

if (AmbientTransactionRegister.AmbientTransactions.ContainsKey(ambientTransactionId))
{
RegisterTransaction(AmbientTransactionRegister.AmbientTransactions[ambientTransactionId]);
}
else
{
StartTransaction();

AmbientTransactionRegister.AmbientTransactions.TryAdd(ambientTransactionId, Transaction);

System.Transactions.Transaction.Current.TransactionCompleted += (sender, e) => {
AmbientTransactionRegister.AmbientTransactions.TryRemove(ambientTransactionId, out _);
Transaction = null;
};

var enlistment = new MongoDBTransactionScopeEnlistment(Transaction);
System.Transactions.Transaction.Current.EnlistVolatile(enlistment, System.Transactions.EnlistmentOptions.None);
}
}
}

/// <summary>
Expand All @@ -163,7 +204,19 @@ public void RegisterTransaction(ITransaction transaction)
/// <returns>Persisted entity if found, otherwise NULL.</returns>
public Entity Get(Key id)
{
var queriedEntity = Collection.Find(GetIdFilter(id)).FirstOrDefault();
EnlistWithCurrentTransactionScope();

Entity queriedEntity;
if (Transaction != null)
{
queriedEntity = Collection
.Find(Transaction.Session, GetIdFilter(id))
.FirstOrDefault();
}
else
{
queriedEntity = Collection.Find(GetIdFilter(id)).FirstOrDefault();
}

return GlobalFilter != null && queriedEntity != null ? new[] { queriedEntity }.AsQueryable().FirstOrDefault(GlobalFilter) : queriedEntity;
}
Expand All @@ -186,7 +239,21 @@ public Task<Entity> GetAsync(Key id)
/// <returns>Persisted entity if found, otherwise NULL.</returns>
public async Task<Entity> GetAsync(Key id, CancellationToken cancellationToken)
{
var queriedEntity = await (await Collection.FindAsync(GetIdFilter(id), cancellationToken: cancellationToken)).FirstOrDefaultAsync();
EnlistWithCurrentTransactionScope();

Entity queriedEntity;
if (Transaction != null)
{
queriedEntity = await (await Collection.FindAsync(Transaction.Session, GetIdFilter(id), cancellationToken: cancellationToken).ConfigureAwait(false))
.FirstOrDefaultAsync()
.ConfigureAwait(false);
}
else
{
queriedEntity = await (await Collection.FindAsync(GetIdFilter(id), cancellationToken: cancellationToken).ConfigureAwait(false))
.FirstOrDefaultAsync()
.ConfigureAwait(false);
}

return GlobalFilter != null && queriedEntity != null ? new[] { queriedEntity }.AsQueryable().FirstOrDefault(GlobalFilter) : queriedEntity;
}
Expand All @@ -197,6 +264,8 @@ public async Task<Entity> GetAsync(Key id, CancellationToken cancellationToken)
/// <param name="entity">The new <see cref="Entity"/> instance to be persisted.</param>
public void Insert(Entity entity)
{
EnlistWithCurrentTransactionScope();

if (Transaction != null)
{
Collection.InsertOne(Transaction.Session, entity);
Expand All @@ -223,6 +292,8 @@ public Task InsertAsync(Entity entity)
/// <param name="cancellationToken">A token used for cancelling propagation.</param>
public Task InsertAsync(Entity entity, CancellationToken cancellationToken)
{
EnlistWithCurrentTransactionScope();

return Transaction != null ?
Collection.InsertOneAsync(Transaction.Session, entity, null, cancellationToken)
: Collection.InsertOneAsync(entity, null, cancellationToken);
Expand All @@ -234,6 +305,8 @@ public Task InsertAsync(Entity entity, CancellationToken cancellationToken)
/// <param name="entityToUpdate">The <see cref="Entity"/> instance to be updated.</param>
public void Update(Entity entityToUpdate)
{
EnlistWithCurrentTransactionScope();

if (Transaction != null)
{
Collection.ReplaceOne(Transaction.Session, GetIdFilter(entityToUpdate), entityToUpdate);
Expand All @@ -260,6 +333,8 @@ public Task UpdateAsync(Entity entityToUpdate)
/// <param name="cancellationToken">A token used for cancelling propagation.</param>
public Task UpdateAsync(Entity entityToUpdate, CancellationToken cancellationToken)
{
EnlistWithCurrentTransactionScope();

return Transaction != null ?
Collection.ReplaceOneAsync(Transaction.Session, GetIdFilter(entityToUpdate), entityToUpdate, cancellationToken: cancellationToken)
: Collection.ReplaceOneAsync(GetIdFilter(entityToUpdate), entityToUpdate, cancellationToken: cancellationToken);
Expand All @@ -271,6 +346,8 @@ public Task UpdateAsync(Entity entityToUpdate, CancellationToken cancellationTok
/// <param name="id">The primary key of the <see cref="Entity"/> to be deleted.</param>
public void Delete(Key id)
{
EnlistWithCurrentTransactionScope();

if (Transaction != null)
{
Collection.DeleteOne(Transaction.Session, GetIdFilter(id));
Expand All @@ -297,6 +374,8 @@ public Task DeleteAsync(Key id)
/// <param name="cancellationToken">A token used for cancelling propagation.</param>
public Task DeleteAsync(Key id, CancellationToken cancellationToken)
{
EnlistWithCurrentTransactionScope();

return Transaction != null ?
Collection.DeleteOneAsync(Transaction.Session, GetIdFilter(id), null, cancellationToken)
: Collection.DeleteOneAsync(GetIdFilter(id), cancellationToken);
Expand All @@ -308,6 +387,8 @@ public Task DeleteAsync(Key id, CancellationToken cancellationToken)
/// <param name="entityToDelete">The <see cref="Entity"/> instance to be deleted.</param>
public void Delete(Entity entityToDelete)
{
EnlistWithCurrentTransactionScope();

if (Transaction != null)
{
Collection.DeleteOne(Transaction.Session, GetIdFilter(entityToDelete));
Expand All @@ -334,7 +415,16 @@ public Task DeleteAsync(Entity entityToDelete)
/// <param name="cancellationToken">A token used for cancelling propagation.</param>
public Task DeleteAsync(Entity entityToDelete, CancellationToken cancellationToken)
{
return Collection.DeleteOneAsync(GetIdFilter(entityToDelete), cancellationToken);
EnlistWithCurrentTransactionScope();

if (Transaction != null)
{
return Collection.DeleteOneAsync(Transaction.Session, GetIdFilter(entityToDelete), null, cancellationToken);
}
else
{
return Collection.DeleteOneAsync(GetIdFilter(entityToDelete), cancellationToken);
}
}

/// <summary>
Expand All @@ -350,7 +440,16 @@ public IEnumerable<Entity> ListAll()
/// </summary>
public IQueryable<Entity> GetQueryable()
{
return GlobalFilter != null ? Collection.AsQueryable().Where(GlobalFilter) : Collection.AsQueryable();
EnlistWithCurrentTransactionScope();

if (Transaction != null)
{
return GlobalFilter != null ? Collection.AsQueryable(Transaction.Session).Where(GlobalFilter) : Collection.AsQueryable(Transaction.Session);
}
else
{
return GlobalFilter != null ? Collection.AsQueryable().Where(GlobalFilter) : Collection.AsQueryable();
}
}

/// <summary>
Expand Down
39 changes: 0 additions & 39 deletions DynamicRepository.MongoDB/MongoDBTransaction.cs
View file

This file was deleted.

13 changes: 5 additions & 8 deletions DynamicRepository.MongoDB/Repository.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using MongoDB.Driver;
using System.Threading;
using System.Threading.Tasks;
using System.Transactions;

namespace DynamicRepository.MongoDB
{
Expand Down Expand Up @@ -58,14 +59,10 @@ public Repository(IMongoDatabase mongoDatabase, string collectionName, string id
InitializeProxy(builtRepository);
}

public ITransaction StartTransaction()
{
return _mongoDBRepository.StartTransaction();
}
public TransactionScope StartTransactionScope() => _mongoDBRepository.StartTransactionScope();

public void RegisterTransaction(ITransaction transaction)
{
_mongoDBRepository.RegisterTransaction(transaction);
}
public ITransaction StartTransaction() => _mongoDBRepository.StartTransaction();

public void RegisterTransaction(ITransaction transaction) => _mongoDBRepository.RegisterTransaction(transaction);
}
}
10 changes: 10 additions & 0 deletions DynamicRepository.MongoDB/Transaction/AmbientTransactionRegister.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using DynamicRepository.Transaction;
using System.Collections.Concurrent;

namespace DynamicRepository.MongoDB.Transaction
{
internal static class AmbientTransactionRegister
{
internal static ConcurrentDictionary<string, ITransaction> AmbientTransactions = new ConcurrentDictionary<string, ITransaction>();
}
}
Loading

0 comments on commit ad41519

Please sign in to comment.