Skip to content

clients updates #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2024
Merged

clients updates #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions ...sactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACLApplicationServiceTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

<ItemGroup>
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="SecurityService.Client" Version="2024.5.1" />
<PackageReference Include="Shared" Version="2024.11.2" />
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build118" />
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.8.2-build118" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build118" />
<PackageReference Include="SecurityService.Client" Version="2024.88.2-build73" />
<PackageReference Include="Shared" Version="2024.11.4" />
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build119" />
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.8.2-build119" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build119" />
</ItemGroup>

<ItemGroup>
Expand Down
27 changes: 23 additions & 4 deletions TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace TransactionProcessor.IntegrationTests.Common
using System.Linq;

namespace TransactionProcessor.IntegrationTests.Common
{
using System;
using System.Collections.Generic;
Expand All @@ -7,6 +9,7 @@
using System.Threading.Tasks;
using Client;
using Ductus.FluentDocker.Builders;
using Ductus.FluentDocker.Executors;
using Ductus.FluentDocker.Services;
using Ductus.FluentDocker.Services.Extensions;
using EstateManagement.Client;
Expand Down Expand Up @@ -88,9 +91,23 @@ public override async Task CreateSubscriptions(){
/// <param name="scenarioName">Name of the scenario.</param>
public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices)
{
await base.StartContainersForScenarioRun(scenarioName, dockerServices);
try {
await base.StartContainersForScenarioRun(scenarioName, dockerServices);
}
catch (Exception ex) {
var contaner = this.Containers.SingleOrDefault(c => c.Item1 == DockerServices.TransactionProcessorAcl);
if (contaner.Item2 != null) {
var logs = contaner.Item2.Logs();
String line;
while ((line = logs.Read()) != null)
{
Console.WriteLine(line);
}

}
}



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

this.ProjectionManagementClient = new EventStoreProjectionManagementClient(ConfigureEventStoreSettings());

}

#endregion
}


}
20 changes: 10 additions & 10 deletions TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2024.11.2" />
<PackageReference Include="ClientProxyBase" Version="2024.11.4" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
<PackageReference Include="EstateManagement.Client" Version="2024.8.2-build124" />
<PackageReference Include="EstateManagement.Database" Version="2024.8.2-build124" />
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2024.8.2-build124" />
<PackageReference Include="EstateManagement.Client" Version="2024.8.2-build128" />
<PackageReference Include="EstateManagement.Database" Version="2024.8.2-build128" />
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2024.8.2-build128" />
<PackageReference Include="EventStoreProjections" Version="2023.12.3" />
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2024.4.2" />
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2024.8.2-build65" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
Expand All @@ -22,12 +22,12 @@
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Reqnroll" Version="1.0.1" />
<PackageReference Include="Reqnroll.NUnit" Version="1.0.1" />
<PackageReference Include="SecurityService.Client" Version="2024.5.1" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2024.5.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2024.11.2" />
<PackageReference Include="SecurityService.Client" Version="2024.88.2-build73" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2024.88.2-build73" />
<PackageReference Include="Shared.IntegrationTesting" Version="2024.11.4" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build118" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build118" />
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build119" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build119" />

<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
6 changes: 3 additions & 3 deletions TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build118" />
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.8.2-build118" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build118" />
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build119" />
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.8.2-build119" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.8.2-build119" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions TransactionProcessorACL/Controllers/VoucherController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System;
using EstateManagement.Client;
using JasperFx.Core;
using Shared.Results;
using SimpleResults;
using TransactionProcessorACL.BusinessLogic.Common;
using TransactionProcessorACL.BusinessLogic.Requests;
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessorACL/TransactionProcessorACL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
<PackageReference Include="Shared" Version="2024.11.2" />
<PackageReference Include="Shared" Version="2024.11.4" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.1" />
Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessorACL/nlog.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@

<rules>
<logger name="Microsoft.*" minlevel="Warn" writeTo="" final="true" />
<logger name="*" minlevel="Warn" writeTo="logfile">
<logger name="*" minlevel="Info" writeTo="logfile">
<filters defaultAction="Log">
<when condition="contains('${message}', 'HEALTH_CHECK')" action="Ignore"></when>
</filters>
</logger>
<logger name="*" minlevel="Warn" writeTo="healthlogfile">
<logger name="*" minlevel="Info" writeTo="healthlogfile">
<filters defaultAction="Ignore">
<when condition="contains('${message}', 'HEALTH_CHECK')" action="Log"></when>
</filters>
Expand Down
Loading