DEV-1 fix/refactore Рефакторинг

Изменил метод GetEntry интерфейса IAuthDomain на поле Root и его реализациях.
ProgGym · Nov 28, 2023 · e4f7cb3 · e4f7cb3
1 parent 7ba8e36
commit e4f7cb3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/src/Domain-Win/Interfaces/IAuthDomain.cs b/src/Domain-Win/Interfaces/IAuthDomain.cs
@@ -9,6 +9,6 @@ namespace ProgGym.PrinterMonitor.Domain_Win.Interfaces
 {
     public interface IAuthDomain
     {
-        public DirectoryEntry GetEntry(string? path, string? username, string? password);
+        public DirectoryEntry Root { get; }
     }
 }
diff --git a/src/Domain-Win/Services/SearchDeviceService.cs b/src/Domain-Win/Services/SearchDeviceService.cs
@@ -15,21 +15,17 @@ namespace ProgGym.PrinterMonitor.Domain_Win.Services
 {
     public class SearchDeviceService : ISearchDeviceService
     {
-        private readonly MonitorSettings monitorSettings;
         private readonly IAuthDomain authDomain;
         private List<string?> printers = new List<string?>();
 
-        public SearchDeviceService(MonitorSettings monitorSettings, IAuthDomain authDomain)
+        public SearchDeviceService(IAuthDomain authDomain)
         {
-            this.monitorSettings = monitorSettings;
             this.authDomain = authDomain;
         }
 
         public List<string?> GetPrinters()
         {
-            DirectorySearcher searcher = new DirectorySearcher(this.authDomain.GetEntry(this.monitorSettings.DomainPath, 
-                                                                                        this.monitorSettings.DomainUserName,
-                                                                                        this.monitorSettings.DomainPassword));
+            DirectorySearcher searcher = new DirectorySearcher(this.authDomain.Root);
             searcher.Filter = "(objectClass=printQueue)";
             searcher.PropertiesToLoad.Add("cn");
             foreach (SearchResult result in searcher.FindAll())

diff --git a/src/Domain-Win/Services/authDevice.cs b/src/Domain-Win/Services/authDevice.cs
@@ -1,4 +1,5 @@
-using ProgGym.PrinterMonitor.Domain_Win.Interfaces;
+using ProgGym.PrinterMonitor.Application;
+using ProgGym.PrinterMonitor.Domain_Win.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.DirectoryServices;
@@ -10,12 +11,18 @@ namespace ProgGym.PrinterMonitor.Domain_Win.Services
 {
     public class AuthDevice: IAuthDomain
     {
-        public DirectoryEntry GetEntry(string? path, string? username, string? password) 
+        private readonly MonitorSettings _monitorSettings;
+
+        public DirectoryEntry Root { get; private set; }
+
+        public AuthDevice(MonitorSettings monitorSettings)
         {
-            DirectoryEntry root = new DirectoryEntry(path, username, password);
-            return root;
-        }
+            _monitorSettings = monitorSettings;
 
+            Root = new DirectoryEntry(_monitorSettings.DomainPath, 
+                                      _monitorSettings.DomainUserName, 
+                                      _monitorSettings.DomainPassword);
+        }
 
     }
 }