Skip to content

Commit c2de77c

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #299 from TransactionProcessing/task/#296_security_client_update
clients updates
2 parents b1508aa + 94473d6 commit c2de77c

File tree

8 files changed

+66
-46
lines changed

8 files changed

+66
-46
lines changed

‎TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACLApplicationServiceTests.cs‎

Lines changed: 21 additions & 21 deletions
Large diffs are not rendered by default.

‎TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
<ItemGroup>
88
<PackageReference Include="MediatR" Version="12.2.0" />
9-
<PackageReference Include="SecurityService.Client" Version="2024.5.1" />
10-
<PackageReference Include="Shared" Version="2024.11.2" />
11-
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build118" />
12-
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.8.2-build118" />
13-
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build118" />
9+
<PackageReference Include="SecurityService.Client" Version="2024.88.2-build73" />
10+
<PackageReference Include="Shared" Version="2024.11.4" />
11+
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build119" />
12+
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.8.2-build119" />
13+
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build119" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace TransactionProcessor.IntegrationTests.Common
1+
using System.Linq;
2+
3+
namespace TransactionProcessor.IntegrationTests.Common
24
{
35
using System;
46
using System.Collections.Generic;
@@ -7,6 +9,7 @@
79
using System.Threading.Tasks;
810
using Client;
911
using Ductus.FluentDocker.Builders;
12+
using Ductus.FluentDocker.Executors;
1013
using Ductus.FluentDocker.Services;
1114
using Ductus.FluentDocker.Services.Extensions;
1215
using EstateManagement.Client;
@@ -88,9 +91,23 @@ public override async Task CreateSubscriptions(){
8891
/// <param name="scenarioName">Name of the scenario.</param>
8992
public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices)
9093
{
91-
await base.StartContainersForScenarioRun(scenarioName, dockerServices);
94+
try {
95+
await base.StartContainersForScenarioRun(scenarioName, dockerServices);
96+
}
97+
catch (Exception ex) {
98+
var contaner = this.Containers.SingleOrDefault(c => c.Item1 == DockerServices.TransactionProcessorAcl);
99+
if (contaner.Item2 != null) {
100+
var logs = contaner.Item2.Logs();
101+
String line;
102+
while ((line = logs.Read()) != null)
103+
{
104+
Console.WriteLine(line);
105+
}
106+
107+
}
108+
}
109+
92110

93-
94111
// Setup the base address resolvers
95112
String EstateManagementBaseAddressResolver(String api) => $"http://127.0.0.1:{this.EstateManagementPort}";
96113
String SecurityServiceBaseAddressResolver(String api) => $"https://127.0.0.1:{this.SecurityServicePort}";
@@ -119,9 +136,11 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do
119136
this.HttpClient.BaseAddress = new Uri(TransactionProcessorAclBaseAddressResolver(string.Empty));
120137

121138
this.ProjectionManagementClient = new EventStoreProjectionManagementClient(ConfigureEventStoreSettings());
122-
139+
123140
}
124141

125142
#endregion
126143
}
144+
145+
127146
}

‎TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ClientProxyBase" Version="2024.11.2" />
10+
<PackageReference Include="ClientProxyBase" Version="2024.11.4" />
1111
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
12-
<PackageReference Include="EstateManagement.Client" Version="2024.8.2-build124" />
13-
<PackageReference Include="EstateManagement.Database" Version="2024.8.2-build124" />
14-
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2024.8.2-build124" />
12+
<PackageReference Include="EstateManagement.Client" Version="2024.8.2-build128" />
13+
<PackageReference Include="EstateManagement.Database" Version="2024.8.2-build128" />
14+
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2024.8.2-build128" />
1515
<PackageReference Include="EventStoreProjections" Version="2023.12.3" />
16-
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2024.4.2" />
16+
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2024.8.2-build65" />
1717
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
@@ -22,12 +22,12 @@
2222
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
2323
<PackageReference Include="Reqnroll" Version="1.0.1" />
2424
<PackageReference Include="Reqnroll.NUnit" Version="1.0.1" />
25-
<PackageReference Include="SecurityService.Client" Version="2024.5.1" />
26-
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2024.5.1" />
27-
<PackageReference Include="Shared.IntegrationTesting" Version="2024.11.2" />
25+
<PackageReference Include="SecurityService.Client" Version="2024.88.2-build73" />
26+
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2024.88.2-build73" />
27+
<PackageReference Include="Shared.IntegrationTesting" Version="2024.11.4" />
2828
<PackageReference Include="Shouldly" Version="4.2.1" />
29-
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build118" />
30-
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build118" />
29+
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build119" />
30+
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build119" />
3131

3232
<PackageReference Include="coverlet.collector" Version="6.0.2">
3333
<PrivateAssets>all</PrivateAssets>

‎TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build118" />
10-
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.8.2-build118" />
11-
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build118" />
9+
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build119" />
10+
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.8.2-build119" />
11+
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build119" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎TransactionProcessorACL/Controllers/VoucherController.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System;
99
using EstateManagement.Client;
1010
using JasperFx.Core;
11+
using Shared.Results;
1112
using SimpleResults;
1213
using TransactionProcessorACL.BusinessLogic.Common;
1314
using TransactionProcessorACL.BusinessLogic.Requests;

‎TransactionProcessorACL/TransactionProcessorACL.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
2727
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2828
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
29-
<PackageReference Include="Shared" Version="2024.11.2" />
29+
<PackageReference Include="Shared" Version="2024.11.4" />
3030
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
3131
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
3232
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.1" />

‎TransactionProcessorACL/nlog.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333

3434
<rules>
3535
<logger name="Microsoft.*" minlevel="Warn" writeTo="" final="true" />
36-
<logger name="*" minlevel="Warn" writeTo="logfile">
36+
<logger name="*" minlevel="Info" writeTo="logfile">
3737
<filters defaultAction="Log">
3838
<when condition="contains('${message}', 'HEALTH_CHECK')" action="Ignore"></when>
3939
</filters>
4040
</logger>
41-
<logger name="*" minlevel="Warn" writeTo="healthlogfile">
41+
<logger name="*" minlevel="Info" writeTo="healthlogfile">
4242
<filters defaultAction="Ignore">
4343
<when condition="contains('${message}', 'HEALTH_CHECK')" action="Log"></when>
4444
</filters>

0 commit comments

Comments
 (0)