[LMS-2285] added predicate implementation to ensure the correct set of...

[LMS-2285] added predicate implementation to ensure the correct set of permissions when updating data sets from Jython dropboxes

SVN: 21518

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AtomicOperationsPredicate.java

@@ -24,6 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.authorization.RoleWithIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewExperiment;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
 import ch.systemsx.cisd.openbis.generic.shared.dto.AtomicEntityOperationDetails;
+import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetUpdatesDTO;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentUpdatesDTO;
 import ch.systemsx.cisd.openbis.generic.shared.dto.NewExternalData;
 import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
@@ -134,7 +135,11 @@ public class AtomicOperationsPredicate extends AbstractPredicate<AtomicEntityOpe
             }
             if (result.equals(Status.OK))
             {
-                result = evaluateDataSetsPredicate();
+                result = evaluateDataSetRegistrationsPredicate();
+            }
+            if (result.equals(Status.OK))
+            {
+                result = evaluateDataSetUpdatesPredicate();
             }
 
             return result;
@@ -203,25 +208,28 @@ public class AtomicOperationsPredicate extends AbstractPredicate<AtomicEntityOpe
             return Status.OK;
         }
 
-        private Status evaluateDataSetsPredicate()
+        private Status evaluateDataSetRegistrationsPredicate()
         {
             for (NewExternalData newExternalData : value.getDataSetRegistrations())
             {
-                Status status;
-                SampleIdentifier sampleIdentifier = newExternalData.getSampleIdentifierOrNull();
-                if (null != sampleIdentifier)
-                {
-                    status =
-                            predicate.sampleOwnerIdentifierPredicate.doEvaluation(person,
-                                    allowedRoles, sampleIdentifier);
-                } else
+                Status status =
+                        evaluateDataSetPredicate(newExternalData.getSampleIdentifierOrNull(),
+                                newExternalData.getExperimentIdentifierOrNull());
+                if (status.equals(Status.OK) == false)
                 {
-                    ExperimentIdentifier experimentIdentifier =
-                            newExternalData.getExperimentIdentifierOrNull();
-                    status =
-                            predicate.experimentOwnerIdentifierPredicate.doEvaluation(person,
-                                    allowedRoles, experimentIdentifier);
+                    return status;
                 }
+            }
+            return Status.OK;
+        }
+
+        private Status evaluateDataSetUpdatesPredicate()
+        {
+            for (DataSetUpdatesDTO dataSetUpdate : value.getDataSetUpdates())
+            {
+                Status status =
+                        evaluateDataSetPredicate(dataSetUpdate.getSampleIdentifierOrNull(),
+                                dataSetUpdate.getExperimentIdentifierOrNull());
                 if (status.equals(Status.OK) == false)
                 {
                     return status;
@@ -229,5 +237,23 @@ public class AtomicOperationsPredicate extends AbstractPredicate<AtomicEntityOpe
             }
             return Status.OK;
         }
+
+        private Status evaluateDataSetPredicate(SampleIdentifier sampleIdentifier,
+                ExperimentIdentifier experimentIdentifier)
+        {
+            Status status;
+            if (null != sampleIdentifier)
+            {
+                status =
+                        predicate.sampleOwnerIdentifierPredicate.doEvaluation(person,
+                                allowedRoles, sampleIdentifier);
+            } else
+            {
+                status =
+                        predicate.experimentOwnerIdentifierPredicate.doEvaluation(person,
+                                allowedRoles, experimentIdentifier);
+            }
+            return status;
+        }
     }
 }