Skip to content

Commit e923e64

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #1023 from TransactionProcessing/task/some_codacy_fixes
some fixes of codacy issues
2 parents 3194fde + d060380 commit e923e64

4 files changed

Lines changed: 34 additions & 92 deletions

File tree

‎Shared.EventStore/EventStore/EventStoreContextManager.cs‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,11 @@ public EventStoreContextManager(Func<String, IEventStoreContext> eventStoreConte
2323
this.EventStoreContexts = new();
2424
this.EventStoreContextFunc = eventStoreContextFunc;
2525
}
26-
27-
//public EventStoreContextManager(IEventStoreContext eventStoreContext)
28-
//{
29-
//this.Context = eventStoreContext;
30-
//}
3126

3227
public event TraceHandler TraceGenerated;
3328

34-
35-
//public IEventStoreContext GetEventStoreContext(String connectionIdentifier) => this.GetEventStoreContext(connectionIdentifier, "EventStoreConnectionString");
36-
3729
public IEventStoreContext GetEventStoreContext(String connectionStringIdentifier)
3830
{
39-
//if (this.Context != null)
40-
//{
41-
// return this.Context;
42-
//}
43-
4431
this.WriteTrace($"No resolved context found, about to resolve one using connectionIdentifier {connectionStringIdentifier}");
4532

4633
if (this.EventStoreContexts.TryGetValue(connectionStringIdentifier, out IEventStoreContext context))

‎Shared.EventStore/Extensions/IApplicationBuilderExtenstions.cs‎

Lines changed: 34 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,8 @@ internal static List<SubscriptionWorker> ConfigureSubscriptions(ISubscriptionRep
6666
KeyValuePair<String, IDomainEventHandlerResolver> ehr = eventHandlerResolvers.SingleOrDefault(e => e.Key == "Ordered");
6767

6868
if (ehr.Value != null) {
69-
SubscriptionWorker worker = SubscriptionWorker.CreateOrderedSubscriptionWorker(eventStoreConnectionString,
70-
ehr.Value,
71-
subscriptionRepository,
72-
configuration.PersistentSubscriptionPollingInSeconds);
73-
worker.Trace += (_,
74-
args) => traceHandler(TraceEventType.Information, "ORDERED", args.Message);
75-
worker.Warning += (_,
76-
args) => traceHandler(TraceEventType.Warning, "ORDERED", args.Message);
77-
worker.Error += (_,
78-
args) => traceHandler(TraceEventType.Error, "ORDERED", args.Message);
79-
worker.SetIgnoreGroups(configurationSubscriptionWorker.IgnoreGroups);
80-
worker.SetIgnoreStreams(configurationSubscriptionWorker.IgnoreStreams);
81-
worker.SetIncludeGroups(configurationSubscriptionWorker.IncludeGroups);
82-
worker.SetIncludeStreams(configurationSubscriptionWorker.IncludeStreams);
69+
SubscriptionWorker worker = ConfigureSubscriptionWorker(subscriptionRepository, configuration,
70+
eventStoreConnectionString, traceHandler, ehr, configurationSubscriptionWorker, "ORDERED");
8371
workers.Add(worker);
8472
}
8573
}
@@ -88,20 +76,9 @@ internal static List<SubscriptionWorker> ConfigureSubscriptions(ISubscriptionRep
8876

8977
if (ehr.Value != null)
9078
{
91-
for (Int32 i = 0; i < configurationSubscriptionWorker.InstanceCount; i++)
92-
{
93-
SubscriptionWorker worker = SubscriptionWorker.CreateSubscriptionWorker(eventStoreConnectionString, ehr.Value, subscriptionRepository, configurationSubscriptionWorker.InflightMessages, configuration.PersistentSubscriptionPollingInSeconds);
94-
95-
worker.Trace += (_,
96-
args) => traceHandler(TraceEventType.Information, "DOMAIN", args.Message);
97-
worker.Warning += (_,
98-
args) => traceHandler(TraceEventType.Warning, "DOMAIN", args.Message);
99-
worker.Error += (_,
100-
args) => traceHandler(TraceEventType.Error, "DOMAIN", args.Message);
101-
worker.SetIgnoreGroups(configurationSubscriptionWorker.IgnoreGroups);
102-
worker.SetIgnoreStreams(configurationSubscriptionWorker.IgnoreStreams);
103-
worker.SetIncludeGroups(configurationSubscriptionWorker.IncludeGroups);
104-
worker.SetIncludeStreams(configurationSubscriptionWorker.IncludeStreams);
79+
for (Int32 i = 0; i < configurationSubscriptionWorker.InstanceCount; i++) {
80+
SubscriptionWorker worker = ConfigureSubscriptionWorker(subscriptionRepository, configuration,
81+
eventStoreConnectionString, traceHandler, ehr, configurationSubscriptionWorker, "DOMAIN");
10582

10683
workers.Add(worker);
10784
}
@@ -113,22 +90,8 @@ internal static List<SubscriptionWorker> ConfigureSubscriptions(ISubscriptionRep
11390
{
11491
for (Int32 i = 0; i < configurationSubscriptionWorker.InstanceCount; i++)
11592
{
116-
SubscriptionWorker worker = SubscriptionWorker.CreateSubscriptionWorker(eventStoreConnectionString,
117-
ehr.Value,
118-
subscriptionRepository,
119-
configurationSubscriptionWorker.InflightMessages,
120-
configuration.PersistentSubscriptionPollingInSeconds);
121-
122-
worker.Trace += (_,
123-
args) => traceHandler(TraceEventType.Information, "MAIN", args.Message);
124-
worker.Warning += (_,
125-
args) => traceHandler(TraceEventType.Warning, "MAIN", args.Message);
126-
worker.Error += (_,
127-
args) => traceHandler(TraceEventType.Error, "MAIN", args.Message);
128-
worker.SetIgnoreGroups(configurationSubscriptionWorker.IgnoreGroups);
129-
worker.SetIgnoreStreams(configurationSubscriptionWorker.IgnoreStreams);
130-
worker.SetIncludeGroups(configurationSubscriptionWorker.IncludeGroups);
131-
worker.SetIncludeStreams(configurationSubscriptionWorker.IncludeStreams);
93+
SubscriptionWorker worker = ConfigureSubscriptionWorker(subscriptionRepository, configuration,
94+
eventStoreConnectionString, traceHandler, ehr, configurationSubscriptionWorker, "MAIN");
13295

13396
workers.Add(worker);
13497
}
@@ -138,5 +101,32 @@ internal static List<SubscriptionWorker> ConfigureSubscriptions(ISubscriptionRep
138101

139102
return workers;
140103
}
104+
105+
private static SubscriptionWorker ConfigureSubscriptionWorker(ISubscriptionRepository subscriptionRepository,
106+
SubscriptionWorkersRoot configuration,
107+
String eventStoreConnectionString,
108+
Action<TraceEventType, String, String> traceHandler,
109+
KeyValuePair<String, IDomainEventHandlerResolver> ehr,
110+
SubscriptionWorkerConfig configurationSubscriptionWorker,
111+
String type) {
112+
113+
SubscriptionWorker worker = type switch {
114+
"ORDERED" => SubscriptionWorker.CreateOrderedSubscriptionWorker(eventStoreConnectionString, ehr.Value, subscriptionRepository, configuration.PersistentSubscriptionPollingInSeconds),
115+
_ => SubscriptionWorker.CreateSubscriptionWorker(eventStoreConnectionString, ehr.Value, subscriptionRepository, configurationSubscriptionWorker.InflightMessages, configuration.PersistentSubscriptionPollingInSeconds),
116+
};
117+
118+
worker.Trace += (_,
119+
args) => traceHandler(TraceEventType.Information, type, args.Message);
120+
worker.Warning += (_,
121+
args) => traceHandler(TraceEventType.Warning, type, args.Message);
122+
worker.Error += (_,
123+
args) => traceHandler(TraceEventType.Error, type, args.Message);
124+
worker.SetIgnoreGroups(configurationSubscriptionWorker.IgnoreGroups);
125+
worker.SetIgnoreStreams(configurationSubscriptionWorker.IgnoreStreams);
126+
worker.SetIncludeGroups(configurationSubscriptionWorker.IncludeGroups);
127+
worker.SetIncludeStreams(configurationSubscriptionWorker.IncludeStreams);
128+
return worker;
129+
}
130+
141131
#endregion
142132
}

‎Shared/Middleware/CorrelationIdMiddleware.cs‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -139,38 +139,4 @@ public static TenantIdentifiers GetIdentifiersFromRoute(this HttpContext context
139139

140140
return estateId == Guid.Empty ? TenantIdentifiers.Default() : new TenantIdentifiers(estateId, merchantId);
141141
}
142-
143-
/*public static async Task<TenantIdentifiers> GetIdentifiersFromPayload(this HttpContext context)
144-
{
145-
HttpRequest request = context.Request;
146-
String bodyAsText = null;
147-
148-
try
149-
{
150-
request.EnableBuffering();
151-
bodyAsText = await new StreamReader(request.Body).ReadToEndAsync();
152-
request.Body.Position = 0;
153-
154-
if (String.IsNullOrWhiteSpace(bodyAsText))
155-
{
156-
return TenantIdentifiers.Default();
157-
}
158-
159-
JToken rootToken = JToken.Parse(bodyAsText);
160-
161-
JToken organisationIdToken = rootToken.SelectTokens("..organisationId").FirstOrDefault();
162-
JToken storeIdToken = rootToken.SelectTokens("..storeId").FirstOrDefault();
163-
164-
Guid.TryParse(organisationIdToken?.Value<String>(), out Guid organisationId);
165-
Guid.TryParse(storeIdToken?.Value<String>(), out Guid storeId);
166-
167-
return organisationId == Guid.Empty ? TenantIdentifiers.Default() : new TenantIdentifiers(organisationId, storeId);
168-
}
169-
catch (Exception e)
170-
{
171-
EposityLogger.WriteWarning($"Unable to get organisationId from request body [{bodyAsText}]");
172-
EposityLogger.WriteException(e);
173-
return TenantIdentifiers.Default();
174-
}
175-
}*/
176142
}

‎Shared/Middleware/ResponseLoggingMiddleware.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ public class ResponseLoggingMemoryStream : MemoryStream
7676
public override void Close()
7777
{
7878
// Dont close by default
79-
// base.Close();
8079
}
8180

8281
public void ForceClose()

0 commit comments

Comments
 (0)