CHANGELOG.md

+## [5.0.5](https://gitlab.ics.muni.cz/perun-proxy-aai/java/perun-spRegistration-app/compare/v5.0.4...v5.0.5) (2023-04-11)
+
+
+### Bug Fixes
+
+* 🐛 Enable request rejection in approval process ([052bdd5](https://gitlab.ics.muni.cz/perun-proxy-aai/java/perun-spRegistration-app/commit/052bdd50f3d171ebe2da44ffb4f6c233b785261a))
+
 ## [5.0.4](https://gitlab.ics.muni.cz/perun-proxy-aai/java/perun-spRegistration-app/compare/v5.0.3...v5.0.4) (2023-04-11)
 
 

gui/package-lock.json

@@ -47,7 +47,7 @@
         "@angular/language-service": "14.2.12",
         "@nrwl/eslint-plugin-nx": "14.8.8",
         "@nrwl/workspace": "14.8.8",
-        "@types/node": "18.15.3",
+        "@types/node": "18.15.11",
         "@typescript-eslint/eslint-plugin": "5.55.0",
         "@typescript-eslint/parser": "5.55.0",
         "eslint": "8.36.0",
@@ -58,7 +58,7 @@
         "eslint-plugin-prettier": "4.2.1",
         "eslint-plugin-promise": "6.1.1",
         "nx": "15.0.13",
-        "prettier": "2.8.4",
+        "prettier": "2.8.7",
         "typescript": "4.8.4"
       }
     },
@@ -6263,9 +6263,9 @@
       "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
     },
     "node_modules/@types/node": {
-      "version": "18.15.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz",
-      "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw=="
+      "version": "18.15.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
+      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
@@ -17726,9 +17726,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
-      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz",
+      "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==",
       "devOptional": true,
       "bin": {
         "prettier": "bin-prettier.js"
@@ -25240,9 +25240,9 @@
       "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
     },
     "@types/node": {
-      "version": "18.15.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz",
-      "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw=="
+      "version": "18.15.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
+      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="
     },
     "@types/parse-json": {
       "version": "4.0.0",
@@ -33351,9 +33351,9 @@
       "devOptional": true
     },
     "prettier": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
-      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz",
+      "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==",
       "devOptional": true
     },
     "prettier-linter-helpers": {

gui/package.json

@@ -54,7 +54,7 @@
     "@angular/language-service": "14.2.12",
     "@nrwl/eslint-plugin-nx": "14.8.8",
     "@nrwl/workspace": "14.8.8",
-    "@types/node": "18.15.3",
+    "@types/node": "18.15.11",
     "@typescript-eslint/eslint-plugin": "5.55.0",
     "@typescript-eslint/parser": "5.55.0",
     "eslint": "8.36.0",
@@ -65,7 +65,7 @@
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-promise": "6.1.1",
     "nx": "15.0.13",
-    "prettier": "2.8.4",
+    "prettier": "2.8.7",
     "typescript": "4.8.4"
   }
 }

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>cz.metacentrum.perun</groupId>
     <artifactId>spRegistration</artifactId>
-    <version>5.0.4</version>
+    <version>5.0.5</version>
     <packaging>war</packaging>
 
     <name>perun-spRegistration</name>

src/main/java/cz/metacentrum/perun/spRegistration/service/impl/RequestsServiceImpl.java

@@ -470,12 +470,12 @@ public class RequestsServiceImpl implements RequestsService {
         RequestDTO request = requestManager.getRequestById(requestId);
         if (request == null) {
             throw new InternalErrorException("Could not fetch request with ID: " + requestId + " from database");
-        } else if (!hasCorrectStatus(request.getStatus(), new RequestStatus[] {WAITING_FOR_APPROVAL, WAITING_FOR_CHANGES})) {
+        } else if (!hasCorrectStatus(request.getStatus(),
+            new RequestStatus[] {WAITING_FOR_APPROVAL, WAITING_FOR_CHANGES, IN_APPROVAL_PROCESS})
+        ) {
             throw new CannotChangeStatusException("Cannot reject request, request is not in valid status");
         }
 
-        RequestStatus oldStatus = request.getStatus();
-
         request.setStatus(REJECTED);
         request.setModifiedAt(new Timestamp(System.currentTimeMillis()));
         request.setModifiedBy(user.getId());
@@ -496,12 +496,10 @@ public class RequestsServiceImpl implements RequestsService {
         RequestDTO request = requestManager.getRequestById(requestId);
         if (request == null) {
             throw new InternalErrorException("Could not fetch request with ID: " + requestId + " from database");
-        } else if (!hasCorrectStatus(request.getStatus(), new RequestStatus[] {WAITING_FOR_APPROVAL, WAITING_FOR_CHANGES})) {
+        } else if (!hasCorrectStatus(request.getStatus(), new RequestStatus[] {WAITING_FOR_APPROVAL, WAITING_FOR_CHANGES, IN_APPROVAL_PROCESS})) {
             throw new CannotChangeStatusException("Cannot ask for changes, request not marked as WFA nor WFC");
         }
 
-        RequestStatus oldStatus = request.getStatus();
-
         request.updateAttributes(attributes, false, applicationBeans);
         request.setStatus(WAITING_FOR_CHANGES);
         request.setModifiedBy(user.getId());