refactor: remove unused using directives in IEssentialsRoom interface

src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs

@@ -30,6 +30,17 @@ namespace PepperDash.Essentials.Core.Bridges
         {
 
         }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="name"></param>
+        protected BridgeApi(string key, string name) :
+            base(key, name)
+        {
+
+        }
     }
 
     /// <summary>
@@ -58,7 +69,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <param name="dc">Device configuration</param>
         /// <param name="eisc">EISC instance</param>
         public EiscApiAdvanced(DeviceConfig dc, BasicTriList eisc) :
-            base(dc.Key)
+            base(dc.Key, dc.Name)
         {
             JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
 

src/PepperDash.Essentials.Core/Room/IEssentialsRoom.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Room.Config;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Devices;
 
 using PepperDash.Core;

src/PepperDash.Essentials.Core/Room/IHasDestinationList.cs

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core
+{
+
+    /// <summary>
+    /// Interface for rooms with a list of destinations
+    /// </summary>
+    public interface IHasDestinations
+    {
+        /// <summary>
+        /// Gets the dictionary of destinations.
+        /// </summary>
+        Dictionary<string, IRoutingSink> Destinations { get; }
+    }
+}

src/PepperDash.Essentials.Core/Room/IHasSourceList.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+namespace PepperDash.Essentials.Core
+{
+
+    /// <summary>
+    /// Interface for rooms with a list of destinations
+    /// </summary>
+    public interface IHasSourceList
+    {
+        /// <summary>
+        /// Gets the list of sources.
+        /// </summary>
+        Dictionary<string, SourceListItem> SourceList { get; }
+    }
+}

src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using PepperDash.Core;
+using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core.Routing
@@ -121,20 +123,16 @@ namespace PepperDash.Essentials.Core.Routing
             RoutingInputPort inputPort
         )
         {
-            Debug.LogMessage(
-                Serilog.Events.LogEventLevel.Debug,
+            this.LogDebug(
                 "Updating destination {destination} with inputPort {inputPort}",
-                this,
                 destination?.Key,
                 inputPort?.Key
             );
 
             if (inputPort == null)
             {
-                Debug.LogMessage(
-                    Serilog.Events.LogEventLevel.Debug,
+                this.LogDebug(
                     "Destination {destination} has not reported an input port yet",
-                    this,
                     destination.Key
                 );
                 return;
@@ -152,10 +150,8 @@ namespace PepperDash.Essentials.Core.Routing
 
                 if (firstTieLine == null)
                 {
-                    Debug.LogMessage(
-                        Serilog.Events.LogEventLevel.Debug,
+                    this.LogDebug(
                         "No tieline found for inputPort {inputPort}. Clearing current source",
-                        this,
                         inputPort
                     );
 
@@ -166,14 +162,14 @@ namespace PepperDash.Essentials.Core.Routing
                     };
 
                     destination.CurrentSourceInfo = tempSourceListItem;
-                    ;
+                    
                     destination.CurrentSourceInfoKey = "$transient";
                     return;
                 }
             }
             catch (Exception ex)
             {
-                Debug.LogMessage(ex, "Error getting first tieline: {Exception}", this, ex);
+                this.LogException(ex, "Error getting first tieline: {Exception}",  ex.Message);
                 return;
             }
 
@@ -186,8 +182,7 @@ namespace PepperDash.Essentials.Core.Routing
 
                 if (sourceTieLine == null)
                 {
-                    Debug.LogMessage(
-                        Serilog.Events.LogEventLevel.Debug,
+                    this.LogDebug(
                         "No route found to source for inputPort {inputPort}. Clearing current source",
                         this,
                         inputPort
@@ -206,7 +201,7 @@ namespace PepperDash.Essentials.Core.Routing
             }
             catch (Exception ex)
             {
-                Debug.LogMessage(ex, "Error getting sourceTieLine: {Exception}", this, ex);
+                this.LogException(ex, "Error getting sourceTieLine: {Exception}",  ex.Message);
                 return;
             }
 
@@ -230,47 +225,71 @@ namespace PepperDash.Essentials.Core.Routing
                             return roomDefaultDisplay.DefaultDisplay.Key == destination.Key;
                         }
 
+                        if (r is IHasDestinations roomDestinationList)
+                        {
+                            return roomDestinationList.Destinations.Any(d =>
+                                d.Value.Key == destination.Key
+                            );
+                        }
+
+                        var destList = ConfigReader.ConfigObject.GetDestinationListForKey(r.DestinationListKey);
+
                         return false;
                     }
                 );
 
             if (room == null)
             {
-                Debug.LogMessage(
-                    Serilog.Events.LogEventLevel.Debug,
+                this.LogDebug(
                     "No room found for display {destination}",
-                    this,
                     destination.Key
                 );
                 return;
             }
 
-            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found room {room} for destination {destination}", this, room.Key, destination.Key);
+            this.LogVerbose("Found room {room} for destination {destination}", room.Key, destination.Key);
 
-            var sourceList = ConfigReader.ConfigObject.GetSourceListForKey(room.SourceListKey);
+            Dictionary<string, SourceListItem> sourceList = null;
+
+            if (room is IHasSourceList roomWithSourceList)
+            {
+                sourceList = roomWithSourceList.SourceList;
+            }
+            else
+            {
+                sourceList = ConfigReader.ConfigObject.GetSourceListForKey(room.SourceListKey);
+            }
 
             if (sourceList == null)
             {
-                Debug.LogMessage(
-                    Serilog.Events.LogEventLevel.Debug,
+                this.LogDebug(
                     "No source list found for source list key {key}. Unable to find source for tieLine {sourceTieLine}",
-                    this,
                     room.SourceListKey,
                     sourceTieLine
                 );
                 return;
             }
 
-            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found sourceList for room {room}", this, room.Key);
+            this.LogVerbose("Found sourceList for room {room}", room.Key);
+
+            if (sourceTieLine.SourcePort?.ParentDevice == null)
+            {
+                this.LogDebug(
+                    "********SourcePort or ParentDevice is null for tieLine. Unable to find source for destination {destination}.",
+                    destination.Key
+                );
+                return;
+            }
 
             var sourceListItem = sourceList.FirstOrDefault(sli =>
             {
-                //// Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose,
-                //   "SourceListItem {sourceListItem}:{sourceKey} tieLine sourceport device key {sourcePortDeviceKey}",
-                //   this,
-                //   sli.Key,
-                //   sli.Value.SourceKey,
-                //   sourceTieLine.SourcePort.ParentDevice.Key);
+                if (sli.Value == null) return false;
+
+                this.LogVerbose(
+                  "********SourceListItem {sourceListItem}:{sourceKey} tieLine sourceport device key {sourcePortDeviceKey}",
+                  sli.Key,
+                  sli.Value.SourceKey,
+                  sourceTieLine.SourcePort.ParentDevice.Key);
 
                 return sli.Value.SourceKey.Equals(
                     sourceTieLine.SourcePort.ParentDevice.Key,
@@ -283,12 +302,10 @@ namespace PepperDash.Essentials.Core.Routing
 
             if (source == null)
             {
-                Debug.LogMessage(
-                    Serilog.Events.LogEventLevel.Debug,
+                this.LogDebug(
                     "No source found for device {key}. Creating transient source for {destination}",
-                    this,
                     sourceTieLine.SourcePort.ParentDevice.Key,
-                    destination
+                    destination.Key
                 );
 
                 var tempSourceListItem = new SourceListItem
@@ -302,7 +319,7 @@ namespace PepperDash.Essentials.Core.Routing
                 return;
             }
 
-            //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Got Source {@source} with key {sourceKey}", this, source, sourceKey);
+            this.LogVerbose("Got Source {@source} with key {sourceKey}", source, sourceKey);
 
             destination.CurrentSourceInfoKey = sourceKey;
             destination.CurrentSourceInfo = source;