From cf0741ea8a7033617e16db5d4565463476d41470 Mon Sep 17 00:00:00 2001
From: Developer 02 <developer02@didaloghe.onmicrosoft.com>
Date: Wed, 6 Aug 2025 18:01:07 +0200
Subject: [PATCH] refactor(ActiveDirectoryOptions): Umbenennen in
 DirectoryEntryQuery

---
 src/DigitalData.ActiveDirectory.API/Program.cs            | 2 +-
 src/DigitalData.ActiveDirectory.API/appsettings.json      | 2 +-
 src/DigitalData.ActiveDirectory/DependencyInjection.cs    | 8 ++++----
 .../{ActiveDirectoryOptions.cs => DirectoryEntryQuery.cs} | 5 +++--
 src/DigitalData.ActiveDirectory/DirectorySearchQuery.cs   | 8 +++-----
 src/DigitalData.ActiveDirectory/MappingProfile.cs         | 2 +-
 6 files changed, 13 insertions(+), 14 deletions(-)
 rename src/DigitalData.ActiveDirectory/{ActiveDirectoryOptions.cs => DirectoryEntryQuery.cs} (83%)

diff --git a/src/DigitalData.ActiveDirectory.API/Program.cs b/src/DigitalData.ActiveDirectory.API/Program.cs
index 7c25d3d..1e5c187 100644
--- a/src/DigitalData.ActiveDirectory.API/Program.cs
+++ b/src/DigitalData.ActiveDirectory.API/Program.cs
@@ -12,7 +12,7 @@ builder.Services.AddSwaggerGen();
 
 builder.Services.AddActiveDirectory(options =>
 {
-    options.ConfigActiveDirectory(builder.Configuration.GetSection("ActiveDirectory"));
+    options.ConfigRootDirectoryEntry(builder.Configuration.GetSection("RootDirectoryEntry"));
     options.LPLicenseKey = builder.Configuration["LPLicense"];
 });
 
diff --git a/src/DigitalData.ActiveDirectory.API/appsettings.json b/src/DigitalData.ActiveDirectory.API/appsettings.json
index 25d1175..c860cb2 100644
--- a/src/DigitalData.ActiveDirectory.API/appsettings.json
+++ b/src/DigitalData.ActiveDirectory.API/appsettings.json
@@ -6,7 +6,7 @@
     }
   },
   "AllowedHosts": "*",
-  "ActiveDirectory": {
+  "RootDirectoryEntry": {
     "Path": "LDAP://DD-VMP01-DC01/DC=dd-gan,DC=local,DC=digitaldata,DC=works",
     "Username": "FABRIK19-User01",
     "Password": "9bWOr0UGuHn_7VkC"
diff --git a/src/DigitalData.ActiveDirectory/DependencyInjection.cs b/src/DigitalData.ActiveDirectory/DependencyInjection.cs
index a1ade73..70537f0 100644
--- a/src/DigitalData.ActiveDirectory/DependencyInjection.cs
+++ b/src/DigitalData.ActiveDirectory/DependencyInjection.cs
@@ -25,12 +25,12 @@ public static class DependencyInjection
         });
 
         if (!cOptions.IsADConfigured)
-            services.Configure<ActiveDirectoryOptions>(_ => { });
+            services.Configure<DirectoryEntryQuery>(_ => { });
 
         return services;
     }
 
-    public class ADConfigurationOptions : ActiveDirectoryOptions
+    public class ADConfigurationOptions
     {
         private readonly IServiceCollection _services;
 
@@ -54,8 +54,8 @@ public static class DependencyInjection
             IsADConfigured = true;
         }
 
-        public void ConfigActiveDirectory(IConfiguration config) => EnsureSingleMappingConfiguration(() => _services.Configure<ActiveDirectoryOptions>(config));
+        public void ConfigRootDirectoryEntry(IConfiguration config) => EnsureSingleMappingConfiguration(() => _services.Configure<DirectoryEntryQuery>(config));
 
-        public void ConfigActiveDirectory(Action<ActiveDirectoryOptions> options) => EnsureSingleMappingConfiguration(() => _services.Configure(options));
+        public void ConfigRootDirectoryEntry(Action<DirectoryEntryQuery> options) => EnsureSingleMappingConfiguration(() => _services.Configure(options));
     }
 }
\ No newline at end of file
diff --git a/src/DigitalData.ActiveDirectory/ActiveDirectoryOptions.cs b/src/DigitalData.ActiveDirectory/DirectoryEntryQuery.cs
similarity index 83%
rename from src/DigitalData.ActiveDirectory/ActiveDirectoryOptions.cs
rename to src/DigitalData.ActiveDirectory/DirectoryEntryQuery.cs
index 7dd3f23..fd99d29 100644
--- a/src/DigitalData.ActiveDirectory/ActiveDirectoryOptions.cs
+++ b/src/DigitalData.ActiveDirectory/DirectoryEntryQuery.cs
@@ -1,9 +1,10 @@
-using System.DirectoryServices;
+using MediatR;
+using System.DirectoryServices;
 
 namespace DigitalData.ActiveDirectory;
 
 [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
-public class ActiveDirectoryOptions
+public class DirectoryEntryQuery: IRequest
 {
     public string Path { get; set; } = null!;
 
diff --git a/src/DigitalData.ActiveDirectory/DirectorySearchQuery.cs b/src/DigitalData.ActiveDirectory/DirectorySearchQuery.cs
index 1a00de7..beaa2b8 100644
--- a/src/DigitalData.ActiveDirectory/DirectorySearchQuery.cs
+++ b/src/DigitalData.ActiveDirectory/DirectorySearchQuery.cs
@@ -9,9 +9,7 @@ namespace DigitalData.ActiveDirectory;
 public record DirectorySearchQuery(string? Filter = null, SearchScope Scope = SearchScope.Subtree, int SizeLimit = 5000, params string[] Property) 
     : IRequest<IEnumerable<ResultPropertyCollection>>
 {
-    public record Root(string Path, string? Username = null, string? Password = null);
-
-    public Root? SearchRoot { get; set; }
+    public DirectoryEntryQuery? SearchRoot { get; set; }
 
     public Action<DirectorySearcher>? AfterInit { get; set; }
 }
@@ -19,11 +17,11 @@ public record DirectorySearchQuery(string? Filter = null, SearchScope Scope = Se
 [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
 public class DirectorySearchQueryHandler : IRequestHandler<DirectorySearchQuery, IEnumerable<ResultPropertyCollection>>
 {
-    private readonly IOptions<ActiveDirectoryOptions> _options;
+    private readonly IOptions<DirectoryEntryQuery> _options;
 
     private readonly IMapper _mapper;
 
-    public DirectorySearchQueryHandler(IOptions<ActiveDirectoryOptions> options, IMapper mapper)
+    public DirectorySearchQueryHandler(IOptions<DirectoryEntryQuery> options, IMapper mapper)
     {
         _options = options;
         _mapper = mapper;
diff --git a/src/DigitalData.ActiveDirectory/MappingProfile.cs b/src/DigitalData.ActiveDirectory/MappingProfile.cs
index 031f9aa..20a6ce8 100644
--- a/src/DigitalData.ActiveDirectory/MappingProfile.cs
+++ b/src/DigitalData.ActiveDirectory/MappingProfile.cs
@@ -9,6 +9,6 @@ public class MappingProfile : Profile
     public MappingProfile()
     {
         CreateMap<DirectorySearchQuery, DirectorySearcher>();
-        CreateMap<DirectorySearchQuery.Root, DirectoryEntry>();
+        CreateMap<DirectoryEntry, DirectoryEntry>();
     }
 }