Merge pull request #4067 from kofzera/delete_applications_bulk

feat(core): delete applications method

Author: bodnara

perun-openapi/openapi.yml

@@ -16401,6 +16401,23 @@ paths:
         default:
           $ref: '#/components/responses/ExceptionResponse'
 
+
+  /urlinjsonout/registrarManager/deleteApplications:
+    post:
+      tags:
+        - RegistrarManager
+      operationId: deleteApplications
+      summary: Manually deletes multiple applications at once.
+      description: |
+        Expected to be called as a result of direct VO administrator action in the web UI.
+      parameters:
+        - $ref: '#/components/parameters/ids'
+      responses:
+        '200':
+          $ref: '#/components/responses/VoidResponse'
+        default:
+          $ref: '#/components/responses/ExceptionResponse'
+
   /json/registrarManager/sendMessage:
     post:
       tags:

perun-registrar-lib/src/main/java/cz/metacentrum/perun/registrar/RegistrarManager.java

@@ -267,6 +267,14 @@ public interface RegistrarManager {
 	 */
 	void deleteApplication(PerunSession session, Application application) throws PerunException;
 
+	/**
+	 * Manually deletes multiple applications at once. Expected to be called as a result of direct VO administrator action in the web UI.
+	 *
+	 * @param sess perun session
+	 * @param applications list of applications
+	 * @throws PerunException
+	 */
+	void deleteApplications(PerunSession sess, List<Application> applications) throws PerunException;
 
 	/**
 	 * Get page of applications for the given vo, with the given parameters

perun-registrar-lib/src/main/java/cz/metacentrum/perun/registrar/impl/RegistrarManagerImpl.java

@@ -1572,7 +1572,7 @@ public void deleteApplication(PerunSession sess, Application app) throws PerunEx
 		// lock to prevent concurrent runs
 		synchronized(runningDeleteApplication) {
 			if (runningDeleteApplication.contains(app.getId())) {
-				throw new AlreadyProcessingException("Application deletion is already processing.");
+				throw new AlreadyProcessingException("Application " + app.getId() + " deletion is already processing.");
 			} else {
 				runningDeleteApplication.add(app.getId());
 			}
@@ -1589,9 +1589,9 @@ public void deleteApplication(PerunSession sess, Application app) throws PerunEx
 
 			} else {
 				if (AppState.VERIFIED.equals(app.getState()))
-					throw new RegistrarException("Submitted application can't be deleted. Please reject the application first.");
+					throw new RegistrarException("Submitted application " + app.getId() + " can't be deleted. Please reject the application first.");
 				if (AppState.APPROVED.equals(app.getState()))
-					throw new RegistrarException("Approved application can't be deleted. Try to refresh the view to see changes.");
+					throw new RegistrarException("Approved application " + app.getId() + " can't be deleted. Try to refresh the view to see changes.");
 			}
 			perun.getAuditer().log(sess, new ApplicationDeleted(app));
 			log.info("Application {} deleted.", app.getId());
@@ -1604,6 +1604,13 @@ public void deleteApplication(PerunSession sess, Application app) throws PerunEx
 
 	}
 
+	@Override
+	public void deleteApplications(PerunSession sess, List<Application> applications) throws PerunException {
+		for (Application app : applications) {
+			deleteApplication(sess, app);
+		}
+	}
+
 	@Override
 	public Application verifyApplication(PerunSession sess, int appId) throws PerunException {
 

perun-registrar-lib/src/test/java/cz/metacentrum/perun/registrar/RegistrarBaseIntegrationTest.java

@@ -1250,6 +1250,35 @@ public void testHandleGroupApplications() throws PerunException {
 		assertEquals(user, group1Apps.get(0).getUser());
 	}
 
+	@Test
+	public void testDeleteApplications() throws PerunException {
+		User user1 = new User(-1, "User1", "Test1", "", "", "");
+		User user2 = new User(-2, "User2", "Test2", "", "", "");
+		User user3 = new User(-3, "User3", "Test3", "", "", "");
+		user1 = perun.getUsersManagerBl().createUser(session, user1);
+		user2 = perun.getUsersManagerBl().createUser(session, user2);
+		user3 = perun.getUsersManagerBl().createUser(session, user3);
+
+		Application application1 = prepareApplicationToVo(user1);
+		Application application2 = prepareApplicationToVo(user2);
+		Application application3 = prepareApplicationToVo(user3);
+		registrarManager.submitApplication(session, application1, new ArrayList<>());
+		registrarManager.submitApplication(session, application2, new ArrayList<>());
+		registrarManager.submitApplication(session, application3, new ArrayList<>());
+
+
+		application1.setState(Application.AppState.REJECTED);
+		application2.setState(Application.AppState.REJECTED);
+		application3.setState(Application.AppState.REJECTED);
+
+
+		registrarManager.deleteApplications(session, List.of(application1, application2));
+
+		List<Integer> applicationIds = registrarManager.getApplicationsForVo(session, vo, List.of("APPROVED", "NEW", "VERIFIED", "REJECTED"), false).stream().map(Application::getId).toList();
+		assertEquals(1, applicationIds.size());
+		assertThat(applicationIds).containsOnly(application3.getId());
+	}
+
 	@Test
 	public void testRejectApplicationsAfterMemberRemoval() throws PerunException {
 		GroupsManagerBl groupsManager = perun.getGroupsManagerBl();

perun-rpc/src/main/java/cz/metacentrum/perun/rpc/methods/RegistrarManagerMethod.java

@@ -840,6 +840,30 @@ public Object call(ApiCaller ac, Deserializer parms) throws PerunException {
 
 	},
 
+
+	/*#
+	 * Manually delete multiple applications at once.
+	 * Expected to be called as a result of direct VO administrator action in the web UI.
+	 *
+	 * @param ids int[] List of Application IDs
+	 */
+	deleteApplications {
+
+		@Override
+		public Void call(ApiCaller ac, Deserializer parms) throws PerunException {
+			parms.stateChangingCheck();
+
+			List<Application> applications = new ArrayList<>();
+			List<Integer> appIds = parms.readList("ids", Integer.class);
+			for (Integer id : appIds) {
+				applications.add(ac.getRegistrarManager().getApplicationById(ac.getSession(), id));
+			}
+			ac.getRegistrarManager().deleteApplications(ac.getSession(), applications);
+			return null;
+		}
+
+	},
+
 	/*#
 	 * Manually approves an application.
 	 * Expected to be called as a result of direct VO administrator action in the web UI.