Skip to content

Commit 645024c

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #184 from TransactionProcessing/task/#183_updateshrarednugets
Update shared nugets
2 parents 8f18d8f + 3cbbd2e commit 645024c

File tree

9 files changed

+36
-83
lines changed

9 files changed

+36
-83
lines changed

‎TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="MediatR" Version="11.0.0" />
99
<PackageReference Include="SecurityService.Client" Version="2022.12.1-build31" />
10-
<PackageReference Include="Shared" Version="2022.12.2" />
10+
<PackageReference Include="Shared" Version="2023.1.0" />
1111
<PackageReference Include="TransactionProcessor.Client" Version="2022.12.2-build43" />
1212
</ItemGroup>
1313

‎TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs‎

Lines changed: 3 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,16 @@
22
{
33
using System;
44
using System.Collections.Generic;
5-
using System.Data;
6-
using System.IO;
7-
using System.Linq;
8-
using System.Net;
95
using System.Net.Http;
106
using System.Threading;
117
using System.Threading.Tasks;
128
using Client;
139
using Ductus.FluentDocker.Builders;
14-
using Ductus.FluentDocker.Common;
15-
using Ductus.FluentDocker.Model.Builders;
1610
using Ductus.FluentDocker.Services;
1711
using Ductus.FluentDocker.Services.Extensions;
1812
using EstateManagement.Client;
19-
using EstateReporting.Database;
20-
using EventStore.Client;
13+
using EstateManagement.Database.Contexts;
2114
using global::Shared.IntegrationTesting;
22-
using global::Shared.Logger;
23-
using Microsoft.Data.SqlClient;
2415
using SecurityService.Client;
2516

2617
/// <summary>
@@ -120,7 +111,7 @@ private async Task RemoveEstateReadModel()
120111
String connectionString = Setup.GetLocalConnectionString(databaseName);
121112
await Retry.For(async () =>
122113
{
123-
EstateReportingSqlServerContext context = new EstateReportingSqlServerContext(connectionString);
114+
EstateManagementSqlServerContext context = new EstateManagementSqlServerContext(connectionString);
124115
await context.Database.EnsureDeletedAsync(CancellationToken.None);
125116
}, retryFor: TimeSpan.FromMinutes(2), retryInterval: TimeSpan.FromSeconds(30));
126117
}
@@ -135,54 +126,7 @@ public override async Task StopContainersForScenarioRun()
135126

136127
base.StopContainersForScenarioRun();
137128
}
138-
139-
public override async Task<IContainerService> SetupSecurityServiceContainer(List<INetworkService> networkServices,
140-
List<String> additionalEnvironmentVariables = null)
141-
{
142-
this.Trace("About to Start Security Container");
143-
144-
List<String> environmentVariables = this.GetCommonEnvironmentVariables(DockerPorts.SecurityServiceDockerPort);
145-
environmentVariables.Add($"ServiceOptions:PublicOrigin=https://{this.SecurityServiceContainerName}:{DockerPorts.SecurityServiceDockerPort}");
146-
environmentVariables.Add($"ServiceOptions:IssuerUrl=https://{this.SecurityServiceContainerName}:{DockerPorts.SecurityServiceDockerPort}");
147-
environmentVariables.Add("ASPNETCORE_ENVIRONMENT=IntegrationTest");
148-
environmentVariables.Add($"urls=https://*:{DockerPorts.SecurityServiceDockerPort}");
149-
150-
environmentVariables.Add($"ServiceOptions:PasswordOptions:RequiredLength=6");
151-
environmentVariables.Add($"ServiceOptions:PasswordOptions:RequireDigit=false");
152-
environmentVariables.Add($"ServiceOptions:PasswordOptions:RequireUpperCase=false");
153-
environmentVariables.Add($"ServiceOptions:UserOptions:RequireUniqueEmail=false");
154-
environmentVariables.Add($"ServiceOptions:SignInOptions:RequireConfirmedEmail=false");
155-
156-
if (additionalEnvironmentVariables != null)
157-
{
158-
environmentVariables.AddRange(additionalEnvironmentVariables);
159-
}
160-
161-
ContainerBuilder securityServiceContainer = new Builder().UseContainer().WithName(this.SecurityServiceContainerName)
162-
.WithEnvironment(environmentVariables.ToArray())
163-
.UseImageDetails(this.GetImageDetails(ContainerType.SecurityService))
164-
.ExposePort(DockerPorts.SecurityServiceDockerPort)
165-
.MountHostFolder(this.HostTraceFolder)
166-
.SetDockerCredentials(this.DockerCredentials);
167-
168-
// Now build and return the container
169-
IContainerService builtContainer = securityServiceContainer.Build().Start().WaitForPort($"{DockerPorts.SecurityServiceDockerPort}/tcp", 30000);
170-
171-
foreach (INetworkService networkService in networkServices)
172-
{
173-
networkService.Attach(builtContainer, false);
174-
}
175-
176-
this.Trace("Security Service Container Started");
177-
this.Containers.Add(builtContainer);
178-
179-
// Do a health check here
180-
this.SecurityServicePort = builtContainer.ToHostExposedEndpoint($"{DockerPorts.SecurityServiceDockerPort}/tcp").Port;
181-
await this.DoHealthCheck(ContainerType.SecurityService);
182-
183-
return builtContainer;
184-
}
185-
129+
186130
#endregion
187131
}
188132
}

‎TransactionProcessorACL.IntegrationTests/Reconciliation/Reconciliation.feature‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ Background:
4444
| Test Estate 2 | Safaricom | Safaricom Contract |
4545

4646
When I create the following Products
47-
| EstateName | OperatorName | ContractDescription | ProductName | DisplayText | Value |
48-
| Test Estate 1 | Safaricom | Safaricom Contract | Variable Topup | Custom | |
49-
| Test Estate 2 | Safaricom | Safaricom Contract | Variable Topup | Custom | |
47+
| EstateName | OperatorName | ContractDescription | ProductName | DisplayText | Value | ProductType |
48+
| Test Estate 1 | Safaricom | Safaricom Contract | Variable Topup | Custom | | MobileTopup |
49+
| Test Estate 2 | Safaricom | Safaricom Contract | Variable Topup | Custom | | MobileTopup |
5050

5151
When I add the following Transaction Fees
5252
| EstateName | OperatorName | ContractDescription | ProductName | CalculationType | FeeDescription | Value |

‎TransactionProcessorACL.IntegrationTests/Reconciliation/Reconciliation.feature.cs‎

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TransactionProcessorACL.IntegrationTests/SaleTransaction/SalesTransaction.feature‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ Background:
5050
| Test Estate 2 | Voucher | Hospital 1 Contract |
5151

5252
When I create the following Products
53-
| EstateName | OperatorName | ContractDescription | ProductName | DisplayText | Value |
54-
| Test Estate 1 | Safaricom | Safaricom Contract | Variable Topup | Custom | |
55-
| Test Estate 1 | Voucher | Hospital 1 Contract | 10 KES | 10 KES | |
56-
| Test Estate 2 | Safaricom | Safaricom Contract | Variable Topup | Custom | |
57-
| Test Estate 2 | Voucher | Hospital 1 Contract | 10 KES | 10 KES | |
53+
| EstateName | OperatorName | ContractDescription | ProductName | DisplayText | Value | ProductType |
54+
| Test Estate 1 | Safaricom | Safaricom Contract | Variable Topup | Custom | | MobileTopup |
55+
| Test Estate 1 | Voucher | Hospital 1 Contract | 10 KES | 10 KES | | Voucher |
56+
| Test Estate 2 | Safaricom | Safaricom Contract | Variable Topup | Custom | | MobileTopup |
57+
| Test Estate 2 | Voucher | Hospital 1 Contract | 10 KES | 10 KES | | Voucher |
5858

5959
When I add the following Transaction Fees
6060
| EstateName | OperatorName | ContractDescription | ProductName | CalculationType | FeeDescription | Value |

‎TransactionProcessorACL.IntegrationTests/SaleTransaction/SalesTransaction.feature.cs‎

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TransactionProcessorACL.IntegrationTests/Shared/SharedSteps.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,8 +731,9 @@ public async Task WhenICreateTheFollowingProducts(Table table)
731731
{
732732
ProductName = SpecflowTableHelper.GetStringRowValue(tableRow, "ProductName"),
733733
DisplayText = SpecflowTableHelper.GetStringRowValue(tableRow, "DisplayText"),
734-
Value = null
735-
};
734+
Value = null,
735+
ProductType = SpecflowTableHelper.GetEnumValue<ProductType>(tableRow, "ProductType"),
736+
};
736737
if (string.IsNullOrEmpty(productValue) == false)
737738
{
738739
addProductToContractRequest.Value = decimal.Parse(productValue);

‎TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj‎

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

99
<ItemGroup>
10-
<PackageReference Include="ClientProxyBase" Version="2022.12.2" />
10+
<PackageReference Include="ClientProxyBase" Version="2023.1.0" />
1111
<PackageReference Include="Ductus.FluentDocker" Version="2.10.57" />
12-
<PackageReference Include="EstateManagement.Client" Version="2022.12.2-build29" />
13-
<PackageReference Include="EstateReporting.Database" Version="1.1.8-build15" />
12+
<PackageReference Include="EstateManagement.Client" Version="2022.12.3-build32" />
13+
<PackageReference Include="EstateManagement.Database" Version="2022.12.3-build32" />
1414
<PackageReference Include="EventStoreProjections" Version="2022.12.0" />
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
1616
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
1717
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
1818
<PackageReference Include="SecurityService.Client" Version="2022.12.1-build31" />
19-
<PackageReference Include="Shared.IntegrationTesting" Version="2022.12.2" />
19+
<PackageReference Include="Shared.IntegrationTesting" Version="2023.1.0" />
2020
<PackageReference Include="Shouldly" Version="4.1.0" />
2121
<PackageReference Include="SpecFlow" Version="3.9.74" />
2222
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.74" />

‎TransactionProcessorACL/TransactionProcessorACL.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.0" />
2525
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
2626
<PackageReference Include="NLog.Extensions.Logging" Version="5.1.0" />
27-
<PackageReference Include="Shared" Version="2022.12.2" />
27+
<PackageReference Include="Shared" Version="2023.1.0" />
2828
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
2929
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
3030
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.6" />

0 commit comments

Comments
 (0)