Develop - GciBridge -> GCI -> create database core in GCI - SkeletoKey - CalibParams - first ok

GenesisCordonelInterface/API/Enums.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GenesisCordonelInterface.API
+{
+    public class Enums
+    {
+        public enum DataStorageReaderTypes : sbyte
+        {
+            LoginPasswordsReader,
+            CalibrationParamsReader
+        }
+    }
+}

GenesisCordonelInterface/API/InterfaceOutsideToGCI.cs

@@ -1,5 +1,9 @@
 using CordonelPreadjustmentUi;
 using CordonelPreadjustmentUi.Processes.Itinerary;
+using GenesisCordonelInterface.Core.DataStorage.Config;
+using GenesisCordonelInterface.Core.DataStorage.Reading.Common.Models;
+using GenesisCordonelInterface.Core.DataStorage.Reading.Implementation.MeterLoginPasswords;
+using GenesisCordonelInterface.Core.DataStorage.Reading.Implementation.PreAdjustmentCalibrationParams;
 using System;
 using System.Collections.Generic;
 using System.IO.Ports;
@@ -36,12 +40,31 @@ namespace GenesisCordonelInterface.API
         /// </summary>
         public event Action<List<MeterBatchDebugStatus>> MeterBatchStatusChanged;
 
+        private readonly IMeterLoginPasswordReader loginPasswordsReader;
+
+        private readonly IPreAdjustmentCalibrationParamsReader calibrationParamsReader;
+
         /// <summary>
         /// Initializes a new instance of the public GCI facade.
         /// </summary>
         public InterfaceOutsideToGCI()
         {
-            _innerMeterAPI = new InterfaceGCIToLaatzen();
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the public GCI facade.
+        /// </summary>
+        public InterfaceOutsideToGCI(
+            InterfaceGCIToLaatzen innerMeterApi,
+            IMeterLoginPasswordReader passwordReader,
+            IPreAdjustmentCalibrationParamsReader calibrationReader)
+        {
+            _innerMeterAPI = innerMeterApi?? throw new ArgumentNullException(nameof(innerMeterApi));
+
+            loginPasswordsReader = passwordReader ?? throw new ArgumentNullException(nameof(passwordReader));
+
+            calibrationParamsReader = calibrationReader ?? throw new ArgumentNullException(nameof(calibrationReader));
         }
 
         // Laatzen ToolBox actions
@@ -50,7 +73,7 @@ namespace GenesisCordonelInterface.API
 
         public PortDetectionResult DetectStreamingPort(int slot)
         {
-            var result = _innerMeterAPI.DetectStreamingPort(slot);
+            var result = _innerMeterAPI?.DetectStreamingPort(slot);
             //RaiseMeterBatchStatusChanged();
             return result;
         }
@@ -59,14 +82,14 @@ namespace GenesisCordonelInterface.API
             int slot,
             CancellationToken token = default(CancellationToken))
         {
-            var result = await _innerMeterAPI.DetectStreamingPortAsync(slot, token);
+            var result = await _innerMeterAPI?.DetectStreamingPortAsync(slot, token);
             //RaiseMeterBatchStatusChanged();
             return result;
         }
 
         public PortDetectionResult DetectRequestPort(int slot)
         {
-            var result = _innerMeterAPI.DetectRequestPort(slot);
+            var result = _innerMeterAPI?.DetectRequestPort(slot);
             //RaiseMeterBatchStatusChanged();
             return result;
         }
@@ -75,7 +98,7 @@ namespace GenesisCordonelInterface.API
             int slot,
             CancellationToken token = default(CancellationToken))
         {
-            var result = await _innerMeterAPI.DetectRequestPortAsync(slot, token);
+            var result = await _innerMeterAPI?.DetectRequestPortAsync(slot, token);
             //RaiseMeterBatchStatusChanged();
             return result;
         }
@@ -484,6 +507,7 @@ namespace GenesisCordonelInterface.API
 
             return result;
         }
+
         #endregion
 
         #region ================================== DEBUG STATUS ==================================
@@ -497,7 +521,7 @@ namespace GenesisCordonelInterface.API
         /// </returns>
         public List<WorkerDebugStatus> GetWorkerDebugStatuses()
         {
-            return _innerMeterAPI.GetWorkerDebugStatuses();
+            return _innerMeterAPI?.GetWorkerDebugStatuses();
         }
 
         /// <summary>
@@ -509,7 +533,7 @@ namespace GenesisCordonelInterface.API
         /// </returns>
         public List<MeterBatchDebugStatus> GetMeterBatchDebugStatuses()
         {
-            return _innerMeterAPI.GetMeterBatchDebugStatuses();
+            return _innerMeterAPI?.GetMeterBatchDebugStatuses();
         }
 
         /// <summary>
@@ -538,7 +562,7 @@ namespace GenesisCordonelInterface.API
         /// <param name="selected">Selection state.</param>
         public void SetSlotSelected(int slot, bool selected)
         {
-            _innerMeterAPI.SetSlotSelected(slot, selected);
+            _innerMeterAPI?.SetSlotSelected(slot, selected);
             RaiseMeterBatchStatusChanged();
         }
 
@@ -551,7 +575,7 @@ namespace GenesisCordonelInterface.API
         /// </returns>
         public bool IsSlotSelected(int slot)
         {
-            return _innerMeterAPI.IsSlotSelected(slot);
+            return (bool)(_innerMeterAPI?.IsSlotSelected(slot));
         }
 
         /// <summary>
@@ -562,7 +586,7 @@ namespace GenesisCordonelInterface.API
         /// </returns>
         public List<int> GetSelectedSlots()
         {
-            return _innerMeterAPI.GetSelectedSlots();
+            return _innerMeterAPI?.GetSelectedSlots();
         }
 
         #endregion
@@ -577,7 +601,7 @@ namespace GenesisCordonelInterface.API
         /// </returns>
         public List<string> GetAllRegisterNames()
         {
-            return _innerMeterAPI.GetAllRegisterNames();
+            return _innerMeterAPI?.GetAllRegisterNames();
         }
 
         #endregion
@@ -589,7 +613,7 @@ namespace GenesisCordonelInterface.API
             ProcessProgress pp,
             List<MeterStateControl> mc)
         {
-            return _innerMeterAPI.Preadjustment_Initialization(pp, mc);
+            return _innerMeterAPI?.Preadjustment_Initialization(pp, mc);
         }
 
         public Task<PreadjustmentDetectResult> PreAdjustment_DetectAsync(
@@ -641,5 +665,62 @@ namespace GenesisCordonelInterface.API
         }
 
         #endregion
+
+        #region ================================== UNI DATA STORAGE READER ==================================
+
+        //LoginPasswords reading
+
+        /// <summary>
+        /// Reads meter login password from configured GCI data storage.
+        /// </summary>
+        /// <param name="query">
+        /// Data query containing PCB ID or another configured lookup value.
+        /// </param>
+        /// <param name="token">
+        /// Cancellation token used to cancel the asynchronous operation.
+        /// </param>
+        /// <returns>
+        /// Password if found; otherwise null.
+        /// </returns>
+        public Task<string> ReadMeterLoginPasswordAsync(
+            DataQuery query,
+            CancellationToken token = default)
+        {
+            return loginPasswordsReader.ReadMeterLoginPasswordAsync(
+                query,
+                token);
+        }
+
+        //CalibrationParams reading
+
+        /// <summary>
+        /// Reads pre-adjustment calibration parameters
+        /// from configured GCI data storage.
+        /// </summary>
+        /// <param name="query">
+        /// Data query containing meter size or another configured lookup value.
+        /// </param>
+        /// <param name="token">
+        /// Cancellation token used to cancel the asynchronous operation.
+        /// </param>
+        /// <returns>
+        /// Dictionary:
+        ///
+        /// Key:
+        ///     Calibration parameter name
+        ///
+        /// Value:
+        ///     Calibration parameter value
+        /// </returns>
+        public Task<Dictionary<string, string>> ReadPreAdjustmentCalibrationParamsAsync(
+            DataQuery query,
+            CancellationToken token = default)
+        {
+            return calibrationParamsReader.ReadCalibrationParamsAsync(
+                query,
+                token);
+        }
+
+        #endregion
     }
 }