Fix session scope

SwissLife-OSS · Oct 2, 2023 · 378ddf3 · 378ddf3
1 parent 51c8a64
commit 378ddf3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/src/Session.Abstractions/ISessionProvider.cs b/src/Session.Abstractions/ISessionProvider.cs
@@ -1,15 +1,17 @@
 using System.Threading;
 using System.Threading.Tasks;
-using MongoDB.Extensions.Context;
 
 namespace MongoDB.Extensions.Session;
 
-public interface ISessionProvider<TContext>
- where TContext : IMongoDbContext
+public interface ISessionProvider
 {
  Task<ITransactionSession> BeginTransactionAsync(
  CancellationToken cancellationToken);
 
  Task<ISession> StartSessionAsync(
  CancellationToken cancellationToken);
 }
+
+public interface ISessionProvider<TScope> : ISessionProvider
+{
+}
diff --git a/src/Session.Tests/MongoSessionProviderTests.cs b/src/Session.Tests/MongoSessionProviderTests.cs
@@ -25,16 +25,16 @@ public MongoSessionProviderTests(MongoReplicaSetResource mongoResource)
 
  _serviceProvider = new ServiceCollection()
  .AddSingleton(mongoOptions)
- .AddMongoSessionProvider<TestDbContext>()
+ .AddMongoSessionProvider<TestDbContext, ITestScope>()
  .BuildServiceProvider();
  }
 
  [Fact]
  public async Task BeginTransactionAsync_ShouldBeginTransaction()
  {
  // Arrange
- ISessionProvider<TestDbContext> sessionProvider = _serviceProvider
- .GetRequiredService<ISessionProvider<TestDbContext>>();
+ ISessionProvider<ITestScope> sessionProvider = _serviceProvider
+ .GetRequiredService<ISessionProvider<ITestScope>>();
 
  // Act
  ITransactionSession transactionSession = await sessionProvider
@@ -51,8 +51,8 @@ public async Task BeginTransactionAsync_ShouldBeginTransaction()
  public async Task StartSessionAsync_ShouldStartSession()
  {
  // Arrange
- ISessionProvider<TestDbContext> sessionProvider = _serviceProvider
- .GetRequiredService<ISessionProvider<TestDbContext>>();
+ ISessionProvider<ITestScope> sessionProvider = _serviceProvider
+ .GetRequiredService<ISessionProvider<ITestScope>>();
 
  // Act
  ISession session = await sessionProvider
@@ -69,8 +69,8 @@ public async Task StartSessionAsync_ShouldStartSession()
  public async Task MongoSession_Dispose_ShouldDisposeSession()
  {
  // Arrange
- ISessionProvider<TestDbContext> sessionProvider = _serviceProvider
- .GetRequiredService<ISessionProvider<TestDbContext>>();
+ ISessionProvider<ITestScope> sessionProvider = _serviceProvider
+ .GetRequiredService<ISessionProvider<ITestScope>>();
 
  ISession session = await sessionProvider
  .StartSessionAsync(CancellationToken.None);
@@ -87,8 +87,8 @@ public async Task MongoSession_Dispose_ShouldDisposeSession()
  public async Task MongoTransactionSession_Dispose_ShouldDisposeSession()
  {
  // Arrange
- ISessionProvider<TestDbContext> sessionProvider = _serviceProvider
- .GetRequiredService<ISessionProvider<TestDbContext>>();
+ ISessionProvider<ITestScope> sessionProvider = _serviceProvider
+ .GetRequiredService<ISessionProvider<ITestScope>>();
 
  ITransactionSession transactionSession = await sessionProvider
  .BeginTransactionAsync(CancellationToken.None);
@@ -105,8 +105,8 @@ public async Task MongoTransactionSession_Dispose_ShouldDisposeSession()
  public async Task MongoTransactionSession_NotCommitting_ShouldNotAffectDatabase()
  {
  // Arrange
- ISessionProvider<TestDbContext> sessionProvider = _serviceProvider
- .GetRequiredService<ISessionProvider<TestDbContext>>();
+ ISessionProvider<ITestScope> sessionProvider = _serviceProvider
+ .GetRequiredService<ISessionProvider<ITestScope>>();
 
  ITransactionSession transactionSession = await sessionProvider
  .BeginTransactionAsync(CancellationToken.None);
@@ -135,4 +135,8 @@ protected override void OnConfiguring(IMongoDatabaseBuilder mongoDatabaseBuilder
  {
  }
  }
+
+ private interface ITestScope
+ {
+ }
 }
diff --git a/src/Session/Internal/MongoSessionProvider.cs b/src/Session/Internal/MongoSessionProvider.cs
@@ -6,7 +6,7 @@
 
 namespace MongoDB.Extensions.Session;
 
-internal class MongoSessionProvider<TContext> : ISessionProvider<TContext>
+internal class MongoSessionProvider<TContext, TScope> : ISessionProvider<TScope>
  where TContext : IMongoDbContext
 {
  private readonly IMongoClient _mongoClient;

diff --git a/src/Session/ServiceCollectionExtensions.cs b/src/Session/ServiceCollectionExtensions.cs
@@ -6,12 +6,12 @@ namespace MongoDB.Extensions.Session;
 
 public static class ServiceCollectionExtensions
 {
- public static IServiceCollection AddMongoSessionProvider<TContext>(
+ public static IServiceCollection AddMongoSessionProvider<TContext, TScope>(
  this IServiceCollection services)
  where TContext : class, IMongoDbContext
  {
  services.TryAddSingleton<TContext>();
- services.TryAddSingleton<ISessionProvider<TContext>, MongoSessionProvider<TContext>>();
+ services.TryAddSingleton<ISessionProvider<TScope>, MongoSessionProvider<TContext, TScope>>();
 
  return services;
  }