Adapt to split group update endpoints from VerticallySpinningFish (#9)

Copilot · FabiPunktExe · web-flow · commit b3499863671a · 2025-10-29T10:48:20.000+01:00
* Initial plan

* Initial plan for API endpoint update

Co-authored-by: FabiPunktExe &lt;66797305+FabiPunktExe@users.noreply.github.com&gt;

* Adapt API to split group update endpoints

Co-authored-by: FabiPunktExe &lt;66797305+FabiPunktExe@users.noreply.github.com&gt;

* Refactor group update handlers to reduce code duplication

Co-authored-by: FabiPunktExe &lt;66797305+FabiPunktExe@users.noreply.github.com&gt;

---------

Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
Co-authored-by: FabiPunktExe &lt;66797305+FabiPunktExe@users.noreply.github.com&gt;
diff --git a/composeApp/src/commonMain/kotlin/diruptio/aquarium/ui/GroupView.kt b/composeApp/src/commonMain/kotlin/diruptio/aquarium/ui/GroupView.kt
@@ -20,7 +20,6 @@ import diruptio.aquarium.ui.component.Headline
 import diruptio.aquarium.ui.component.Table
 import diruptio.aquarium.ui.component.Title
 import diruptio.verticallyspinningfish.Group
-import diruptio.verticallyspinningfish.GroupUpdateRequest
 import diruptio.verticallyspinningfish.Status
 import diruptio.verticallyspinningfish.VerticallySpinningFishApi
 import kotlinx.coroutines.CoroutineScope
@@ -96,7 +95,7 @@ fun GroupView(
                             Row {
                                 IconButton(onClick = {
                                     coroutineScope.launch {
-                                        api.updateGroup(GroupUpdateRequest(name = group.name, minCount = minCount.toIntOrNull() ?: 0))
+                                        api.updateGroupMinCount(group.name, minCount.toIntOrNull() ?: 0)
                                         editing = false
                                     }
                                 }) {
@@ -150,7 +149,7 @@ fun GroupView(
                             Row {
                                 IconButton(onClick = {
                                     coroutineScope.launch {
-                                        api.updateGroup(GroupUpdateRequest(name = group.name, minPort = minPort.toIntOrNull() ?: 0))
+                                        api.updateGroupMinPort(group.name, minPort.toIntOrNull() ?: 0)
                                         editing = false
                                     }
                                 }) {
@@ -188,7 +187,7 @@ fun GroupView(
                         Checkbox(checked = deleteOnStop, onCheckedChange = { deleteOnStop = it })
                         IconButton(onClick = {
                             coroutineScope.launch {
-                                api.updateGroup(GroupUpdateRequest(name = group.name, deleteOnStop = deleteOnStop))
+                                api.updateGroupDeleteOnStop(group.name, deleteOnStop)
                                 editing = false
                             }
                         }) {
@@ -225,7 +224,7 @@ fun GroupView(
                             Row {
                                 IconButton(onClick = {
                                     coroutineScope.launch {
-                                        api.updateGroup(GroupUpdateRequest(name = group.name, tags = tags.lines().map { it.trim() }.filter { it.isNotEmpty() }.toSet()))
+                                        api.updateGroupTags(group.name, tags.lines().map { it.trim() }.filter { it.isNotEmpty() }.toSet())
                                         editing = false
                                     }
                                 }) {
diff --git a/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupDeleteOnStopUpdate.kt b/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupDeleteOnStopUpdate.kt
@@ -0,0 +1,9 @@
+package diruptio.verticallyspinningfish
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GroupDeleteOnStopUpdate(
+    val name: String,
+    val deleteOnStop: Boolean
+)
diff --git a/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupDeleteOnStopUpdateRequest.kt b/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupDeleteOnStopUpdateRequest.kt
@@ -0,0 +1,9 @@
+package diruptio.verticallyspinningfish
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GroupDeleteOnStopUpdateRequest(
+    val name: String,
+    val deleteOnStop: Boolean
+)
diff --git a/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupMinCountUpdate.kt b/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupMinCountUpdate.kt
@@ -0,0 +1,9 @@
+package diruptio.verticallyspinningfish
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GroupMinCountUpdate(
+    val name: String,
+    val minCount: Int
+)
diff --git a/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupMinCountUpdateRequest.kt b/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupMinCountUpdateRequest.kt
@@ -0,0 +1,9 @@
+package diruptio.verticallyspinningfish
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GroupMinCountUpdateRequest(
+    val name: String,
+    val minCount: Int
+)
diff --git a/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupMinPortUpdate.kt b/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupMinPortUpdate.kt
@@ -3,4 +3,7 @@ package diruptio.verticallyspinningfish
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class GroupUpdate(val group: Group)
+data class GroupMinPortUpdate(
+    val name: String,
+    val minPort: Int
+)
diff --git a/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupMinPortUpdateRequest.kt b/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupMinPortUpdateRequest.kt
@@ -0,0 +1,9 @@
+package diruptio.verticallyspinningfish
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GroupMinPortUpdateRequest(
+    val name: String,
+    val minPort: Int
+)
diff --git a/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupTagsUpdate.kt b/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupTagsUpdate.kt
@@ -0,0 +1,9 @@
+package diruptio.verticallyspinningfish
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GroupTagsUpdate(
+    val name: String,
+    val tags: Set<String>
+)
diff --git a/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupTagsUpdateRequest.kt b/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupTagsUpdateRequest.kt
@@ -0,0 +1,9 @@
+package diruptio.verticallyspinningfish
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GroupTagsUpdateRequest(
+    val name: String,
+    val tags: Set<String>
+)
diff --git a/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupUpdateRequest.kt b/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/GroupUpdateRequest.kt
diff --git a/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/VerticallySpinningFishApi.kt b/composeApp/src/commonMain/kotlin/diruptio/verticallyspinningfish/VerticallySpinningFishApi.kt
@@ -142,15 +142,32 @@ class VerticallySpinningFishApi(clientEngine: HttpClientEngine,
                     try { listener(update) } catch (_: Throwable) {}
                 }
             }
-            "group_update" -> {
-                val update = Json.decodeFromString<GroupUpdate>(data)
-                val group = groups.find { it.name == update.group.name }
-                if (group != null) {
-                    groups = groups - group + update.group
-                    groupUpdateListeners.forEach { listener ->
-                        try { listener(update.group) } catch (_: Throwable) {}
-                    }
-                }
+            "group_min_count" -> {
+                val update = Json.decodeFromString<GroupMinCountUpdate>(data)
+                updateGroupProperty(update.name) { it.copy(minCount = update.minCount) }
+            }
+            "group_min_port" -> {
+                val update = Json.decodeFromString<GroupMinPortUpdate>(data)
+                updateGroupProperty(update.name) { it.copy(minPort = update.minPort) }
+            }
+            "group_delete_on_stop" -> {
+                val update = Json.decodeFromString<GroupDeleteOnStopUpdate>(data)
+                updateGroupProperty(update.name) { it.copy(deleteOnStop = update.deleteOnStop) }
+            }
+            "group_tags" -> {
+                val update = Json.decodeFromString<GroupTagsUpdate>(data)
+                updateGroupProperty(update.name) { it.copy(tags = update.tags) }
+            }
+        }
+    }
+
+    private fun updateGroupProperty(groupName: String, updateFn: (Group) -> Group) {
+        val group = groups.find { it.name == groupName }
+        if (group != null) {
+            val updatedGroup = updateFn(group)
+            groups = groups - group + updatedGroup
+            groupUpdateListeners.forEach { listener ->
+                try { listener(updatedGroup) } catch (_: Throwable) {}
             }
         }
     }
@@ -225,14 +242,47 @@ class VerticallySpinningFishApi(clientEngine: HttpClientEngine,
         }
     }
 
-    suspend fun updateGroup(group: GroupUpdateRequest) {
+    suspend fun updateGroupMinCount(name: String, minCount: Int) {
+        try {
+            httpClient.patch("$baseUrl/group/min-count") {
+                contentType(ContentType.Application.Json)
+                setBody(GroupMinCountUpdateRequest(name, minCount))
+            }
+        } catch (e: Exception) {
+            println("Failed to update min-count of group $name: ${e.message}")
+        }
+    }
+
+    suspend fun updateGroupMinPort(name: String, minPort: Int) {
+        try {
+            httpClient.patch("$baseUrl/group/min-port") {
+                contentType(ContentType.Application.Json)
+                setBody(GroupMinPortUpdateRequest(name, minPort))
+            }
+        } catch (e: Exception) {
+            println("Failed to update min-port of group $name: ${e.message}")
+        }
+    }
+
+    suspend fun updateGroupDeleteOnStop(name: String, deleteOnStop: Boolean) {
+        try {
+            httpClient.patch("$baseUrl/group/delete-on-stop") {
+                contentType(ContentType.Application.Json)
+                setBody(GroupDeleteOnStopUpdateRequest(name, deleteOnStop))
+            }
+        } catch (e: Exception) {
+            println("Failed to update delete-on-stop of group $name: ${e.message}")
+        }
+    }
+
+    suspend fun updateGroupTags(name: String, tags: Set<String>) {
         try {
-            httpClient.patch("$baseUrl/group") {
+            httpClient.patch("$baseUrl/group/tags") {
                 contentType(ContentType.Application.Json)
-                setBody(group)
+                setBody(GroupTagsUpdateRequest(name, tags))
             }
         } catch (e: Exception) {
-            println("Failed to update group ${group.name}: ${e.message}")
+            println("Failed to update tags of group $name: ${e.message}")
         }
     }
 }
diff --git a/gradlew b/gradlew
