Skip to content

Commit d5f2cee

Browse files
author
Daniel Marbach
authored
Use saga data type to save and update sagas (#488)
* Switch persister to use explicit type # Conflicts: # src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj # src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj # src/NServiceBus.Storage.MongoDB.PersistenceTests/NServiceBus.Storage.MongoDB.PersistenceTests.csproj # src/NServiceBus.Storage.MongoDB.Tests/NServiceBus.Storage.MongoDB.Tests.csproj # src/NServiceBus.Storage.MongoDB/NServiceBus.Storage.MongoDB.csproj
1 parent 3146e69 commit d5f2cee

File tree

7 files changed

+29
-25
lines changed

7 files changed

+29
-25
lines changed

‎src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
55
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
66
<NoWarn>$(NoWarn);SYSLIB0021</NoWarn>
77
</PropertyGroup>
@@ -11,11 +11,12 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
14+
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
1516
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.8.0" />
16-
<PackageReference Include="NUnit" Version="3.12.0" />
17-
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
18-
<PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
17+
<PackageReference Include="NUnit" Version="3.13.3" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
19+
<PackageReference Include="MongoDB.Driver" Version="2.19.1" />
1920
</ItemGroup>
2021

21-
</Project>
22+
</Project>

‎src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
55
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
66
<NoWarn>$(NoWarn);SYSLIB0021</NoWarn>
77
</PropertyGroup>
@@ -11,11 +11,12 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
14+
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
1516
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.8.0" />
16-
<PackageReference Include="NUnit" Version="3.12.0" />
17-
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
18-
<PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
17+
<PackageReference Include="NUnit" Version="3.13.3" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
19+
<PackageReference Include="MongoDB.Driver" Version="2.19.1" />
1920
</ItemGroup>
2021

21-
</Project>
22+
</Project>

‎src/NServiceBus.Storage.MongoDB.Tests/NServiceBus.Storage.MongoDB.Tests.csproj‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
55
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
66
</PropertyGroup>
77

@@ -10,13 +10,14 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
13+
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
15+
<PackageReference Include="MongoDB.Driver" Version="2.19.1" />
1416
<PackageReference Include="NServiceBus" Version="7.8.0" />
15-
<PackageReference Include="NUnit" Version="3.12.0" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
17-
<PackageReference Include="Particular.Approvals" Version="0.2.0" />
18-
<PackageReference Include="PublicApiGenerator" Version="10.2.0" />
19-
<PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
17+
<PackageReference Include="NUnit" Version="3.13.3" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
19+
<PackageReference Include="Particular.Approvals" Version="0.4.1" />
20+
<PackageReference Include="PublicApiGenerator" Version="11.0.0" />
2021
</ItemGroup>
2122

2223
</Project>

‎src/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
55
<LangVersion>10.0</LangVersion>
66
<!-- We want the root namespace to match the transactional session one -->
77
<RootNamespace>NServiceBus.TransactionalSession.AcceptanceTests</RootNamespace>
@@ -14,6 +14,7 @@
1414
<PackageReference Include="NServiceBus.TransactionalSession" Version="1.0.0" />
1515
<PackageReference Include="NUnit" Version="3.13.3" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
17+
<PackageReference Include="MongoDB.Driver" Version="2.19.1" />
1718
</ItemGroup>
1819

1920
<ItemGroup>

‎src/NServiceBus.Storage.MongoDB.TransactionalSession.Tests/NServiceBus.Storage.MongoDB.TransactionalSession.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
55
<LangVersion>10.0</LangVersion>
66
</PropertyGroup>
77

@@ -23,4 +23,4 @@
2323
<ProjectReference Include="..\NServiceBus.Storage.MongoDB.TransactionalSession\NServiceBus.Storage.MongoDB.TransactionalSession.csproj" />
2424
</ItemGroup>
2525

26-
</Project>
26+
</Project>

‎src/NServiceBus.Storage.MongoDB/NServiceBus.Storage.MongoDB.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageReference Include="MongoDB.Driver" Version="[2.9.2, 3.0.0)" />
99
<PackageReference Include="NServiceBus" Version="[7.8.0, 8.0.0)" />
1010
<PackageReference Include="Particular.CodeRules" Version="0.2.1" PrivateAssets="All" />
11-
<PackageReference Include="Particular.Packaging" Version="2.0.0" PrivateAssets="All" />
11+
<PackageReference Include="Particular.Packaging" Version="2.3.0" PrivateAssets="All" />
1212
</ItemGroup>
1313

1414
</Project>

‎src/NServiceBus.Storage.MongoDB/Sagas/SagaPersister.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public async Task Save(IContainSagaData sagaData, SagaCorrelationProperty correl
2121
var storageSession = (StorageSession)session;
2222
var sagaDataType = sagaData.GetType();
2323

24-
var document = sagaData.ToBsonDocument();
24+
var document = sagaData.ToBsonDocument(sagaDataType);
2525
document.Add(versionElementName, 0);
2626

2727
await storageSession.InsertOneAsync(sagaDataType, document).ConfigureAwait(false);
@@ -33,7 +33,7 @@ public async Task Update(IContainSagaData sagaData, SynchronizedStorageSession s
3333
var sagaDataType = sagaData.GetType();
3434

3535
var version = storageSession.RetrieveVersion(sagaDataType);
36-
var document = sagaData.ToBsonDocument().SetElement(new BsonElement(versionElementName, version + 1));
36+
var document = sagaData.ToBsonDocument(sagaDataType).SetElement(new BsonElement(versionElementName, version + 1));
3737

3838
var result = await storageSession.ReplaceOneAsync(sagaDataType, filterBuilder.Eq(idElementName, sagaData.Id) & filterBuilder.Eq(versionElementName, version), document).ConfigureAwait(false);
3939

0 commit comments

Comments
 (0)