Remove name prefix from entities

LordMike · LordMike · commit 5975f0d8f46d · 2023-08-08T19:43:18.000+02:00
Fixes entities for HASS 2023.8
diff --git a/MBW.BlueRiiot2MQTT/Features/BlueDevice/BlueDeviceFeature.cs b/MBW.BlueRiiot2MQTT/Features/BlueDevice/BlueDeviceFeature.cs
@@ -47,7 +47,7 @@ protected override void CreateSensor(SwimmingPool pool, SwimmingPoolDevice data)
                 .ConfigureDiscovery(discovery =>
                 {
                     discovery.DeviceClass = HassSensorDeviceClass.Timestamp;
-                    discovery.Name = $"{namePrefix} Last Contact";
+                    discovery.Name = "Last Contact";
                 })
                 .ConfigureAliveService();
 
@@ -60,7 +60,7 @@ protected override void CreateSensor(SwimmingPool pool, SwimmingPoolDevice data)
                 .ConfigureDevice(deviceConfigure)
                 .ConfigureDiscovery(discovery =>
                 {
-                    discovery.Name = $"{namePrefix} Status";
+                    discovery.Name = "Status";
                 })
                 .ConfigureAliveService();
         }
diff --git a/MBW.BlueRiiot2MQTT/Features/Pool/Bases/PoolWeatherFeatureBase.cs b/MBW.BlueRiiot2MQTT/Features/Pool/Bases/PoolWeatherFeatureBase.cs
@@ -32,7 +32,7 @@ protected sealed override void CreateSensor(SwimmingPool pool, SwimmingPoolWeath
                 .SetHassPoolProperties(pool)
                 .ConfigureDiscovery(discovery =>
                 {
-                    discovery.Name = $"{pool.Name} {_displayName}";
+                    discovery.Name = _displayName;
                     discovery.DeviceClass = _deviceClass;
                     discovery.UnitOfMeasurement = _unit;
                 })
diff --git a/MBW.BlueRiiot2MQTT/Features/Pool/PoolGuidanceFeature.cs b/MBW.BlueRiiot2MQTT/Features/Pool/PoolGuidanceFeature.cs
@@ -24,7 +24,7 @@ protected override void CreateSensor(SwimmingPool pool, SwimmingPoolGuidanceGetR
                 .SetHassPoolProperties(pool)
                 .ConfigureDiscovery(discovery =>
                 {
-                    discovery.Name = $"{pool.Name} Guidance";
+                    discovery.Name = "Guidance";
                 })
                 .ConfigureAliveService();
         }
diff --git a/MBW.BlueRiiot2MQTT/Features/Pool/PoolLastUpdateFeature.cs b/MBW.BlueRiiot2MQTT/Features/Pool/PoolLastUpdateFeature.cs
@@ -29,7 +29,7 @@ protected override void CreateSensor(SwimmingPool pool, List<SwimmingPoolLastMea
                 .SetHassPoolProperties(pool)
                 .ConfigureDiscovery(discovery =>
                 {
-                    discovery.Name = $"{pool.Name} Last Measurement";
+                    discovery.Name = "Last Measurement";
                     discovery.DeviceClass = HassSensorDeviceClass.Timestamp;
                 })
                 .ConfigureAliveService();
diff --git a/MBW.BlueRiiot2MQTT/Features/Pool/PoolMeasurementFeature.cs b/MBW.BlueRiiot2MQTT/Features/Pool/PoolMeasurementFeature.cs
@@ -47,7 +47,7 @@ protected override void CreateSensor(SwimmingPool pool, List<SwimmingPoolLastMea
                 .SetHassPoolProperties(pool)
                 .ConfigureDiscovery(discovery =>
                 {
-                    discovery.Name = $"{pool.Name} {_displayName}";
+                    discovery.Name = _displayName;
                     discovery.UnitOfMeasurement = _unit;
                     discovery.StateClass = HassStateClass.Measurement;
                 })
diff --git a/MBW.BlueRiiot2MQTT/Features/Pool/PoolMeasurementStatusFeature.cs b/MBW.BlueRiiot2MQTT/Features/Pool/PoolMeasurementStatusFeature.cs
@@ -45,7 +45,7 @@ protected override void CreateSensor(SwimmingPool pool, List<SwimmingPoolLastMea
                 .SetHassPoolProperties(pool)
                 .ConfigureDiscovery(discovery =>
                 {
-                    discovery.Name = $"{pool.Name} {_displayName}";
+                    discovery.Name = _displayName;
                 })
                 .ConfigureAliveService();
         }
diff --git a/MBW.BlueRiiot2MQTT/Features/Pool/PoolPumpFeature.cs b/MBW.BlueRiiot2MQTT/Features/Pool/PoolPumpFeature.cs
@@ -26,7 +26,7 @@ protected override void CreateSensor(SwimmingPool pool, SwimmingPool _)
                 .SetHassPoolProperties(pool)
                 .ConfigureDiscovery(discovery =>
                 {
-                    discovery.Name = $"{pool.Name} Pump Schedule";
+                    discovery.Name = "Pump Schedule";
                 })
                 .ConfigureAliveService();
         }
diff --git a/MBW.BlueRiiot2MQTT/Service/BlueRiiotMqttService.cs b/MBW.BlueRiiot2MQTT/Service/BlueRiiotMqttService.cs
@@ -116,7 +116,7 @@ private ISensorContainer CreateSystemEntities()
                 })
                 .ConfigureDiscovery(discovery =>
                 {
-                    discovery.Name = "BlueRiiot2MQTT API Operational";
+                    discovery.Name = "API Operational";
                     discovery.DeviceClass = HassBinarySensorDeviceClass.Problem;
 
                     discovery.PayloadOn = ProblemMessage;

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected override void CreateSensor(SwimmingPool pool, SwimmingPoolDevice data)`
`47`	`47`	`.ConfigureDiscovery(discovery =>`
`48`	`48`	`{`
`49`	`49`	`discovery.DeviceClass = HassSensorDeviceClass.Timestamp;`
`50`		`- discovery.Name = $"{namePrefix} Last Contact";`
	`50`	`+ discovery.Name = "Last Contact";`
`51`	`51`	`})`
`52`	`52`	`.ConfigureAliveService();`
`53`	`53`
`@@ -60,7 +60,7 @@ protected override void CreateSensor(SwimmingPool pool, SwimmingPoolDevice data)`
`60`	`60`	`.ConfigureDevice(deviceConfigure)`
`61`	`61`	`.ConfigureDiscovery(discovery =>`
`62`	`62`	`{`
`63`		`- discovery.Name = $"{namePrefix} Status";`
	`63`	`+ discovery.Name = "Status";`
`64`	`64`	`})`
`65`	`65`	`.ConfigureAliveService();`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected sealed override void CreateSensor(SwimmingPool pool, SwimmingPoolWeath`
`32`	`32`	`.SetHassPoolProperties(pool)`
`33`	`33`	`.ConfigureDiscovery(discovery =>`
`34`	`34`	`{`
`35`		`- discovery.Name = $"{pool.Name} {_displayName}";`
	`35`	`+ discovery.Name = _displayName;`
`36`	`36`	`discovery.DeviceClass = _deviceClass;`
`37`	`37`	`discovery.UnitOfMeasurement = _unit;`
`38`	`38`	`})`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected override void CreateSensor(SwimmingPool pool, SwimmingPoolGuidanceGetR`
`24`	`24`	`.SetHassPoolProperties(pool)`
`25`	`25`	`.ConfigureDiscovery(discovery =>`
`26`	`26`	`{`
`27`		`- discovery.Name = $"{pool.Name} Guidance";`
	`27`	`+ discovery.Name = "Guidance";`
`28`	`28`	`})`
`29`	`29`	`.ConfigureAliveService();`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected override void CreateSensor(SwimmingPool pool, List<SwimmingPoolLastMea`
`29`	`29`	`.SetHassPoolProperties(pool)`
`30`	`30`	`.ConfigureDiscovery(discovery =>`
`31`	`31`	`{`
`32`		`- discovery.Name = $"{pool.Name} Last Measurement";`
	`32`	`+ discovery.Name = "Last Measurement";`
`33`	`33`	`discovery.DeviceClass = HassSensorDeviceClass.Timestamp;`
`34`	`34`	`})`
`35`	`35`	`.ConfigureAliveService();`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected override void CreateSensor(SwimmingPool pool, List<SwimmingPoolLastMea`
`45`	`45`	`.SetHassPoolProperties(pool)`
`46`	`46`	`.ConfigureDiscovery(discovery =>`
`47`	`47`	`{`
`48`		`- discovery.Name = $"{pool.Name} {_displayName}";`
	`48`	`+ discovery.Name = _displayName;`
`49`	`49`	`})`
`50`	`50`	`.ConfigureAliveService();`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ protected override void CreateSensor(SwimmingPool pool, SwimmingPool _)`
`26`	`26`	`.SetHassPoolProperties(pool)`
`27`	`27`	`.ConfigureDiscovery(discovery =>`
`28`	`28`	`{`
`29`		`- discovery.Name = $"{pool.Name} Pump Schedule";`
	`29`	`+ discovery.Name = "Pump Schedule";`
`30`	`30`	`})`
`31`	`31`	`.ConfigureAliveService();`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ private ISensorContainer CreateSystemEntities()`
`116`	`116`	`})`
`117`	`117`	`.ConfigureDiscovery(discovery =>`
`118`	`118`	`{`
`119`		`- discovery.Name = "BlueRiiot2MQTT API Operational";`
	`119`	`+ discovery.Name = "API Operational";`
`120`	`120`	`discovery.DeviceClass = HassBinarySensorDeviceClass.Problem;`
`121`	`121`
`122`	`122`	`discovery.PayloadOn = ProblemMessage;`