Merge pull request #4117 from sarkapalkovicova/block_destination

fix(core): ignore already blocked destinations

Author: HejdaJakub

perun-core/src/main/java/cz/metacentrum/perun/core/api/ServicesManager.java

@@ -89,7 +89,7 @@ public interface ServicesManager {
 	 * @param richDestinations the list of rich destinations
 	 *
 	 */
-	void blockServicesOnDestinations(PerunSession perunSession, List<RichDestination> richDestinations) throws PrivilegeException, DestinationNotExistsException, ServiceAlreadyBannedException, FacilityNotExistsException;
+	void blockServicesOnDestinations(PerunSession perunSession, List<RichDestination> richDestinations) throws PrivilegeException, DestinationNotExistsException, FacilityNotExistsException;
 
 	/**
 	 * Block all services currently assigned on this facility.

perun-core/src/main/java/cz/metacentrum/perun/core/entry/ServicesManagerEntry.java

@@ -98,9 +98,12 @@ public void blockServiceOnDestination(PerunSession sess, Service service, int de
 	}
 
 	@Override
-	public void blockServicesOnDestinations(PerunSession sess, List<RichDestination> richDestinations) throws PrivilegeException, DestinationNotExistsException, ServiceAlreadyBannedException, FacilityNotExistsException {
+	public void blockServicesOnDestinations(PerunSession sess, List<RichDestination> richDestinations) throws PrivilegeException, DestinationNotExistsException, FacilityNotExistsException {
 		for (RichDestination richDestination : richDestinations) {
-			blockServiceOnDestination(sess, richDestination.getService(), richDestination.getId());
+			try {
+				blockServiceOnDestination(sess, richDestination.getService(), richDestination.getId());
+			} catch (ServiceAlreadyBannedException ignored) {
+			}
 		}
 	}
 

perun-core/src/test/java/cz/metacentrum/perun/core/entry/ServicesManagerEntryIntegrationTest.java

@@ -1192,6 +1192,31 @@ public void blockAndUnblockServiceOnDestinations() throws Exception {
 		assertFalse("Service should NOT be blocked on the richDestination3", perun.getServicesManager().isServiceBlockedOnDestination(sess, service2, destination3.getId()));
 	}
 
+	@Test
+	public void blockServiceOnDestinationsAndIgnoreAlreadyBlocked() throws Exception {
+		System.out.println(CLASS_NAME + "blockServiceOnDestinationsAndIgnoreAlreadyBlocked");
+
+		facility = setUpFacility();
+		service = setUpService();
+		List<Destination> destinations = setUpDestinations();
+
+		Destination destination1 = perun.getServicesManager().addDestination(sess, service, facility, destinations.get(0));
+		RichDestination richDestination1 = new RichDestination(destination1, facility, service);
+		Destination destination2 = perun.getServicesManager().addDestination(sess, service, facility, destinations.get(1));
+		RichDestination richDestination2 = new RichDestination(destination2, facility, service);
+
+		List<RichDestination> serviceDestinations = perun.getServicesManagerBl().getAllRichDestinations(sess, facility);
+		assertTrue(serviceDestinations.contains(richDestination1));
+		assertTrue( serviceDestinations.contains(richDestination2));
+
+		perun.getServicesManager().blockServiceOnDestination(sess, service, richDestination1.getId());
+		assertTrue(perun.getServicesManager().isServiceBlockedOnDestination(sess, service, richDestination1.getId()));
+
+		List<RichDestination> destinationsToBlock = Arrays.asList(richDestination1, richDestination2);
+		perun.getServicesManager().blockServicesOnDestinations(sess, destinationsToBlock);
+		assertTrue(perun.getServicesManager().isServiceBlockedOnDestination(sess, service, richDestination2.getId()));
+	}
+
 	@Test
 	public void blockAndUnblockServicesOnFacility() throws Exception {
 		System.out.println(CLASS_NAME + "blockAndUnblockServicesOnFacility");