Skip to content

Task/#348 remove estatemanagement connstring #353

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 2 commits into from
Jul 30, 2025
Merged

Task/#348 remove estatemanagement connstring #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
501194a
Removed traces of Estate Management
StuartFerguson Jul 30, 2025
27f366e
Merge branch 'master' into task/#348_remove_estatemanagement_connstring
StuartFerguson Jul 30, 2025
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
1 change: 0 additions & 1 deletion Shared.IntegrationTesting/BaseDockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,6 @@
environmentVariables
.Add($"OperatorConfiguration:PataPawaPostPay:Url=http://{this.TestHostContainerName}:{DockerPorts.TestHostPort}/PataPawaPostPayService/basichttp");
environmentVariables.Add(this.SetConnectionString("ConnectionStrings:TransactionProcessorReadModel", "TransactionProcessorReadModel", this.UseSecureSqlServerDatabase));
environmentVariables.Add(this.SetConnectionString("ConnectionStrings:EstateReportingReadModel", "EstateReportingReadModel", this.UseSecureSqlServerDatabase));

List<String> additionalEnvironmentVariables = this.GetAdditionalVariables(ContainerType.FileProcessor);

Expand Down Expand Up @@ -671,7 +670,7 @@
connection.Close();
this.Trace("SQL Server Container Running");
}
catch(SqlException ex){

Check warning on line 673 in Shared.IntegrationTesting/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Windows 

The variable 'ex' is declared but never used

Check warning on line 673 in Shared.IntegrationTesting/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Linux 

The variable 'ex' is declared but never used
if (connection.State == ConnectionState.Open){
connection.Close();
}
Expand Down Expand Up @@ -880,7 +879,7 @@
try{
await projectionClient.CreateContinuousAsync(projectionName, projection, trackEmittedStreams:true).ConfigureAwait(false);
}
catch(Exception ex){

Check warning on line 882 in Shared.IntegrationTesting/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Windows 

The variable 'ex' is declared but never used

Check warning on line 882 in Shared.IntegrationTesting/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Linux 

The variable 'ex' is declared but never used
}

projectionNames.Add(projectionName);
Expand Down
16 changes: 9 additions & 7 deletions Shared.Tests/ConfigurationReaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ public void ConfigurationReader_Initialise_NullConfigurationRoot_ErrorThrown(){
[Fact]
public void ConfigurationReader_GetBaseServerUri_ValueReturned()
{
Uri uri = ConfigurationReader.GetBaseServerUri("EstateManagementApi");
uri.AbsoluteUri.ShouldBe("http://127.0.0.1:5000/");
IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().AddInMemoryCollection(TestHelpers.DefaultAppSettings).AddEnvironmentVariables();
ConfigurationReader.Initialise(configurationBuilder.Build());
Uri uri = ConfigurationReader.GetBaseServerUri("TransactionProcessorApi");
uri.AbsoluteUri.ShouldBe("http://127.0.0.1:5002/");
}

[Fact]
Expand Down Expand Up @@ -85,8 +87,8 @@ public void ConfigurationReader_GetValue_ValueIsReturned()
IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().AddInMemoryCollection(TestHelpers.DefaultAppSettings).AddEnvironmentVariables();
ConfigurationReader.Initialise(configurationBuilder.Build());

var value = ConfigurationReader.GetValue("EstateManagementApi");
value.ShouldBe("http://127.0.0.1:5000");
var value = ConfigurationReader.GetValue("TransactionProcessorApi");
value.ShouldBe("http://127.0.0.1:5002");
}


Expand Down Expand Up @@ -161,8 +163,8 @@ public void ConfigurationReader_GetValueOrDefault_ValueIsReturned()
IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().AddInMemoryCollection(TestHelpers.DefaultAppSettings).AddEnvironmentVariables();
ConfigurationReader.Initialise(configurationBuilder.Build());

var value = ConfigurationReader.GetValueOrDefault("AppSettings","EstateManagementApi", "http://127.0.0.1:5001");
value.ShouldBe("http://127.0.0.1:5000");
var value = ConfigurationReader.GetValueOrDefault("AppSettings","TransactionProcessorApi", "http://127.0.0.1:5001");
value.ShouldBe("http://127.0.0.1:5002");
}

[Fact]
Expand All @@ -171,7 +173,7 @@ public void ConfigurationReader_GetValueOrDefault_DefaultValueIsReturned()
IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().AddInMemoryCollection(TestHelpers.DefaultAppSettings).AddEnvironmentVariables();
ConfigurationReader.Initialise(configurationBuilder.Build());

var value = ConfigurationReader.GetValueOrDefault("AppSettings", "EstateManagementApiX", "http://127.0.0.1:5001");
var value = ConfigurationReader.GetValueOrDefault("AppSettings", "TransactionProcessorApiX", "http://127.0.0.1:5001");
value.ShouldBe("http://127.0.0.1:5001");
}

Expand Down
12 changes: 0 additions & 12 deletions Shared.Tests/MiddlewareTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,18 +304,6 @@ public async Task ExceptionHandlerMiddleware_NoExceptionThrown_OKResponseReturne
responseData.ShouldBeNull();
}

[Fact]
public void HealthChecksBuilderExtensions_AddEstateManagementService_ServiceAdded(){

IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().AddInMemoryCollection(TestHelpers.DefaultAppSettings).AddEnvironmentVariables();
ConfigurationReader.Initialise(configurationBuilder.Build());

TestHealthChecksBuilder builder = new ();
IHealthChecksBuilder healthChecksBuilder = builder.AddEstateManagementService();
((TestHealthChecksBuilder)healthChecksBuilder).Registrations.Count.ShouldBe(1);
((TestHealthChecksBuilder)healthChecksBuilder).Registrations.First().Name.ShouldBe("Estate Management Service");
}

[Fact]
public void HealthChecksBuilderExtensions_AddFileProcessorService_ServiceAdded()
{
Expand Down
1 change: 0 additions & 1 deletion Shared.Tests/TestHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public static TestLogger InitialiseLogger(){
["AppSettings:ClientId"] = "clientId",
["AppSettings:ClientSecret"] = "Secret1",
["AppSettings:TestArray"] = "[\"A\", \"B\", \"C\"]",
["AppSettings:EstateManagementApi"] = "http://127.0.0.1:5000",
["AppSettings:FileProcessorApi"] = "http://127.0.0.1:5009",
["AppSettings:MessagingServiceApi"] = "http://127.0.0.1:5006",
["SecurityConfiguration:Authority"] = "http://127.0.0.1:5001",
Expand Down
45 changes: 0 additions & 45 deletions Shared/Extensions/HealthChecksBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,6 @@
public static class HealthChecksBuilderExtensions
{
#region Methods

/// <summary>
/// Adds the estate management service.
/// </summary>
/// <param name="builder">The builder.</param>
/// <param name="customHttpHandler">The custom HTTP handler.</param>
/// <returns></returns>
public static IHealthChecksBuilder AddEstateManagementService(this IHealthChecksBuilder builder,
Func<IServiceProvider, HttpClientHandler> customHttpHandler = null)
{
Uri uri = new Uri($"{ConfigurationReader.GetValue("AppSettings", "EstateManagementApi")}/health");

return builder.AddUrlGroup(uri,
HttpMethod.Get,
"Estate Management Service",
HealthStatus.Unhealthy,
new[] {"estatemanagement"},
configurePrimaryHttpMessageHandler:customHttpHandler);
}


/// <summary>
/// Adds the file processor service.
/// </summary>
/// <param name="builder">The builder.</param>
/// <param name="customHttpHandler">The custom HTTP handler.</param>
/// <returns></returns>
public static IHealthChecksBuilder AddFileProcessorService(this IHealthChecksBuilder builder,
Func<IServiceProvider, HttpClientHandler> customHttpHandler = null)
{
Expand All @@ -52,12 +25,6 @@ public static IHealthChecksBuilder AddFileProcessorService(this IHealthChecksBui
configurePrimaryHttpMessageHandler: customHttpHandler);
}

/// <summary>
/// Adds the messaging service.
/// </summary>
/// <param name="builder">The builder.</param>
/// <param name="customHttpHandler">The custom HTTP handler.</param>
/// <returns></returns>
public static IHealthChecksBuilder AddMessagingService(this IHealthChecksBuilder builder,
Func<IServiceProvider, HttpClientHandler> customHttpHandler = null)
{
Expand All @@ -71,12 +38,6 @@ public static IHealthChecksBuilder AddMessagingService(this IHealthChecksBuilder
configurePrimaryHttpMessageHandler: customHttpHandler);
}

/// <summary>
/// Adds the security service.
/// </summary>
/// <param name="builder">The builder.</param>
/// <param name="customHttpHandler">The custom HTTP handler.</param>
/// <returns></returns>
public static IHealthChecksBuilder AddSecurityService(this IHealthChecksBuilder builder,
Func<IServiceProvider, HttpClientHandler> customHttpHandler = null)
{
Expand All @@ -89,12 +50,6 @@ public static IHealthChecksBuilder AddSecurityService(this IHealthChecksBuilder
configurePrimaryHttpMessageHandler: customHttpHandler);
}

/// <summary>
/// Adds the transaction processor service.
/// </summary>
/// <param name="builder">The builder.</param>
/// <param name="customHttpHandler">The custom HTTP handler.</param>
/// <returns></returns>
public static IHealthChecksBuilder AddTransactionProcessorService(this IHealthChecksBuilder builder,
Func<IServiceProvider, HttpClientHandler> customHttpHandler = null)
{
Expand Down
Loading