:|

Author: StuartFerguson

Shared.EventStore.Tests/SubscriptionRepositoryTests.cs

@@ -1,4 +1,5 @@
 using Shared.EventStore.Tests.TestObjects;
+using SimpleResults;
 
 namespace Shared.EventStore.Tests;
 
@@ -19,7 +20,7 @@ public async Task SubscriptionRepository_GetSubscriptions_ReturnsSubscriptions()
     {
         List<PersistentSubscriptionInfo> allSubscriptions = (TestData.GetPersistentSubscriptions_DemoEstate());
 
-        Func<CancellationToken, Task<List<PersistentSubscriptionInfo>>> GetAllSubscriptions = async token => allSubscriptions;
+        Func<CancellationToken, Task<Result<List<PersistentSubscriptionInfo>>>> GetAllSubscriptions = async token => allSubscriptions;
 
         ISubscriptionRepository subscriptionRepository = SubscriptionRepository.Create(GetAllSubscriptions);
 

Shared.EventStore/SubscriptionWorker/SubscriptionRepository.cs

@@ -1,4 +1,6 @@
-namespace Shared.EventStore.SubscriptionWorker;
+using SimpleResults;
+
+namespace Shared.EventStore.SubscriptionWorker;
  using System;
  using System.Collections.Generic;
  using System.Diagnostics.CodeAnalysis;
@@ -12,7 +14,7 @@
  public class SubscriptionRepository : ISubscriptionRepository {
      private Int32 CacheHits;
      private Int32 FullRefreshHits;
-     private Func<CancellationToken, Task<List<PersistentSubscriptionInfo>>> GetAllSubscriptions;
+     private Func<CancellationToken, Task<Result<List<PersistentSubscriptionInfo>>>> GetAllSubscriptions;
      private readonly Func<Boolean, PersistentSubscriptions, Boolean> RefreshRequired;
      private Int32 running;
      private PersistentSubscriptions Subscriptions;
@@ -29,37 +31,39 @@ 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) };
+
+
+         return new SubscriptionRepository(cacheDuration) { GetAllSubscriptions = cancellationToken => GetSubscriptions(httpClient, cancellationToken) };
      }
 
-     public static SubscriptionRepository Create(Task<List<PersistentSubscriptionInfo>> func,
+     public static SubscriptionRepository Create(Task<Result<List<PersistentSubscriptionInfo>>> func,
                                                  Int32 cacheDuration = 120) {
 
          return new(cacheDuration) { GetAllSubscriptions = _ => func };
 
      }
 
-     public static SubscriptionRepository Create(Func<CancellationToken, Task<List<PersistentSubscriptionInfo>>> func,
+     public static SubscriptionRepository Create(Func<CancellationToken, Task<Result<List<PersistentSubscriptionInfo>>>> func,
                                                  Int32 cacheDuration = 120) {
          return new(cacheDuration) { GetAllSubscriptions = func };
      }
 
-     public static async Task<List<PersistentSubscriptionInfo>> GetSubscriptions(HttpClient httpClient,
-                                                                                 CancellationToken cancellationToken) {
+     public static async Task<Result<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;
+                 return Result.Success(list);
              }
 
-             throw new ApplicationException($"Response was [{responseBody}] and status code was [{responseMessage.StatusCode}]");
+             return Result.Failure($"Response was [{responseBody}] and status code was [{responseMessage.StatusCode}]");
          }
          catch (Exception ex) {
-             throw new ApplicationException($"Unable to get persistent subscription list. [{ex}]");
+             return Result.Failure($"Unable to get persistent subscription list. [{ex}]");
          }
      }
 
@@ -76,11 +80,12 @@ public async Task<PersistentSubscriptions> GetSubscriptions(Boolean forceRefresh
 
              this.WriteTrace("Full refresh on repository");
 
-             List<PersistentSubscriptionInfo> list = await this.GetAllSubscriptions(cancellationToken);
+             Result<List<PersistentSubscriptionInfo>> list = await this.GetAllSubscriptions(cancellationToken);
 
-             this.FullRefreshHits++;
+            // TODO: Log failure?
+            this.FullRefreshHits++;
 
-             this.Subscriptions = this.Subscriptions.Update(list);
+             this.Subscriptions = this.Subscriptions.Update(list.Data);
 
              this.WriteTrace($"Full refresh on repository completed {this.FullRefreshHits}");
 

Shared.EventStoreContext.Tests/EventStoreDockerHelper.cs

@@ -55,7 +55,7 @@ public override async Task CreateSubscriptions(){
     }
 
     public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices services) {
-        this.DockerPlatform = BaseDockerHelper.GetDockerEnginePlatform();
+        this.DockerPlatform = BaseDockerHelper.GetDockerEnginePlatform().Data;
         this.TestId = Guid.NewGuid();
         INetworkService networkService = this.SetupTestNetwork("eventstoretestnetwork", true);
         this.SetupContainerNames();

Shared.IntegrationTesting/BaseDockerHelper.cs

@@ -1,4 +1,5 @@
 using System.Net.Http.Headers;
+using SimpleResults;
 
 namespace Shared.IntegrationTesting;
 
@@ -134,8 +135,8 @@ protected BaseDockerHelper(Boolean skipHealthChecks=false) {
                                                                                             }));
 
         // Setup the default image details
-        DockerEnginePlatform engineType = BaseDockerHelper.GetDockerEnginePlatform();
-        if (engineType == DockerEnginePlatform.Windows){
+        SimpleResults.Result<DockerEnginePlatform> engineType = BaseDockerHelper.GetDockerEnginePlatform();
+        if (engineType.Data == DockerEnginePlatform.Windows){
             this.ImageDetails.Add(ContainerType.SqlServer, ("iamrjindal/sqlserverexpress:2019", true));
             this.ImageDetails.Add(ContainerType.EventStore, ("stuartferguson/eventstore_windows", true));
             this.ImageDetails.Add(ContainerType.MessagingService, ("stuartferguson/messagingservicewindows:master", true));
@@ -222,22 +223,22 @@ public List<String> GetCommonEnvironmentVariables(){
                                };
     }
 
-    public static DockerEnginePlatform GetDockerEnginePlatform(){
+    public static SimpleResults.Result<DockerEnginePlatform> GetDockerEnginePlatform(){
         try{
             IHostService docker = BaseDockerHelper.GetDockerHost();
 
             if (docker.Host.IsLinuxEngine()){
-                return DockerEnginePlatform.Linux;
+                return Result.Success(DockerEnginePlatform.Linux);
             }
 
             if (docker.Host.IsWindowsEngine()){
-                return DockerEnginePlatform.Windows;
+                return Result.Success(DockerEnginePlatform.Windows);
             }
 
-            return DockerEnginePlatform.Unknown;
+            return Result.Success(DockerEnginePlatform.Unknown);
         }
         catch(Exception e){
-            throw new ApplicationException("Unable to determine docker Engine Platform", e);
+            return Result.Failure($"Unable to determine docker Engine Platform. Exception [{e.Message}]");
         }
     }
 
@@ -551,11 +552,11 @@ public virtual ContainerBuilder SetupTestHostContainer(){
     public virtual INetworkService SetupTestNetwork(String networkName = null,
                                                     Boolean reuseIfExists = false){
         networkName = String.IsNullOrEmpty(networkName) ? $"testnw{this.TestId:N}" : networkName;
-        DockerEnginePlatform engineType = BaseDockerHelper.GetDockerEnginePlatform();
+        SimpleResults.Result<DockerEnginePlatform> engineType = BaseDockerHelper.GetDockerEnginePlatform();
 
-        if (engineType == DockerEnginePlatform.Windows){
+        if (engineType.Data == DockerEnginePlatform.Windows){
             var docker = BaseDockerHelper.GetDockerHost();
-            var network = docker.GetNetworks().Where(nw => nw.Name == networkName).SingleOrDefault();
+            var network = docker.GetNetworks().SingleOrDefault(nw => nw.Name == networkName);
             if (network == null){
                 Dictionary<String, String> driverOptions = new Dictionary<String, String>();
                 driverOptions.Add("com.docker.network.windowsshim.networkname", networkName);
@@ -571,7 +572,7 @@ public virtual INetworkService SetupTestNetwork(String networkName = null,
             return network;
         }
 
-        if (engineType == DockerEnginePlatform.Linux){
+        if (engineType.Data == DockerEnginePlatform.Linux){
             // Build a network
             NetworkBuilder networkService = new Builder().UseNetwork(networkName).ReuseIfExist();
 

Shared.IntegrationTesting/DockerHelper.cs

@@ -71,7 +71,7 @@ protected  virtual void SetHostTraceFolder(String scenarioName) {
 
 
     public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices){
-        this.DockerPlatform = BaseDockerHelper.GetDockerEnginePlatform();
+        this.DockerPlatform = BaseDockerHelper.GetDockerEnginePlatform().Data;
 
         this.DockerCredentials.ShouldNotBeNull();
         this.SqlCredentials.ShouldNotBeNull();