Skip to content

refactor: mark fields as readonly #378

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
Sep 22, 2025
Merged

refactor: mark fields as readonly #378

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
c984e54
refactor: mark fields as readonly
deepsource-autofix[bot] Sep 22, 2025
803a857
fix build issues
StuartFerguson Sep 22, 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
2 changes: 1 addition & 1 deletion Shared.EventStore.Tests/SubscriptionWorkerHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class SubscriptionWorkerHelperTests
{
#region Fields

private Mock<IDomainEventHandlerResolver> domainEventHandlerResolver;
private readonly Mock<IDomainEventHandlerResolver> domainEventHandlerResolver;

#endregion

Expand Down
284 changes: 120 additions & 164 deletions Shared.EventStore/SubscriptionWorker/SubscriptionRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,165 +1,121 @@
namespace Shared.EventStore.SubscriptionWorker;

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using global::EventStore.Client;
using Newtonsoft.Json;

[ExcludeFromCodeCoverage]
public class SubscriptionRepository : ISubscriptionRepository
{
#region Fields

private Int32 CacheHits;

private Int32 FullRefreshHits;

private Func<CancellationToken, Task<List<PersistentSubscriptionInfo>>> GetAllSubscriptions;

private readonly Func<Boolean, PersistentSubscriptions, Boolean> RefreshRequired;

private Int32 running;

private PersistentSubscriptions Subscriptions;

#endregion

#region Constructors

private SubscriptionRepository(Int32 cacheDuration = 120)
{
this.Subscriptions = new PersistentSubscriptions();

this.RefreshRequired = (force, s) => force || s.InitialState || SubscriptionRepository.RefreshNeeded(s.LastTimeRefreshed, cacheDuration);
}

#endregion

#region Events

public EventHandler<String> Trace;

#endregion

#region Methods

public static SubscriptionRepository Create(String eventStoreConnectionString,Int32 cacheDuration = 120)
{
EventStoreClientSettings settings = EventStoreClientSettings.Create(eventStoreConnectionString);
HttpClient httpClient = SubscriptionWorkerHelper.CreateHttpClient(settings);

return new SubscriptionRepository(cacheDuration)
{
GetAllSubscriptions = cancellationToken => SubscriptionRepository.GetSubscriptions(httpClient, cancellationToken)
};
}

public static SubscriptionRepository Create(Task<List<PersistentSubscriptionInfo>> func,Int32 cacheDuration = 120)
{
return new(cacheDuration)
{
GetAllSubscriptions = _ => func
};
}

public static SubscriptionRepository Create(Func<CancellationToken, Task<List<PersistentSubscriptionInfo>>> func,Int32 cacheDuration = 120)
{
return new(cacheDuration)
{
GetAllSubscriptions = func
};
}

public static async Task<List<PersistentSubscriptionInfo>> GetSubscriptions(HttpClient httpClient, CancellationToken cancellationToken)
{
try
{
HttpResponseMessage responseMessage = await httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Get, "subscriptions"), cancellationToken);
String responseBody = await responseMessage.Content.ReadAsStringAsync(cancellationToken);

if (responseMessage.IsSuccessStatusCode)
{
List<PersistentSubscriptionInfo> list = JsonConvert.DeserializeObject<List<PersistentSubscriptionInfo>>(responseBody);

return list;
}

throw new Exception($"Response was [{responseBody}] and status code was [{responseMessage.StatusCode}]");
}
catch (Exception ex)
{
throw new Exception($"Unable to get persistent subscription list. [{ex}]");
}
}

public async Task<PersistentSubscriptions> GetSubscriptions(Boolean forceRefresh, CancellationToken cancellationToken)
{
if (Interlocked.CompareExchange(ref this.running, 1, 0) != 0)
{
return this.GetSubscriptionsFromCache("no lock");
}

try
{
if (!this.RefreshRequired(forceRefresh, this.Subscriptions))
{
return this.GetSubscriptionsFromCache("refresh not required");
}

this.WriteTrace("Full refresh on repository");

List<PersistentSubscriptionInfo> list = await this.GetAllSubscriptions(cancellationToken);

this.FullRefreshHits++;

this.Subscriptions = this.Subscriptions.Update(list);

this.WriteTrace($"Full refresh on repository completed {this.FullRefreshHits}");

return this.Subscriptions;
}
catch (Exception ex)
{
throw new Exception($"Unable to get persistent subscription list. [{ex}]");
}
finally
{
Interlocked.Exchange(ref this.running, 0);
}
}

public async Task PreWarm(CancellationToken cancellationToken) => await this.GetSubscriptions(true, cancellationToken);

public void WriteTrace(String message)
{
if (this.Trace != null)
{
this.Trace(this, message);
}
}

private PersistentSubscriptions GetSubscriptionsFromCache(String reason)
{
this.CacheHits++;
this.WriteTrace($"Cache hit {this.CacheHits} - {reason}");
return this.Subscriptions;
}

private static Boolean RefreshNeeded(DateTime lastRefreshed, Int32 cacheDuration)
{
TimeSpan elapsed = DateTime.Now - lastRefreshed;

if (elapsed.TotalSeconds < cacheDuration)
{
return false;
}

return true;
}

#endregion
}
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using global::EventStore.Client;
using Newtonsoft.Json;

[ExcludeFromCodeCoverage]
public class SubscriptionRepository : ISubscriptionRepository {
private Int32 CacheHits;
private Int32 FullRefreshHits;
private Func<CancellationToken, Task<List<PersistentSubscriptionInfo>>> GetAllSubscriptions;
private readonly Func<Boolean, PersistentSubscriptions, Boolean> RefreshRequired;
private Int32 running;
private PersistentSubscriptions Subscriptions;

private SubscriptionRepository(Int32 cacheDuration = 120) {
this.Subscriptions = new PersistentSubscriptions();
this.RefreshRequired = (force,
s) => force || s.InitialState || SubscriptionRepository.RefreshNeeded(s.LastTimeRefreshed, cacheDuration);
}

public EventHandler<String> Trace;

public static SubscriptionRepository Create(String eventStoreConnectionString,
Int32 cacheDuration = 120) {
EventStoreClientSettings settings = EventStoreClientSettings.Create(eventStoreConnectionString);
HttpClient httpClient = SubscriptionWorkerHelper.CreateHttpClient(settings);
return new SubscriptionRepository(cacheDuration) { GetAllSubscriptions = cancellationToken => SubscriptionRepository.GetSubscriptions(httpClient, cancellationToken) };
}

public static SubscriptionRepository Create(Task<List<PersistentSubscriptionInfo>> func,
Int32 cacheDuration = 120) {

return new(cacheDuration) { GetAllSubscriptions = _ => func };

}

public static SubscriptionRepository Create(Func<CancellationToken, Task<List<PersistentSubscriptionInfo>>> func,
Int32 cacheDuration = 120) {
return new(cacheDuration) { GetAllSubscriptions = func };
}

public static async Task<List<PersistentSubscriptionInfo>> GetSubscriptions(HttpClient httpClient,
CancellationToken cancellationToken) {
try {
HttpResponseMessage responseMessage = await httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Get, "subscriptions"), cancellationToken);
String responseBody = await responseMessage.Content.ReadAsStringAsync(cancellationToken);

if (responseMessage.IsSuccessStatusCode) {
List<PersistentSubscriptionInfo> list = JsonConvert.DeserializeObject<List<PersistentSubscriptionInfo>>(responseBody);

return list;
}

throw new Exception($"Response was [{responseBody}] and status code was [{responseMessage.StatusCode}]");
}
catch (Exception ex) {
throw new Exception($"Unable to get persistent subscription list. [{ex}]");
}
}

public async Task<PersistentSubscriptions> GetSubscriptions(Boolean forceRefresh,
CancellationToken cancellationToken) {
if (Interlocked.CompareExchange(ref this.running, 1, 0) != 0) {
return this.GetSubscriptionsFromCache("no lock");
}

try {
if (!this.RefreshRequired(forceRefresh, this.Subscriptions)) {
return this.GetSubscriptionsFromCache("refresh not required");
}

this.WriteTrace("Full refresh on repository");

List<PersistentSubscriptionInfo> list = await this.GetAllSubscriptions(cancellationToken);

this.FullRefreshHits++;

this.Subscriptions = this.Subscriptions.Update(list);

this.WriteTrace($"Full refresh on repository completed {this.FullRefreshHits}");

return this.Subscriptions;
}
catch (Exception ex) {
throw new Exception($"Unable to get persistent subscription list. [{ex}]");
}
finally {
Interlocked.Exchange(ref this.running, 0);
}
}

public async Task PreWarm(CancellationToken cancellationToken) => await this.GetSubscriptions(true, cancellationToken);

public void WriteTrace(String message) {
if (this.Trace != null) {
this.Trace(this, message);
}
}

private PersistentSubscriptions GetSubscriptionsFromCache(String reason) {
this.CacheHits++;
this.WriteTrace($"Cache hit {this.CacheHits} - {reason}");
return this.Subscriptions;
}

private static Boolean RefreshNeeded(DateTime lastRefreshed,
Int32 cacheDuration) {
TimeSpan elapsed = DateTime.Now - lastRefreshed;

if (elapsed.TotalSeconds < cacheDuration) {
return false;
}

return true;
}
}
2 changes: 1 addition & 1 deletion Shared/Web/QueryStringBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Shared.Web;

public class QueryStringBuilder
{
private Dictionary<string, (object value, Boolean alwaysInclude)> parameters = new Dictionary<String, (Object value, Boolean alwaysInclude)>();
private readonly Dictionary<string, (object value, Boolean alwaysInclude)> parameters = new Dictionary<String, (Object value, Boolean alwaysInclude)>();

public QueryStringBuilder AddParameter(string key,
object value) =>
Expand Down
Loading