From b60a86392b953ee1bed3ab9f39da1a23f5630fca Mon Sep 17 00:00:00 2001
From: Tomasz Masternak <tomasz.masternak@particular.net>
Date: Thu, 6 Apr 2023 11:24:33 +0000
Subject: [PATCH] updating transactional session package and adding test (#973)

---
 ...ransactionalSession.AcceptanceTests.csproj |   2 +-
 ...sactional_session_with_transactionscope.cs | 124 ++++++++++++++++++
 ...ibernate.TransactionalSession.Tests.csproj |   2 +-
 ...Bus.NHibernate.TransactionalSession.csproj |   6 +-
 4 files changed, 129 insertions(+), 5 deletions(-)
 create mode 100644 src/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests/When_using_transactional_session_with_transactionscope.cs

diff --git a/src/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests.csproj b/src/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests.csproj
index 1169345d7..7cbd02559 100644
--- a/src/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests.csproj
+++ b/src/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
     <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
     <PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.8.0" />
-    <PackageReference Include="NServiceBus.TransactionalSession" Version="1.0.0" />
+    <PackageReference Include="NServiceBus.TransactionalSession" Version="1.0.1" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests/When_using_transactional_session_with_transactionscope.cs b/src/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests/When_using_transactional_session_with_transactionscope.cs
new file mode 100644
index 000000000..e4d987f98
--- /dev/null
+++ b/src/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests/When_using_transactional_session_with_transactionscope.cs
@@ -0,0 +1,124 @@
+namespace NServiceBus.TransactionalSession.AcceptanceTests
+{
+    using System;
+    using System.Data.SqlClient;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using System.Transactions;
+    using AcceptanceTesting;
+    using Infrastructure;
+    using NUnit.Framework;
+    using ObjectBuilder;
+
+    public class When_using_transactional_session_with_transactionscope : NServiceBusAcceptanceTest
+    {
+        [Test]
+        public async Task Should_provide_ambient_transactionscope()
+        {
+            string rowId = Guid.NewGuid().ToString();
+
+            await Scenario.Define<Context>()
+                .WithEndpoint<AnEndpoint>(s => s.When(async (_, ctx) =>
+                {
+                    using var scope = ctx.Builder.CreateChildBuilder();
+                    using var transactionalSession = scope.Build<ITransactionalSession>();
+                    await transactionalSession.Open();
+
+                    await transactionalSession.SendLocal(new SampleMessage());
+
+                    var storageSession = transactionalSession.SynchronizedStorageSession.Session();
+
+                    string insertText =
+                        $@"IF NOT EXISTS (SELECT * FROM sysobjects WHERE name='SomeTable' and xtype='U')
+                                        BEGIN
+	                                        CREATE TABLE [dbo].[SomeTable]([Id] [nvarchar](50) NOT NULL)
+                                        END;
+                                        INSERT INTO [dbo].[SomeTable] VALUES ('{rowId}')";
+
+                    await storageSession.CreateSQLQuery(insertText).ExecuteUpdateAsync(CancellationToken.None);
+
+                    using (var __ = new TransactionScope(TransactionScopeOption.Suppress,
+                               TransactionScopeAsyncFlowOption.Enabled))
+                    {
+                        using var connection = new SqlConnection(TransactionSessionDefaultServer.ConnectionString);
+
+                        await connection.OpenAsync();
+
+                        using var queryCommand =
+                            new SqlCommand(
+                                $"SELECT TOP 1 [Id] FROM [dbo].[SomeTable] WITH (READPAST) WHERE [Id]='{rowId}' ",
+                                connection);
+                        object result = await queryCommand.ExecuteScalarAsync();
+
+                        Assert.AreEqual(null, result);
+                    }
+
+                    await transactionalSession.Commit().ConfigureAwait(false);
+                }))
+                .Done(c => c.MessageReceived)
+                .Run();
+
+            using var connection = new SqlConnection(TransactionSessionDefaultServer.ConnectionString);
+
+            await connection.OpenAsync();
+
+            using var queryCommand =
+                new SqlCommand($"SELECT TOP 1 [Id] FROM [dbo].[SomeTable] WHERE [Id]='{rowId}'", connection);
+            object result = await queryCommand.ExecuteScalarAsync();
+
+            Assert.AreEqual(rowId, result);
+        }
+
+        class Context : ScenarioContext, IInjectBuilder
+        {
+            public bool MessageReceived { get; set; }
+            public bool CompleteMessageReceived { get; set; }
+            public IBuilder Builder { get; set; }
+        }
+
+        class AnEndpoint : EndpointConfigurationBuilder
+        {
+            public AnEndpoint() =>
+                EndpointSetup<TransactionSessionWithOutboxEndpoint>(c =>
+                {
+                    c.EnableOutbox().UseTransactionScope();
+                });
+
+            class SampleHandler : IHandleMessages<SampleMessage>
+            {
+                public SampleHandler(Context testContext) => this.testContext = testContext;
+
+                public Task Handle(SampleMessage message, IMessageHandlerContext context)
+                {
+                    testContext.MessageReceived = true;
+
+                    return Task.CompletedTask;
+                }
+
+                readonly Context testContext;
+            }
+
+            class CompleteTestMessageHandler : IHandleMessages<CompleteTestMessage>
+            {
+                public CompleteTestMessageHandler(Context context) => testContext = context;
+
+                public Task Handle(CompleteTestMessage message, IMessageHandlerContext context)
+                {
+                    testContext.CompleteMessageReceived = true;
+
+                    return Task.CompletedTask;
+                }
+
+                readonly Context testContext;
+            }
+        }
+
+        class SampleMessage : ICommand
+        {
+        }
+
+        class CompleteTestMessage : ICommand
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/NServiceBus.NHibernate.TransactionalSession.Tests/NServiceBus.NHibernate.TransactionalSession.Tests.csproj b/src/NServiceBus.NHibernate.TransactionalSession.Tests/NServiceBus.NHibernate.TransactionalSession.Tests.csproj
index cbba0a799..548a14638 100644
--- a/src/NServiceBus.NHibernate.TransactionalSession.Tests/NServiceBus.NHibernate.TransactionalSession.Tests.csproj
+++ b/src/NServiceBus.NHibernate.TransactionalSession.Tests/NServiceBus.NHibernate.TransactionalSession.Tests.csproj
@@ -19,7 +19,7 @@
   <ItemGroup>
     <PackageReference Include="Particular.Approvals" Version="0.3.0" />
     <PackageReference Include="PublicApiGenerator" Version="10.3.0" />
-    <PackageReference Include="NServiceBus.TransactionalSession" Version="1.0.0" />
+    <PackageReference Include="NServiceBus.TransactionalSession" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/NServiceBus.NHibernate.TransactionalSession/NServiceBus.NHibernate.TransactionalSession.csproj b/src/NServiceBus.NHibernate.TransactionalSession/NServiceBus.NHibernate.TransactionalSession.csproj
index 75e9f0ba2..8c5e60547 100644
--- a/src/NServiceBus.NHibernate.TransactionalSession/NServiceBus.NHibernate.TransactionalSession.csproj
+++ b/src/NServiceBus.NHibernate.TransactionalSession/NServiceBus.NHibernate.TransactionalSession.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Particular.Packaging" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="NServiceBus.TransactionalSession" Version="[1.0.0, 2.0.0)" />
+    <PackageReference Include="Particular.Packaging" Version="2.3.0" PrivateAssets="All" />
+    <PackageReference Include="NServiceBus.TransactionalSession" Version="[1.0.1, 2.0.0)" />
   </ItemGroup>
 
   <ItemGroup>