Code cleanup

Author: michielpost

HueEntertainmentPro.Services/ProAreaDataService.cs

@@ -2,6 +2,7 @@
 using HueEntertainmentPro.Database.Models;
 using HueEntertainmentPro.Services.Extensions;
 using HueEntertainmentPro.Shared.Interfaces;
+using HueEntertainmentPro.Shared.Models;
 using HueEntertainmentPro.Shared.Models.Requests;
 using Microsoft.EntityFrameworkCore;
 using ProtoBuf.Grpc;
@@ -42,7 +43,12 @@ public class ProAreaDataService(HueEntertainmentProDbContext dbContext) : IProAr
 
       await dbContext.SaveChangesAsync();
 
-      return await GetProArea(new GuidRequest { Id = proArea.Id }, context);
+      var area = await GetProArea(new GuidRequest { Id = proArea.Id }, context);
+      if (area == null)
+      {
+        throw new NullReferenceException($"Area is null. Id: {proArea.Id}");
+      }
+      return area;
     }
 
     public async Task DeleteBridgeGroup(GuidRequest req, CallContext context = default)
@@ -78,12 +84,17 @@ public async Task DeleteProArea(GuidRequest req, CallContext context = default)
         await dbContext.SaveChangesAsync();
       }
 
-      return await GetProArea(new GuidRequest { Id = req.Id }, context);
+      var area = await GetProArea(new GuidRequest { Id = req.Id }, context);
+      if (area == null)
+      {
+        throw new NullReferenceException($"Area is null. Id: {req.Id}");
+      }
+      return area;
     }
 
     public async Task<HueEntertainmentPro.Shared.Models.ProArea> CreateProArea(CreateProAreaRequest req, CallContext context = default)
     {
-      var newArea = new ProArea
+      var newArea = new Database.Models.ProArea
       {
         Id = Guid.NewGuid(),
         Name = req.Name,
@@ -93,11 +104,16 @@ public async Task DeleteProArea(GuidRequest req, CallContext context = default)
       dbContext.ProAreas.Add(newArea);
       await dbContext.SaveChangesAsync();
 
-      return await GetProArea(new GuidRequest { Id = newArea.Id }, context);
+      var area =  await GetProArea(new GuidRequest { Id = newArea.Id }, context);
+      if(area == null)
+      {
+        throw new NullReferenceException($"Area is null. Id: {newArea.Id}");
+      }
+      return area;
 
     }
 
-    public async Task<HueEntertainmentPro.Shared.Models.ProArea> GetProArea(GuidRequest req, CallContext context = default)
+    public async Task<HueEntertainmentPro.Shared.Models.ProArea?> GetProArea(GuidRequest req, CallContext context = default)
     {
       if (req.Id == demo1Id)
       {
@@ -159,8 +175,9 @@ public async Task DeleteProArea(GuidRequest req, CallContext context = default)
       var area = await dbContext.ProAreas
         .Include(x => x.ProAreaBridgeGroups).ThenInclude(bg => bg.Bridge)
         .FirstOrDefaultAsync(pa => pa.Id == req.Id);
+
       if (area == null)
-        return null!;
+        return null;
 
       return area.ToApiModel();
     }

HueEntertainmentPro/Client/Pages/AddBridgeDialog.razor

@@ -18,7 +18,7 @@
                                Height="150px"
                                Label="Discovered IP Addresses"
                                OptionValue="@(i => i.BridgeId)"
-                           ValueChanged="@(async (string id) => await OnBridgeIdSelected(id))">
+                           ValueChanged="@(async (string id) => OnBridgeIdSelected(id))">
                       <OptionTemplate>
                           @context.IpAddress
                       </OptionTemplate>
@@ -101,17 +101,6 @@
         await DiscoverIps();
     }
 
-    private async Task OnModeChanged()
-    {
-        ErrorMessage = string.Empty;
-        BridgeConfig = new HueBridgeConfig();
-        // if (ConfigurationMode == "Discover")
-        // {
-        //     await DiscoverIps();
-        // }
-        StateHasChanged();
-    }
-
     private async Task DiscoverIps()
     {
         try
@@ -125,7 +114,7 @@
         StateHasChanged();
     }
 
-    private async Task OnBridgeIdSelected(string bridgeId)
+    private void OnBridgeIdSelected(string bridgeId)
     {
         var selected = DiscoveredIps.FirstOrDefault(b => b.BridgeId == bridgeId);
         if (selected == null)
@@ -192,7 +181,7 @@
                         return;
                     }
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     ErrorMessage = "Failed to connect to bridge with the values provided.";
                     StateHasChanged();

HueEntertainmentPro/Shared/Interfaces/IBridgeDataService.cs

@@ -15,7 +15,7 @@ public interface IBridgeDataService
     Task<Bridge?> GetBridge(GuidRequest req, CallContext context = default);
 
     [OperationContract]
-    Task<Bridge?> AddBridge(AddBridgeRequest req, CallContext context = default);
+    Task<Bridge> AddBridge(AddBridgeRequest req, CallContext context = default);
 
     [OperationContract]
     Task<Bridge?> UpdateBridge(UpdateBridgeRequest req, CallContext context = default);

HueLightDJ.Services/HueSetupService.cs

@@ -39,7 +39,7 @@ public async Task<EntertainmentGroupResult> GetEntertainmentGroupsAsync(HueSetup
           ErrorMessage = "Unauthorized. Please check if your key is correct."
         };
       }
-      catch (Exception ex)
+      catch (Exception)
       {
         return new EntertainmentGroupResult()
         {
@@ -92,7 +92,7 @@ public async Task<IEnumerable<LocatedBridge>> LocateBridgesAsync(CallContext con
           ErrorMessage = "Link button not pressed. Please press the link button on the bridge and try again."
         };
       }
-      catch(Exception ex)
+      catch(Exception)
       {
         return new Interfaces.Models.RegisterEntertainmentResult()
         {

HueLightDJ.Services/LightDJService.cs

@@ -66,26 +66,23 @@ public Task StartGroupEffect(StartEffectRequest request, CallContext context = d
       return Task.CompletedTask;
     }
 
-    public Task IncreaseBPM(IntRequest req, CallContext context = default)
+    public async Task IncreaseBPM(IntRequest req, CallContext context = default)
     {
-      streamingSetup.IncreaseBPM(req.Value);
-      return GetStatus();
-
+      await streamingSetup.IncreaseBPM(req.Value);
+      await GetStatus();
     }
 
-    public Task SetBPM(IntRequest req, CallContext context = default)
+    public async Task SetBPM(IntRequest req, CallContext context = default)
     {
-      streamingSetup.SetBPM(req.Value);
-      return GetStatus();
-
+      await streamingSetup.SetBPM(req.Value);
+      await GetStatus();
     }
 
     public Task SetBri(DoubleRequest req, CallContext context = default)
     {
       var filterValue = 100 - req.Value;
 
-      streamingSetup.SetBrightnessFilter(filterValue);
-      return Task.CompletedTask;
+      return streamingSetup.SetBrightnessFilter(filterValue);
     }