Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FileProcessor.Client" Version="2025.7.2-build82" />
<PackageReference Include="FileProcessor.Client" Version="2025.7.2" />
<PackageReference Include="MediatR" Version="12.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.5">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -18,11 +18,11 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Shared" Version="2025.7.10" />
<PackageReference Include="Shared" Version="2025.7.13" />
<PackageReference Include="SimpleResults" Version="4.0.0" />
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
<PackageReference Include="EstateReportingAPI.Client" Version="2025.7.2-build69" />
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.2-build189" />
<PackageReference Include="EstateReportingAPI.Client" Version="2025.7.2" />
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion EstateManagementUI.IntegrationTests/Common/DockerHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ protected override List<String> GetRequiredProjections()
{
List<String> requiredProjections = new List<String>();

requiredProjections.Add("CallbackHandlerEnricher.js");
requiredProjections.Add("EstateAggregator.js");
requiredProjections.Add("MerchantAggregator.js");
requiredProjections.Add("MerchantBalanceCalculator.js");
Expand Down Expand Up @@ -210,6 +209,7 @@ private async Task<IContainerService> StartEstateManagementUiContainer(List<INet
environmentVariables.Add($"AppSettings:ClientSecret=Secret1");
environmentVariables.Add($"DataReloadConfig:DefaultInSeconds=1");
environmentVariables.Add("AppSettings:HttpClientIgnoreCertificateErrors=true");
environmentVariables.Add(this.SetConnectionString("ConnectionStrings:TransactionProcessorReadModel", "TransactionProcessorReadModel", this.UseSecureSqlServerDatabase));

TraceX("About to Built Estate Management UI Container");
ContainerBuilder containerBuilder = new Builder().UseContainer()
Expand Down
18 changes: 9 additions & 9 deletions EstateManagementUI.IntegrationTests/Common/SharedSteps.cs
Original file line number Diff line number Diff line change
Expand Up @@ -172,19 +172,19 @@

foreach (EstateResponse verifiedEstate in verifiedEstates)
{
await Retry.For(async () =>
{
String databaseName = $"EstateReportingReadModel{verifiedEstate.EstateId}";
var connString = Setup.GetLocalConnectionString(databaseName);
connString = $"{connString};Encrypt=false";
var ctx = new EstateManagementContext(connString);
//await Retry.For(async () =>
//{

Check notice on line 176 in EstateManagementUI.IntegrationTests/Common/SharedSteps.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

EstateManagementUI.IntegrationTests/Common/SharedSteps.cs#L176

Remove this commented out code.
// String databaseName = $"EstateReportingReadModel{verifiedEstate.EstateId}";
// var connString = Setup.GetLocalConnectionString(databaseName);
// connString = $"{connString};Encrypt=false";
// var ctx = new EstateManagementContext(connString);

var estates = ctx.Estates.ToList();
estates.Count.ShouldBe(1);
// var estates = ctx.Estates.ToList();
// estates.Count.ShouldBe(1);

this.TestingContext.AddEstateDetails(verifiedEstate.EstateId, verifiedEstate.EstateName, verifiedEstate.EstateReference);
this.TestingContext.Logger.LogInformation($"Estate {verifiedEstate.EstateName} created with Id {verifiedEstate.EstateId}");
});
//});

Check notice on line 187 in EstateManagementUI.IntegrationTests/Common/SharedSteps.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

EstateManagementUI.IntegrationTests/Common/SharedSteps.cs#L187

Remove this commented out code.
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,26 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.5" />
<PackageReference Include="SecurityService.Client" Version="2025.7.2-build89" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.7.2-build89" />
<PackageReference Include="SecurityService.Client" Version="2025.7.2" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.7.2" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="2.4.1" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="Reqnroll" Version="2.4.1" />
<PackageReference Include="Reqnroll.NUnit" Version="2.4.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.7.10" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.7.13" />
<PackageReference Include="Selenium.Support" Version="4.29.0" />
<PackageReference Include="Selenium.WebDriver" Version="4.29.0" />

<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2025.7.2-build82" />
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2025.7.2" />

<PackageReference Include="TransactionProcessor.Client" Version="2025.7.2-build189" />
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.2" />

<PackageReference Include="TransactionProcessor.Database" Version="2025.7.2-build189" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.7.2" />

<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.2-build189" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion EstateManagementUI/EstateManagementUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.5" />
<PackageReference Include="Shared" Version="2025.7.10" />
<PackageReference Include="Shared" Version="2025.7.13" />
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="MediatR" Version="12.5.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.5.0" />
Expand Down
Loading