Fix C# Code

ESPresense · Feb 15, 2025 · b67f6f1 · b67f6f1
1 parent ac4583d
commit b67f6f1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 87 deletions.
diff --git a/src/Controllers/DeviceController.cs b/src/Controllers/DeviceController.cs
@@ -19,7 +19,7 @@ public DeviceController(ILogger<DeviceController> logger, DeviceSettingsStore de
             _state = state;
         }
 
-        [HttpGet("{id}")]
+        [HttpGet("{id}/settings")]
         public DeviceSettingsDetails Get(string id)
         {
             var deviceSettings = _deviceSettingsStore.Get(id);
@@ -29,7 +29,7 @@ public DeviceSettingsDetails Get(string id)
             return new DeviceSettingsDetails(deviceSettings ?? new DeviceSettings { Id = id, OriginalId = id }, details);
         }
 
-        [HttpPut("{id}")]
+        [HttpPut("{id}/settings")]
         public async Task Set(string id, [FromBody] DeviceSettings value)
         {
             await _deviceSettingsStore.Set(id, value);

diff --git a/src/Controllers/NodeController.cs b/src/Controllers/NodeController.cs
@@ -9,18 +9,18 @@ namespace ESPresense.Controllers;
 [ApiController]
 public class NodeController(NodeSettingsStore nodeSettingsStore, State state) : ControllerBase
 {
-    [HttpGet("{id}")]
+    [HttpGet("{id}/settings")]
     public NodeSettingsDetails Get(string id)
     {
         var nodeSettings = nodeSettingsStore.Get(id);
         var details = new List<KeyValuePair<string, string>>();
         if (nodeSettings?.Id != null && state.Nodes.TryGetValue(id, out var node))
             details.AddRange(node.GetDetails());
-        return new NodeSettingsDetails(nodeSettings ?? new NodeSettings(id), details);
+        return new NodeSettingsDetails(nodeSettings ?? new Models.NodeSettings(id), details);
     }
 
-    [HttpPut("{id}")]
-    public Task Set(string id, [FromBody] NodeSettings ds)
+    [HttpPut("{id}/settings")]
+    public Task Set(string id, [FromBody] Models.NodeSettings ds)
     {
         Log.Information("Set {id} {@ds}", id, ds);
         return nodeSettingsStore.Set(id, ds);
@@ -38,5 +38,5 @@ public async Task Restart(string id)
         await nodeSettingsStore.Restart(id);
     }
 
-    public readonly record struct NodeSettingsDetails(NodeSettings? settings, IList<KeyValuePair<string, string>> details);
+    public readonly record struct NodeSettingsDetails(Models.NodeSettings? settings, IList<KeyValuePair<string, string>> details);
 }
diff --git a/src/Controllers/SettingsController.cs b/src/Controllers/SettingsController.cs
diff --git a/src/Services/NodeSettingsStore.cs b/src/Services/NodeSettingsStore.cs
@@ -21,12 +21,12 @@ private static bool ParseBool(string value)
         }
         private readonly ConcurrentDictionary<string, NodeSettings> _storeById = new();
 
-        public NodeSettings Get(string id)
+        public Models.NodeSettings Get(string id)
         {
-            return _storeById.TryGetValue(id, out var ns) ? ns.Clone() : new NodeSettings(id);
+            return _storeById.TryGetValue(id, out var ns) ? ns.Clone() : new Models.NodeSettings(id);
         }
 
-        public async Task Set(string id, NodeSettings ds)
+        public async Task Set(string id, Models.NodeSettings ns)
         {
             var retain = id == "*";
             var old = Get(id);

diff --git a/src/ui/src/lib/stores.ts b/src/ui/src/lib/stores.ts
@@ -156,13 +156,13 @@ export const settings = (() => {
 		set,
 		update,
 		load: async () => {
-			const response = await fetch(`${base}/api/settings`);
+			const response = await fetch(`${base}/api/node/*/settings`);
 			if (!response.ok) throw new Error("Something went wrong loading settings (error="+response.status+" "+response.statusText+")");
 			const data = await response.json();
 			set(data);
 		},
 		save: async (newSettings: Settings) => {
-			const response = await fetch(`${base}/api/settings`, {
+			const response = await fetch(`${base}/api/node/*/settings`, {
 				method: 'POST',
 				headers: {
 					'Content-Type': 'application/json',