Simplify mapping

Author: hhvrc

LiveControlGateway/LifetimeManager/HubLifetime.cs

@@ -256,16 +256,7 @@ private async ValueTask DeviceMessageControl(DeviceControlPayload control)
             return;
         }
 
-        await Control([
-            ..control.Controls.Select(cmd => new ShockerCommand
-            {
-                Model = FlatbuffersMappers.ToFbsModelType(cmd.Model),
-                Id = cmd.RfId,
-                Type = FlatbuffersMappers.ToFbsCommandType(cmd.Type),
-                Intensity = cmd.Intensity,
-                Duration = cmd.Duration
-            })
-        ]);
+        await Control(control.Controls.Select(FbsMapper.ToFbsShockerCommand).ToArray());
     }
 
     /// <summary>
@@ -349,9 +340,9 @@ private async Task Update()
             .Where(kvp => kvp.Value.ActiveUntil < now || kvp.Value.ExclusiveUntil >= now)
             .Select(kvp => new ShockerCommand
             {
-                Model = FlatbuffersMappers.ToFbsModelType(kvp.Value.Model),
+                Model = FbsMapper.ToFbsModelType(kvp.Value.Model),
                 Id = kvp.Value.RfId,
-                Type = FlatbuffersMappers.ToFbsCommandType(kvp.Value.LastType),
+                Type = FbsMapper.ToFbsCommandType(kvp.Value.LastType),
                 Intensity = kvp.Value.LastIntensity,
                 Duration = _commandDuration,
             })

LiveControlGateway/LifetimeManager/HubLifetimeManager.cs

@@ -223,14 +223,7 @@ public async Task RemoveDeviceConnection(IHubController hubController)
         IReadOnlyList<DeviceControlPayload.ShockerControlInfo> shocks)
     {
         if (!_lifetimes.TryGetValue(device, out var deviceLifetime)) return new DeviceNotFound();
-        await deviceLifetime.Control([.. shocks.Select(shock => new ShockerCommand
-            {
-                Model = FlatbuffersMappers.ToFbsModelType(shock.Model),
-                Id = shock.RfId,
-                Type = FlatbuffersMappers.ToFbsCommandType(shock.Type),
-                Intensity = shock.Intensity,
-                Duration = shock.Duration
-            })]);
+        await deviceLifetime.Control(shocks.Select(FbsMapper.ToFbsShockerCommand).ToArray());
         return new Success();
     }
 

…rolGateway/Mappers/FlatbuffersMappers.cs LiveControlGateway/Mappers/FbsMapper.csLiveControlGateway/Mappers/FlatbuffersMappers.cs renamed to LiveControlGateway/Mappers/FbsMapper.cs LiveControlGateway/Mappers/FlatbuffersMappers.cs renamed to LiveControlGateway/Mappers/FbsMapper.cs

@@ -1,9 +1,11 @@
 using OpenShock.Common.Models;
+using OpenShock.Common.Redis.PubSub;
+using OpenShock.Serialization.Gateway;
 using OpenShock.Serialization.Types;
 
 namespace OpenShock.LiveControlGateway.Mappers;
 
-public static class FlatbuffersMappers
+public static class FbsMapper
 {
     public static Serialization.Types.ShockerModelType ToFbsModelType(Common.Models.ShockerModelType type)
     {
@@ -27,4 +29,16 @@ public static ShockerCommandType ToFbsCommandType(ControlType type)
             _ => throw new NotImplementedException(),
         };
     }
+
+    public static ShockerCommand ToFbsShockerCommand(DeviceControlPayload.ShockerControlInfo control)
+    {
+        return new ShockerCommand
+        {
+            Model = ToFbsModelType(control.Model),
+            Id = control.RfId,
+            Type = ToFbsCommandType(control.Type),
+            Intensity = control.Intensity,
+            Duration = control.Duration
+        };
+    }
 }