working ContainerNamesQuery2

woutervanranst · Aug 20, 2024 · ff5e2eb · ff5e2eb
1 parent 4c3c200
commit ff5e2eb
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 41 deletions.
diff --git a/src/Arius.Core/Facade/RepositoryOptions.cs b/src/Arius.Core/Facade/RepositoryOptions.cs
@@ -1,5 +1,4 @@
-using System;
-using Azure.Storage.Blobs;
+using Azure.Storage.Blobs;
 
 namespace Arius.Core.Facade;
 

diff --git a/src/Arius.Core/Facade/StorageAccountOptions.cs b/src/Arius.Core/Facade/StorageAccountOptions.cs
@@ -1,5 +1,4 @@
-using System;
-using Arius.Core.Commands;
+using Arius.Core.Commands;
 using Azure.Storage;
 using Azure.Storage.Blobs;
 
@@ -39,6 +38,20 @@ public static BlobServiceClient GetBlobServiceClient(this StorageAccountOptions
         return new BlobServiceClient(new Uri($"https://{storageAccount.AccountName}.blob.core.windows.net/"),
             new StorageSharedKeyCredential(storageAccount.AccountName, storageAccount.AccountKey));
     }
+
+    public static BlobServiceClient GetBlobServiceClient(this StorageAccountOptions storageAccount, int maxRetries, TimeSpan networkTimeout)
+    {
+        var o = new BlobClientOptions
+        {
+            Retry =
+            {
+                MaxRetries     = maxRetries,
+                NetworkTimeout = networkTimeout,
+            }
+        };
+
+        return GetBlobServiceClient(storageAccount, o);
+    }
     public static BlobServiceClient GetBlobServiceClient(this StorageAccountOptions storageAccount, BlobClientOptions options)
     {
         return new BlobServiceClient(new Uri($"https://{storageAccount.AccountName}.blob.core.windows.net/"),

diff --git a/src/Arius.Core/GlobalUsings.cs b/src/Arius.Core/GlobalUsings.cs
@@ -1,3 +1,8 @@
 // Global using directives
 
-global using WouterVanRanst.Utils.Extensions;
+global using Microsoft.Extensions.Logging;
+global using System;
+global using System.Linq;
+global using System.Threading.Tasks;
+global using WouterVanRanst.Utils.Extensions;
+global using System.Threading;
diff --git a/src/Arius.Core/Queries/ContainerNames/ContainerNamesQueryHandler.cs b/src/Arius.Core/Queries/ContainerNames/ContainerNamesQueryHandler.cs
@@ -1,9 +1,5 @@
-using System;
+using Arius.Core.Facade;
 using System.Collections.Generic;
-using System.Linq;
-using Arius.Core.Facade;
-using Azure.Storage.Blobs;
-using Microsoft.Extensions.Logging;
 
 namespace Arius.Core.Queries.ContainerNames;
 
@@ -20,16 +16,7 @@ public ContainerNamesQueryHandler(ILogger<ContainerNamesQueryHandler> logger, St
 
     protected override (QueryResultStatus Status, IAsyncEnumerable<string>? Result) ExecuteImpl(ContainerNamesQuery queryOptions)
     {
-        var bco = new BlobClientOptions
-        {
-            Retry =
-                {
-                    MaxRetries     = queryOptions.MaxRetries,
-                    NetworkTimeout = TimeSpan.FromSeconds(5),
-                }
-        };
-
-        var blobServiceClient = storageAccountOptions.GetBlobServiceClient(bco);
+        var blobServiceClient = storageAccountOptions.GetBlobServiceClient(queryOptions.MaxRetries, TimeSpan.FromSeconds(5));
 
         return (QueryResultStatus.Success, blobServiceClient.GetBlobContainersAsync().Select(bci => bci.Name));
     }

diff --git a/src/Arius.Core/Queries/ContainerNames2/ContainerNamesQuery2.cs b/src/Arius.Core/Queries/ContainerNames2/ContainerNamesQuery2.cs
@@ -1,10 +1,7 @@
 using Arius.Core.Facade;
 using MediatR;
-using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Arius.Core.Queries.ContainerNames2;
 
@@ -15,23 +12,30 @@ public record ContainerNamesQuery2 : IRequest<IAsyncEnumerable<string>>, IStorag
     public required int    MaxRetries  { get; init; }
 }
 
-public class ContainerNamesQueryHandler : IRequestHandler<ContainerNamesQuery2, IAsyncEnumerable<string>>
+internal class ContainerNamesQuery2Handler : IRequestHandler<ContainerNamesQuery2, IAsyncEnumerable<string>>
 {
-    private readonly ILogger<ContainerNamesQueryHandler> logger;
+    private readonly ILogger<ContainerNamesQuery2Handler> logger;
 
-    public ContainerNamesQueryHandler(ILogger<ContainerNamesQueryHandler> logger)
+    public ContainerNamesQuery2Handler(ILogger<ContainerNamesQuery2Handler> logger)
     {
         this.logger = logger;
     }
 
     public async Task<IAsyncEnumerable<string>> Handle(ContainerNamesQuery2 request, CancellationToken cancellationToken)
     {
-        return GetContainerNamesAsync(cancellationToken);
-    }
+        return GetContainerNames(cancellationToken);
 
-    private async IAsyncEnumerable<string> GetContainerNamesAsync([EnumeratorCancellation] CancellationToken cancellationToken)
-    {
-        yield return "a";
-        yield return "b";
+
+        async IAsyncEnumerable<string> GetContainerNames([EnumeratorCancellation] CancellationToken cancellationToken)
+        {
+            var sao = new StorageAccountOptions(request.AccountName, request.AccountKey);
+
+            var bsc = sao.GetBlobServiceClient(request.MaxRetries, TimeSpan.FromSeconds(5));
+
+            await foreach (var container in bsc.GetBlobContainersAsync(cancellationToken: cancellationToken))
+            {
+                yield return container.Name;
+            }
+        }
     }
 }
diff --git a/src/Arius.Core/Repositories/Repository.cs b/src/Arius.Core/Repositories/Repository.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Threading.Tasks;
-using Arius.Core.Facade;
+using Arius.Core.Facade;
 using Arius.Core.Models;
 using Arius.Core.Repositories.BlobRepository;
 using Arius.Core.Repositories.StateDb;
-using Microsoft.Extensions.Logging;
 using PostSharp.Constraints;
 
 namespace Arius.Core.Repositories;

diff --git a/src/Arius.Core/Repositories/RepositoryBuilder.cs b/src/Arius.Core/Repositories/RepositoryBuilder.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Threading.Tasks;
-using Arius.Core.Facade;
+using Arius.Core.Facade;
 using Arius.Core.Repositories.BlobRepository;
 using Azure.Core;
 using Azure.Storage.Blobs;
-using Microsoft.Extensions.Logging;
 
 namespace Arius.Core.Repositories;
 

diff --git a/src/Arius.Web.Application/RepositoryOptionsService.cs b/src/Arius.Web.Application/RepositoryOptionsService.cs
@@ -9,7 +9,9 @@ public class RepositoryOptionsService
     private readonly IRepositoryOptionsRepository repositoryOptionsRepository;
     private readonly IMediator                    mediator;
 
-    public RepositoryOptionsService(IRepositoryOptionsRepository repositoryOptionsRepository, IMediator mediator)
+    public RepositoryOptionsService(
+        IRepositoryOptionsRepository repositoryOptionsRepository, 
+        IMediator mediator)
     {
         this.repositoryOptionsRepository = repositoryOptionsRepository;
         this.mediator                    = mediator;
@@ -29,6 +31,8 @@ public async Task AddRepositoryOptionsAsync(RepositoryOptions config)
 
         var r = await mediator.Send(q);
 
+        var rr = await r.ToListAsync();
+
 
         await repositoryOptionsRepository.AddAsync(config);
     }