Fix #31016: allow to stop stopping app

LEDfan · LEDfan · commit 84726f8aae54 · 2023-07-10T14:34:39.000+02:00
diff --git a/src/main/java/eu/openanalytics/containerproxy/api/ProxyStatusController.java b/src/main/java/eu/openanalytics/containerproxy/api/ProxyStatusController.java
@@ -140,11 +140,8 @@ public ResponseEntity<ApiResponse<Void>> changeProxyStatus(@PathVariable String
                 return ApiResponse.fail(ex.getMessage());
             }
         } else if (changeProxyStateDto.getDesiredState().equals("Stopping")) {
-            if (!proxy.getStatus().equals(ProxyStatus.New)
-                    && !proxy.getStatus().equals(ProxyStatus.Up)
-                    && !proxy.getStatus().equals(ProxyStatus.Resuming)
-                    && !proxy.getStatus().equals(ProxyStatus.Paused)) {
-                return ApiResponse.fail(String.format("Cannot stop proxy because it is not in New, Up or Paused status (status is %s)", proxy.getStatus()));
+            if (proxy.getStatus().equals(ProxyStatus.Stopped)) {
+                return ApiResponse.fail("Cannot stop proxy because it is already stopped");
             }
             asyncProxyService.stopProxy(proxy, false);
         } else {

Original file line number	Diff line number	Diff line change
`@@ -140,11 +140,8 @@ public ResponseEntity<ApiResponse<Void>> changeProxyStatus(@PathVariable String`
`140`	`140`	`return ApiResponse.fail(ex.getMessage());`
`141`	`141`	`}`
`142`	`142`	`} else if (changeProxyStateDto.getDesiredState().equals("Stopping")) {`
`143`		`- if (!proxy.getStatus().equals(ProxyStatus.New)`
`144`		`- && !proxy.getStatus().equals(ProxyStatus.Up)`
`145`		`- && !proxy.getStatus().equals(ProxyStatus.Resuming)`
`146`		`- && !proxy.getStatus().equals(ProxyStatus.Paused)) {`
`147`		`- return ApiResponse.fail(String.format("Cannot stop proxy because it is not in New, Up or Paused status (status is %s)", proxy.getStatus()));`
	`143`	`+ if (proxy.getStatus().equals(ProxyStatus.Stopped)) {`
	`144`	`+ return ApiResponse.fail("Cannot stop proxy because it is already stopped");`
`148`	`145`	`}`
`149`	`146`	`asyncProxyService.stopProxy(proxy, false);`
`150`	`147`	`} else {`