From abd15849010c9feb36d8b7634ec36d1c3080c7d6 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 9 Mar 2021 12:46:56 +0100
Subject: [PATCH] Fixed RemoveFromContext operation and forced ConsistsOf
 RemoveConstraint

---
 .../instances/model/entities/ResourceManagement.java      | 4 +++-
 .../instances/model/relations/ConsistsOfManagement.java   | 2 +-
 .../instances/model/relations/RelationManagement.java     | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java
index 75ab093..ec4648a 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java
@@ -405,7 +405,9 @@ public class ResourceManagement extends EntityManagement<Resource, ResourceType>
 		
 		// In case of a resource is deleted due to cascade effect is look like is the entry point
 		// of the operation and the sanity check is not required. The Resource and all its facets are deleted. 
-		if(sanityCheckNotRequired || (entryPoint && operation == Operation.DELETE)) {
+		if( sanityCheckNotRequired || 
+			(entryPoint && 
+			(operation == Operation.DELETE || operation == Operation.REMOVE_FROM_CONTEXT) ) ) {
 			return;
 		}
 		
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/ConsistsOfManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/ConsistsOfManagement.java
index 13f065e..f9776c1 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/ConsistsOfManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/ConsistsOfManagement.java
@@ -35,7 +35,7 @@ public class ConsistsOfManagement extends RelationManagement<FacetManagement, Fa
 
 	static {
 		DEFAULT_CONSISTS_OF_PC = new PropagationConstraintImpl();
-		DEFAULT_CONSISTS_OF_PC.setRemoveConstraint(RemoveConstraint.cascadeWhenOrphan);
+		DEFAULT_CONSISTS_OF_PC.setRemoveConstraint(RemoveConstraint.cascade);
 		DEFAULT_CONSISTS_OF_PC.setAddConstraint(AddConstraint.propagate);
 	}
 	
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java
index 1b4848a..c099502 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java
@@ -17,6 +17,7 @@ import org.gcube.informationsystem.model.reference.entities.Resource;
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint.AddConstraint;
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint.RemoveConstraint;
+import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
 import org.gcube.informationsystem.model.reference.relations.Relation;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException;
@@ -286,6 +287,13 @@ public abstract class RelationManagement<T extends EntityManagement<? extends En
 			removeConstraint = defaultPropagationConstraint.getRemoveConstraint();
 			logger.warn("Unable to get {}. Default value ({}) will be used", RemoveConstraint.class.getSimpleName(),
 					removeConstraint);
+		}else {
+			if (this instanceof ConsistsOfManagement && removeConstraint == RemoveConstraint.keep) {
+				removeConstraint = defaultPropagationConstraint.getRemoveConstraint();
+				logger.warn("A {} cannot use {}.{}. Default value ({}) will be used", ConsistsOf.NAME,
+						RemoveConstraint.class.getSimpleName(), RemoveConstraint.keep, removeConstraint);
+
+			}
 		}
 		propagationConstraintOrient.setRemoveConstraint(removeConstraint);