Merge pull request #4072 from sarkapalkovicova/reject_applications_bulk

feat(core): reject applications method

Author: HejdaJakub

perun-openapi/openapi.yml

@@ -16387,6 +16387,23 @@ paths:
         default:
           $ref: '#/components/responses/ExceptionResponse'
 
+  /urlinjsonout/registrarManager/rejectApplications:
+    post:
+      tags:
+        - RegistrarManager
+      operationId: rejectApplications
+      summary: Manually rejects 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'
+        - { name: reason, schema: { type: string }, in: query, description: "description of reason", required: false }
+      responses:
+        '200':
+          $ref: '#/components/responses/VoidResponse'
+        default:
+          $ref: '#/components/responses/ExceptionResponse'
+
   /urlinjsonout/registrarManager/deleteApplication:
     post:
       tags:

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

@@ -420,6 +420,16 @@ public interface RegistrarManager {
 	 */
 	Application rejectApplication(PerunSession session, int appId, String reason) throws PerunException;
 
+	/**
+	 * Manually rejects 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 applicationIds list of application IDs
+	 * @param reason optional reason of rejection displayed to user
+	 * @throws PerunException
+	 */
+	void rejectApplications(PerunSession sess, List<Integer> applicationIds, String reason) throws PerunException;
+
 	/**
 	 * Returns data submitted by user in given application (by id)
 	 *

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

@@ -1641,7 +1641,7 @@ public Application verifyApplication(PerunSession sess, int appId) throws PerunE
 	public Application rejectApplication(PerunSession sess, int appId, String reason) throws PerunException {
 
 		Application app = getApplicationById(appId);
-		if (app == null) throw new RegistrarException("Application with ID="+appId+" doesn't exists.");
+		if (app == null) throw new RegistrarException("Application with ID=" + appId + " doesn't exists.");
 
 		//Authorization
 		if (app.getGroup() == null) {
@@ -1656,15 +1656,15 @@ public Application rejectApplication(PerunSession sess, int appId, String reason
 
 		// only VERIFIED applications can be rejected
 		if (AppState.APPROVED.equals(app.getState())) {
-			throw new RegistrarException("Approved application can't be rejected ! Try to refresh the view to see changes.");
+			throw new RegistrarException("Approved application " + appId + " can't be rejected ! Try to refresh the view to see changes.");
 		} else if (AppState.REJECTED.equals(app.getState())) {
-			throw new RegistrarException("Application is already rejected. Try to refresh the view to see changes.");
+			throw new RegistrarException("Application " + appId + " is already rejected. Try to refresh the view to see changes.");
 		}
 
 		// lock to prevent concurrent runs
 		synchronized(runningRejectApplication) {
 			if (runningRejectApplication.contains(appId)) {
-				throw new AlreadyProcessingException("Application rejection is already processing.");
+				throw new AlreadyProcessingException("Application " + appId + " rejection is already processing.");
 			} else {
 				runningRejectApplication.add(appId);
 			}
@@ -1731,6 +1731,15 @@ public Application rejectApplication(PerunSession sess, int appId, String reason
 
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void rejectApplications(PerunSession sess, List<Integer> applicationIds, String reason) throws PerunException {
+		Collections.sort(applicationIds, Collections.reverseOrder());
+		for (Integer id : applicationIds) {
+			rejectApplication(sess, id, reason);
+		}
+	}
+
 	/**
 	 * Deletes reserved logins which are used only by the given application.
 	 * Deletes them from both KDC and DB.

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

@@ -1306,6 +1306,47 @@ public void testRejectApplicationsAfterMemberRemoval() throws PerunException {
 		assertEquals(1, group1Apps.size());
 	}
 
+	@Test
+	public void testRejectApplications() throws PerunException {
+		User user1 = new User(1, "User1", "Test1", "", "", "");
+		User user2 = new User(2, "User2", "Test2", "", "", "");
+		user1 = perun.getUsersManagerBl().createUser(session, user1);
+		user2 = perun.getUsersManagerBl().createUser(session, user2);
+
+		Application application1 = prepareApplicationToVo(user1);
+		application1 = registrarManager.submitApplication(session, application1, new ArrayList<>());
+
+		Application application2 = prepareApplicationToVo(user2);
+		application2.setCreatedBy("perunTests2");
+		application2 = registrarManager.submitApplication(session, application2, new ArrayList<>());
+
+		registrarManager.rejectApplications(session, new ArrayList<>(Arrays.asList(application1.getId(), application2.getId())), null);
+
+		List<Integer> rejectedAppIdsVO = registrarManager.getApplicationsForVo(session, vo, List.of("REJECTED"), false).stream().map(Application::getId).toList();
+		assertThat(rejectedAppIdsVO).containsOnly(application1.getId(), application2.getId());
+	}
+
+	@Test
+	public void testRejectApplicationsOrder() throws PerunException {
+		User user = new User(1, "User1", "Test1", "", "", "");
+		user = perun.getUsersManagerBl().createUser(session, user);
+
+		Group group = new Group("Test", "Test group");
+		perun.getGroupsManagerBl().createGroup(session, vo, group);
+		registrarManager.createApplicationFormInGroup(session, group);
+
+		Application applicationToVo = prepareApplicationToVo(user);
+		applicationToVo = registrarManager.submitApplication(session, applicationToVo, new ArrayList<>());
+
+		Application applicationToGroup = prepareApplicationToGroup(user, group);
+		applicationToGroup = registrarManager.submitApplication(session, applicationToGroup, new ArrayList<>());
+
+		registrarManager.rejectApplications(session, new ArrayList<>(Arrays.asList(applicationToVo.getId(), applicationToGroup.getId())), null);
+
+		List<Integer> rejectedAppIds = registrarManager.getApplicationsForVo(session, vo, List.of("REJECTED"), true).stream().map(Application::getId).toList();
+		assertThat(rejectedAppIds).containsOnly(applicationToVo.getId(), applicationToGroup.getId());
+	}
+
 	private Application prepareApplicationToVo(User user) {
 		Application application = new Application();
 		application.setVo(vo);

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

@@ -949,6 +949,35 @@ public Application call(ApiCaller ac, Deserializer parms) throws PerunException
 
 	},
 
+	/*#
+	 * Manually rejects 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
+	 */
+	/*#
+	 * Manually rejects multiple applications at once with a reason.
+	 * Expected to be called as a result of direct VO administrator action in the web UI.
+	 *
+	 * @param ids int[] List of Application IDs
+	 * @param reason String Reason description
+	 */
+	rejectApplications {
+
+		@Override
+		public Application call(ApiCaller ac, Deserializer parms) throws PerunException {
+			parms.stateChangingCheck();
+
+			if (parms.contains("reason")) {
+				ac.getRegistrarManager().rejectApplications(ac.getSession(), parms.readList("ids", Integer.class), parms.readString("reason"));
+			} else {
+				ac.getRegistrarManager().rejectApplications(ac.getSession(), parms.readList("ids", Integer.class), null);
+			}
+
+			return null;
+		}
+	},
+
 	/*#
 	 * Forcefully marks application as verified
 	 * (only when application was in NEW state)