Fixed all Solution warnings and messages

hagronnestad · Sep 14, 2023 · d624b5f · d624b5f
1 parent cb4a043
commit d624b5f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/Dirigera.Lib/Dirigera.Lib/Api/ApiClient.cs b/Dirigera.Lib/Dirigera.Lib/Api/ApiClient.cs
@@ -1,4 +1,4 @@
-using Dirigera.Lib.Api.Dto;
+using Dirigera.Lib.Api.Dto;
 using Dirigera.Lib.Api.Dto.Base;
 using System.Net;
 using System.Net.Http.Headers;
@@ -14,7 +14,7 @@ internal class ApiClient
         private const string PKCE_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~";
 
         private readonly string _ip;
-        private string _apiBaseUrl;
+        private readonly string _apiBaseUrl;
         private string? _authToken;
 
         public string? AuthToken
@@ -29,7 +29,7 @@ public string? AuthToken
             }
         }
 
-        private HttpClient _httpClient;
+        private readonly HttpClient _httpClient;
 
         public ApiClient(string ip, string? authToken = null)
         {
@@ -81,7 +81,7 @@ public async Task<bool> CheckAuthToken()
             return res;
         }
 
-        public async Task<T> GetDevice<T>(string id)
+        public async Task<T?> GetDevice<T>(string id)
         {
             string url = $"{_apiBaseUrl}/devices/{id}";
             var res = await _httpClient.GetFromJsonAsync<T>(url);

diff --git a/Dirigera.Lib/Dirigera.Lib/DirigeraManager.cs b/Dirigera.Lib/Dirigera.Lib/DirigeraManager.cs
@@ -1,4 +1,4 @@
-using Dirigera.Lib.Api;
+using Dirigera.Lib.Api;
 using Dirigera.Lib.Api.Dto.Base;
 using Dirigera.Lib.Constants;
 using Dirigera.Lib.Devices;
@@ -71,19 +71,14 @@ private async Task GetDevices()
 
         private Device CreateDeviceByType(DeviceDto dto)
         {
-            switch (dto.DeviceType)
+            return dto.DeviceType switch
             {
-                case DeviceType.LIGHT:
-                    return new Light(this, dto);
-                case DeviceType.BLINDS:
-                    return new Blind(this, dto);
-                case DeviceType.OUTLET:
-                    return new Outlet(this, dto);
-                case DeviceType.ENVIRONMENT_SENSORS:
-                    return new EnvironmentSensor(this, dto);
-                default:
-                    return new Device(this, dto);
-            }
+                DeviceType.LIGHT => new Light(this, dto),
+                DeviceType.BLINDS => new Blind(this, dto),
+                DeviceType.OUTLET => new Outlet(this, dto),
+                DeviceType.ENVIRONMENT_SENSORS => new EnvironmentSensor(this, dto),
+                _ => new Device(this, dto),
+            };
         }
 
         private async Task GetRooms()
@@ -99,6 +94,7 @@ private async Task GetRooms()
 
         public async Task SetLightState(Light light, bool state)
         {
+            if (light is null || light.Id is null) return;
             await _apiClient.PatchAttributes(light.Id, new Dictionary<string, object>()
             {
                 { "isOn", state }
@@ -107,6 +103,7 @@ public async Task SetLightState(Light light, bool state)
 
         public async Task SetLightDimmer(Light light, int dimmer)
         {
+            if (light is null || light.Id is null) return;
             await _apiClient.PatchAttributes(light.Id, new Dictionary<string, object>()
             {
                 { "lightLevel", dimmer }
@@ -115,6 +112,7 @@ public async Task SetLightDimmer(Light light, int dimmer)
 
         public async Task SetLightColorTemperature(Light light, int colorTemperature)
         {
+            if (light is null || light.Id is null) return;
             await _apiClient.PatchAttributes(light.Id, new Dictionary<string, object>()
             {
                 { "colorTemperature", colorTemperature }
@@ -123,6 +121,7 @@ public async Task SetLightColorTemperature(Light light, int colorTemperature)
 
         public async Task SetLightColor(Light light, double hue, double saturation)
         {
+            if (light is null || light.Id is null) return;
             await _apiClient.PatchAttributes(light.Id, new Dictionary<string, object>()
             {
                 { "colorHue", hue },
@@ -188,6 +187,7 @@ public async Task SetBlind(Room room, int level)
 
         public async Task SetBlind(Blind blind, int level)
         {
+            if (blind is null || blind.Id is null) return;
             await _apiClient.PatchAttributes(blind.Id, new Dictionary<string, object>()
             {
                 { "blindsTargetLevel", level }
@@ -196,6 +196,7 @@ public async Task SetBlind(Blind blind, int level)
 
         public async Task SetOutlet(Outlet outlet, bool state)
         {
+            if (outlet is null || outlet.Id is null) return;
             await _apiClient.PatchAttributes(outlet.Id, new Dictionary<string, object>()
             {
                 { "isOn", state }