Skip to content

Commit e1e53f6

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #87 from TransactionProcessing/task/#85_updatesharednugets
Shared nuget update
2 parents 2b23d0e + 92e5cd0 commit e1e53f6

28 files changed

Lines changed: 655 additions & 471 deletions

‎FileProcessor.BusinessLogic.Tests/FileProcessingManagerTests.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -349,21 +349,20 @@ private void VerifyImportLog(FileImportLog source, FIleProcessor.Models.FileImpo
349349
}
350350
}
351351

352-
private Mock<Shared.EntityFramework.IDbContextFactory<EstateReportingContext>> CreateMockContextFactory()
352+
private Mock<Shared.EntityFramework.IDbContextFactory<EstateReportingGenericContext>> CreateMockContextFactory()
353353
{
354-
return new Mock<Shared.EntityFramework.IDbContextFactory<EstateReportingContext>>();
354+
return new Mock<Shared.EntityFramework.IDbContextFactory<EstateReportingGenericContext>>();
355355
}
356356

357-
private async Task<EstateReportingContext> GetContext(String databaseName)
357+
private async Task<EstateReportingGenericContext> GetContext(String databaseName)
358358
{
359-
EstateReportingContext context = null;
359+
EstateReportingGenericContext context = null;
360360

361-
DbContextOptionsBuilder<EstateReportingContext> builder = new DbContextOptionsBuilder<EstateReportingContext>()
362-
.UseInMemoryDatabase(databaseName)
363-
.ConfigureWarnings(w => w.Ignore(InMemoryEventId.TransactionIgnoredWarning));
364-
context = new EstateReportingContext(builder.Options);
361+
DbContextOptionsBuilder<EstateReportingGenericContext> builder = new DbContextOptionsBuilder<EstateReportingGenericContext>()
362+
.UseInMemoryDatabase(databaseName)
363+
.ConfigureWarnings(w => w.Ignore(InMemoryEventId.TransactionIgnoredWarning));
364+
context = new EstateReportingSqlServerContext(builder.Options);
365365

366-
367366
return context;
368367
}
369368
}

‎FileProcessor.BusinessLogic.Tests/FileProcessor.BusinessLogic.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.1" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
1212
<PackageReference Include="Moq" Version="4.16.1" />
1313
<PackageReference Include="Shouldly" Version="4.0.3" />
1414
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="13.2.29" />

‎FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="EstateManagement.Client" Version="1.0.10.2" />
9-
<PackageReference Include="EstateReporting.Database" Version="1.0.17-build76" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
11-
<PackageReference Include="SecurityService.Client" Version="1.0.6.2" />
12-
<PackageReference Include="Shared" Version="1.0.14" />
13-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.14" />
8+
<PackageReference Include="EstateManagement.Client" Version="1.0.16.2" />
9+
<PackageReference Include="EstateReporting.Database" Version="1.0.18.2" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.12" />
11+
<PackageReference Include="SecurityService.Client" Version="1.0.8" />
12+
<PackageReference Include="Shared" Version="1.1.0" />
13+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.0" />
1414
<PackageReference Include="MediatR" Version="9.0.0" />
15-
<PackageReference Include="Shared.EventStore" Version="1.0.14" />
15+
<PackageReference Include="Shared.EventStore" Version="1.1.0" />
1616
<PackageReference Include="System.IO.Abstractions" Version="13.2.29" />
17-
<PackageReference Include="TransactionProcessor.Client" Version="1.0.12.3" />
17+
<PackageReference Include="TransactionProcessor.Client" Version="1.0.16.3" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎FileProcessor.BusinessLogic/Managers/FileProcessorManager.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class FileProcessorManager : IFileProcessorManager
3232
/// </summary>
3333
private readonly List<FileProfile> FileProfiles;
3434

35-
private readonly Shared.EntityFramework.IDbContextFactory<EstateReportingContext> DbContextFactory;
35+
private readonly Shared.EntityFramework.IDbContextFactory<EstateReportingGenericContext> DbContextFactory;
3636

3737
private readonly IModelFactory ModelFactory;
3838

@@ -49,7 +49,7 @@ public class FileProcessorManager : IFileProcessorManager
4949
/// <param name="dbContextFactory">The database context factory.</param>
5050
/// <param name="modelFactory">The model factory.</param>
5151
public FileProcessorManager(List<FileProfile> fileProfiles,
52-
Shared.EntityFramework.IDbContextFactory<EstateReportingContext> dbContextFactory,
52+
Shared.EntityFramework.IDbContextFactory<EstateReportingGenericContext> dbContextFactory,
5353
IModelFactory modelFactory,
5454
IAggregateRepository<FileAggregate, DomainEventRecord.DomainEvent> fileAggregateRepository)
5555
{
@@ -100,7 +100,7 @@ public async Task<List<FileImportLog>> GetFileImportLogs(Guid estateId,
100100
Guid? merchantId,
101101
CancellationToken cancellationToken)
102102
{
103-
EstateReportingContext context = await this.DbContextFactory.GetContext(estateId, cancellationToken);
103+
EstateReportingGenericContext context = await this.DbContextFactory.GetContext(estateId, cancellationToken);
104104

105105
List<EstateReporting.Database.Entities.FileImportLog> importLogQuery =
106106
await context.FileImportLogs.AsAsyncEnumerable().Where(f => f.ImportLogDateTime >= startDateTime).ToListAsync(cancellationToken);
@@ -130,7 +130,7 @@ public async Task<FileImportLog> GetFileImportLog(Guid fileImportLogId,
130130
Guid? merchantId,
131131
CancellationToken cancellationToken)
132132
{
133-
EstateReportingContext context = await this.DbContextFactory.GetContext(estateId, cancellationToken);
133+
EstateReportingGenericContext context = await this.DbContextFactory.GetContext(estateId, cancellationToken);
134134

135135
EstateReporting.Database.Entities.FileImportLog importLogQuery =
136136
await context.FileImportLogs.AsAsyncEnumerable().SingleOrDefaultAsync(f => f.FileImportLogId == fileImportLogId, cancellationToken);
@@ -168,7 +168,7 @@ public async Task<FileDetails> GetFile(Guid fileId,
168168

169169
FileDetails fileDetails = fileAggregate.GetFile();
170170

171-
EstateReportingContext context = await this.DbContextFactory.GetContext(estateId, cancellationToken);
171+
EstateReportingGenericContext context = await this.DbContextFactory.GetContext(estateId, cancellationToken);
172172

173173
Merchant merchant = await context.Merchants.AsAsyncEnumerable()
174174
.SingleOrDefaultAsync(m => m.MerchantId == fileDetails.MerchantId, cancellationToken);

‎FileProcessor.Client/FileProcessor.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="ClientProxyBase" Version="1.0.14" />
9+
<PackageReference Include="ClientProxyBase" Version="1.1.0" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎FileProcessor.DataTransferObjects/FileProcessor.DataTransferObjects.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
9+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1010
</ItemGroup>
1111

1212
</Project>

‎FileProcessor.DomainEvents.Tests/FileProcessor.DomainEvents.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
1111
<PackageReference Include="Shouldly" Version="4.0.3" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

‎FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.14" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.0" />
99
</ItemGroup>
1010

1111
</Project>

‎FileProcessor.FileAggregate.Tests/FileProcessor.FileAggregate.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
1111
<PackageReference Include="Shouldly" Version="4.0.3" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

‎FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.14" />
9-
<PackageReference Include="Shared.EventStore" Version="1.0.14" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.0" />
9+
<PackageReference Include="Shared.EventStore" Version="1.1.0" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

0 commit comments

Comments
 (0)