From bbd7d8b567905195c1070fd1c831cc990b1de9e0 Mon Sep 17 00:00:00 2001
From: SierraJC <7351311+SierraJC@users.noreply.github.com>
Date: Sat, 23 Nov 2024 13:11:48 +1100
Subject: [PATCH] fix: move servers API `delete_unused_*` properties

correct location from API response is in server.settings
---
 app/Models/Server.php        |  2 --
 app/Models/ServerSetting.php |  2 ++
 openapi.json                 | 16 ++++++++--------
 openapi.yaml                 | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index 2a9e926ed..cb9def688 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -42,8 +42,6 @@ use Symfony\Component\Yaml\Yaml;
         'validation_logs' => ['type' => 'string', 'description' => 'The validation logs.'],
         'log_drain_notification_sent' => ['type' => 'boolean', 'description' => 'The flag to indicate if the log drain notification has been sent.'],
         'swarm_cluster' => ['type' => 'string', 'description' => 'The swarm cluster configuration.'],
-        'delete_unused_volumes' => ['type' => 'boolean', 'description' => 'The flag to indicate if the unused volumes should be deleted.'],
-        'delete_unused_networks' => ['type' => 'boolean', 'description' => 'The flag to indicate if the unused networks should be deleted.'],
         'settings' => ['$ref' => '#/components/schemas/ServerSetting'],
     ]
 )]
diff --git a/app/Models/ServerSetting.php b/app/Models/ServerSetting.php
index fc2c5a0f4..e078372e2 100644
--- a/app/Models/ServerSetting.php
+++ b/app/Models/ServerSetting.php
@@ -45,6 +45,8 @@ use OpenApi\Attributes as OA;
         'wildcard_domain' => ['type' => 'string'],
         'created_at' => ['type' => 'string'],
         'updated_at' => ['type' => 'string'],
+        'delete_unused_volumes' => ['type' => 'boolean', 'description' => 'The flag to indicate if the unused volumes should be deleted.'],
+        'delete_unused_networks' => ['type' => 'boolean', 'description' => 'The flag to indicate if the unused networks should be deleted.'],
     ]
 )]
 class ServerSetting extends Model
diff --git a/openapi.json b/openapi.json
index 479b0b9d6..2ec218438 100644
--- a/openapi.json
+++ b/openapi.json
@@ -7449,14 +7449,6 @@
                         "type": "string",
                         "description": "The swarm cluster configuration."
                     },
-                    "delete_unused_volumes": {
-                        "type": "boolean",
-                        "description": "The flag to indicate if the unused volumes should be deleted."
-                    },
-                    "delete_unused_networks": {
-                        "type": "boolean",
-                        "description": "The flag to indicate if the unused networks should be deleted."
-                    },
                     "settings": {
                         "$ref": "#\/components\/schemas\/ServerSetting"
                     }
@@ -7567,6 +7559,14 @@
                     },
                     "updated_at": {
                         "type": "string"
+                    },
+                    "delete_unused_volumes": {
+                        "type": "boolean",
+                        "description": "The flag to indicate if the unused volumes should be deleted."
+                    },
+                    "delete_unused_networks": {
+                        "type": "boolean",
+                        "description": "The flag to indicate if the unused networks should be deleted."
                     }
                 },
                 "type": "object"
diff --git a/openapi.yaml b/openapi.yaml
index 178da5ca0..2a22c730c 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -4973,12 +4973,6 @@ components:
         swarm_cluster:
           type: string
           description: 'The swarm cluster configuration.'
-        delete_unused_volumes:
-          type: boolean
-          description: 'The flag to indicate if the unused volumes should be deleted.'
-        delete_unused_networks:
-          type: boolean
-          description: 'The flag to indicate if the unused networks should be deleted.'
         settings:
           $ref: '#/components/schemas/ServerSetting'
       type: object
@@ -5053,6 +5047,12 @@ components:
           type: string
         updated_at:
           type: string
+        delete_unused_volumes:
+          type: boolean
+          description: 'The flag to indicate if the unused volumes should be deleted.'
+        delete_unused_networks:
+          type: boolean
+          description: 'The flag to indicate if the unused networks should be deleted.'
       type: object
     Service:
       description: 'Service model'