SSDM-4910: Set dataset modification time when a copy is added / removed

SVN: 38210

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AddContentCopiesToLinkedDataExecutor.java

 package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -19,6 +20,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ContentCopyPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataManagementSystemPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.LinkDataPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.LocationType;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
+import ch.systemsx.cisd.openbis.generic.shared.util.RelationshipUtils;
 
 @Component
 public class AddContentCopiesToLinkedDataExecutor implements IAddContentCopiesToLinkedDataExecutor
@@ -86,6 +89,10 @@ public class AddContentCopiesToLinkedDataExecutor implements IAddContentCopiesTo
             entity.setContentCopies(new HashSet<ContentCopyPE>());
         }
         entity.getContentCopies().addAll(contentCopies);
+
+        Date timeStamp = daoFactory.getTransactionTimestamp();
+        PersonPE person = context.getSession().tryGetPerson();
+        RelationshipUtils.updateModificationDateAndModifier(entity, person, timeStamp);
     }
 
     private LocationType getLocationType(ContentCopyCreation ccc, ExternalDataManagementSystemPE edms)

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExternalDmsExecutor.java

@@ -16,6 +16,7 @@
 
 package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -31,11 +32,14 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.entity.AbstractUpdateEntityToOneRelationExecutor;
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms.IMapExternalDmsByIdExecutor;
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ContentCopyPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataManagementSystemPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.LinkDataPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.LocationType;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
+import ch.systemsx.cisd.openbis.generic.shared.util.RelationshipUtils;
 
 /**
  * @author pkupczyk
@@ -46,6 +50,9 @@ public class UpdateDataSetExternalDmsExecutor extends
         IUpdateDataSetExternalDmsExecutor
 {
 
+    @Autowired
+    private IDAOFactory daoFactory;
+
     @Autowired
     private IMapExternalDmsByIdExecutor mapExternalDmsByIdExecutor;
 
@@ -129,6 +136,10 @@ public class UpdateDataSetExternalDmsExecutor extends
                     }
 
                     next.setExternalDataManagementSystem(related);
+
+                    Date timeStamp = daoFactory.getTransactionTimestamp();
+                    PersonPE person = context.getSession().tryGetPerson();
+                    RelationshipUtils.updateModificationDateAndModifier(entity, person, timeStamp);
                 } else
                 {
                     throw new UserFailureException("Cannot set external data management system to content copy of type " + next.getLocationType());

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetLinkedDataExecutor.java

@@ -17,6 +17,7 @@
 package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -36,6 +37,8 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ContentCopyPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.LinkDataPE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
+import ch.systemsx.cisd.openbis.generic.shared.util.RelationshipUtils;
 
 /**
  * @author pkupczyk
@@ -124,6 +127,10 @@ public class UpdateDataSetLinkedDataExecutor implements IUpdateDataSetLinkedData
 
             addContentCopiesToLinkedDataExecutor.add(context, entity, update.getContentCopies().getAdded());
         }
+
+        Date timeStamp = daoFactory.getTransactionTimestamp();
+        PersonPE person = context.getSession().tryGetPerson();
+        RelationshipUtils.updateModificationDateAndModifier(entity, person, timeStamp);
     }
 
     private void assertAllRemovalsExists(LinkDataPE entity, LinkedDataUpdate update)

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateLinkDataSetTest.java

@@ -3,7 +3,9 @@ package ch.ethz.sis.openbis.systemtest.asapi.v3;
 import static org.hamcrest.CoreMatchers.both;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.lessThan;
 
+import java.util.Date;
 import java.util.List;
 
 import org.hamcrest.Matchers;
@@ -127,7 +129,7 @@ public class UpdateLinkDataSetTest extends AbstractLinkDataSetTest
         ContentCopyPermId ccid = new ContentCopyPermId(uuid());
         update(dataset(id).without(ccid));
     }
-    
+
     @Test
     void removeAllCopies()
     {
@@ -264,4 +266,66 @@ public class UpdateLinkDataSetTest extends AbstractLinkDataSetTest
 
         update(dataset(id).withExternalDms(dms));
     }
+
+    @Test
+    void modificationTimeIsUpdatedWhenCopyIsAdded()
+    {
+        ExternalDmsPermId dms = create(externalDms());
+        DataSetPermId id = create(linkDataSet().with(copyAt(dms)));
+        Date mod1 = get(id).getModificationDate();
+
+        update(dataset(id).withNewCopies(copyAt(dms)));
+
+        Date mod2 = get(id).getModificationDate();
+        assertThat(mod1, lessThan(mod2));
+    }
+
+    @Test
+    void modificationTimeIsUpdatedWhenCopyIsRemoved()
+    {
+        String removed = uuid();
+        String stays = uuid();
+
+        ExternalDmsPermId dms = create(externalDms());
+        DataSetPermId id = create(linkDataSet().with(copyAt(dms).withExternalCode(removed), copyAt(dms).withExternalCode(stays)));
+        DataSet dataSet = get(id);
+        Date mod1 = dataSet.getModificationDate();
+
+        List<ContentCopy> contentCopies = dataSet.getLinkedData().getContentCopies();
+        ContentCopyPermId removedId =
+                contentCopies.get(0).getExternalCode().equals(removed) ? contentCopies.get(0).getId() : contentCopies.get(1).getId();
+        update(dataset(id).without(removedId));
+
+        Date mod2 = get(id).getModificationDate();
+        assertThat(mod1, lessThan(mod2));
+    }
+
+    @Test
+    void modificationTimeIsUpdatedWhenSettingLegacyExternalCode()
+    {
+        ExternalDmsPermId dms = create(externalDms().withType(ExternalDmsAddressType.URL));
+        DataSetPermId id = create(linkDataSet().with(copyAt(dms)));
+        Date mod1 = get(id).getModificationDate();
+
+        String code = uuid();
+        update(dataset(id).withExternalCode(code));
+
+        Date mod2 = get(id).getModificationDate();
+        assertThat(mod1, lessThan(mod2));
+    }
+
+    @Test
+    void modificationTimeIsUpdatedWhenSettingLegacyExternalDms()
+    {
+        ExternalDmsPermId dms1 = create(externalDms().withType(ExternalDmsAddressType.URL));
+        ExternalDmsPermId dms2 = create(externalDms().withType(ExternalDmsAddressType.OPENBIS));
+
+        DataSetPermId id = create(linkDataSet().with(copyAt(dms1)));
+        Date mod1 = get(id).getModificationDate();
+
+        update(dataset(id).withExternalDms(dms2));
+
+        Date mod2 = get(id).getModificationDate();
+        assertThat(mod1, lessThan(mod2));
+    }
 }