Merge pull request #3593 from ControlSystemStudio/CSSTUDIO-3512

Ensure that unique ids are set when updating objects

Author: shroffk

services/save-and-restore/src/main/java/org/phoebus/service/saveandrestore/persistence/dao/impl/elasticsearch/ElasticsearchDAO.java

@@ -703,6 +703,7 @@ public Configuration updateConfiguration(Configuration configuration) {
         // Update last modified date
         existingConfigurationNode = updateNode(existingConfigurationNode, false);
 
+        configuration.getConfigurationData().setUniqueId(configuration.getConfigurationNode().getUniqueId());
         ConfigurationData updatedConfigurationData = configurationDataRepository.save(configuration.getConfigurationData());
 
         return Configuration.builder()
@@ -761,6 +762,7 @@ public Snapshot updateSnapshot(Snapshot snapshot) {
         SnapshotData newSnapshotData;
         Snapshot newSnapshot = new Snapshot();
         try {
+            snapshot.getSnapshotData().setUniqueId(snapshot.getSnapshotNode().getUniqueId());
             newSnapshotData = snapshotDataRepository.save(snapshot.getSnapshotData());
             Node updatedNode = updateNode(existingSnapshotNode, false);
             newSnapshot.setSnapshotData(newSnapshotData);
@@ -1030,6 +1032,7 @@ public CompositeSnapshot updateCompositeSnapshot(CompositeSnapshot compositeSnap
         existingCompositeSnapshotNode.setLastModified(new Date());
         existingCompositeSnapshotNode = updateNode(existingCompositeSnapshotNode, false);
 
+        compositeSnapshot.getCompositeSnapshotData().setUniqueId(compositeSnapshot.getCompositeSnapshotNode().getUniqueId());
         CompositeSnapshotData updatedCompositeSnapshotData =
                 compositeSnapshotDataRepository.save(compositeSnapshot.getCompositeSnapshotData());
 

services/save-and-restore/src/test/java/org/phoebus/service/saveandrestore/persistence/dao/impl/DAOTestIT.java

@@ -400,6 +400,7 @@ public void testUpdateCompositeSnapshot() {
         assertEquals(compositeSnapshotNode.getUniqueId(), compositeSnapshot.getCompositeSnapshotNode().getUniqueId());
         assertEquals("Updated name", compositeSnapshot.getCompositeSnapshotNode().getName());
         assertEquals("Updated description", compositeSnapshot.getCompositeSnapshotNode().getDescription());
+        assertEquals(compositeSnapshotNode.getUniqueId(), compositeSnapshot.getCompositeSnapshotData().getUniqueId());
         assertEquals(2, compositeSnapshot.getCompositeSnapshotData().getReferencedSnapshotNodes().size());
 
         nodeDAO.deleteNodes(List.of(compositeSnapshot.getCompositeSnapshotNode().getUniqueId()));
@@ -563,6 +564,7 @@ public void testUpdateSnapshot() {
         snapshotNode = snapshot.getSnapshotNode();
         assertEquals("other snapshot name", snapshotNode.getName());
         assertEquals("other comment", snapshotNode.getDescription());
+        assertEquals(snapshot.getSnapshotNode().getUniqueId(), snapshot.getSnapshotData().getUniqueId());
 
     }
 
@@ -810,8 +812,11 @@ public void testUpdateConfig() throws Exception {
         configuration.setConfigurationData(configurationData);
 
         configuration = nodeDAO.updateConfiguration(configuration);
+
+        assertEquals(configuration.getConfigurationNode().getUniqueId(), configuration.getConfigurationData().getUniqueId());
         // Verify the list of PVs
         assertEquals(3, configuration.getConfigurationData().getPvList().size());
+
     }
 
     @Test