Emit notif references

src/main/java/org/gridsuite/study/server/notification/NotificationService.java

@@ -40,6 +40,7 @@ public class NotificationService {
     public static final String HEADER_NODE = "node";
     public static final String HEADER_ROOT_NETWORK_UUID = "rootNetworkUuid";
     public static final String HEADER_NODES = "nodes";
+    public static final String HEADER_NETWORK_MODIFICATION_UUIDS = "networkModificationUuids";
     public static final String HEADER_ROOT_NETWORKS_UUIDS = "rootNetworksUuids";
     public static final String HEADER_STUDY_UUID = "studyUuid";
     public static final String HEADER_UPDATE_TYPE = "updateType";
@@ -124,6 +125,7 @@ public class NotificationService {
 
     public static final String MODIFICATIONS_UPDATING_FINISHED = "UPDATE_FINISHED";
     public static final String MODIFICATIONS_DELETING_FINISHED = "DELETE_FINISHED";
+    public static final String SHARED_ELEMENT_UPDATED = "sharedElementUpdate";
 
     public static final String EVENTS_CRUD_FINISHED = "EVENT_CRUD_FINISHED";
 
@@ -471,6 +473,19 @@ public void emitModificationsDeleted(UUID studyUuid, UUID parentNodeUuid, Collec
         );
     }
 
+    /**
+     * Notifies the front that a shared element referenced by some of {@code parentNodeUuid}'s network
+     * modifications ({@code networkModificationUuids}) has changed. The front should refresh the
+     * modifications list of that node so the affected modifications display the up-to-date reference.
+     */
+    @PostCompletion
+    public void emitSharedElementUpdated(UUID studyUuid, UUID parentNodeUuid, Collection<UUID> networkModificationUuids) {
+        sendStudyUpdateMessage(studyUuid, SHARED_ELEMENT_UPDATED, MessageBuilder.withPayload("")
+                .setHeader(HEADER_PARENT_NODE, parentNodeUuid)
+                .setHeader(HEADER_NETWORK_MODIFICATION_UUIDS, networkModificationUuids)
+        );
+    }
+
     @PostCompletion
     public void emitEventsUpdated(UUID studyUuid, UUID parentNodeUuid, Collection<UUID> childrenUuids) {
         sendStudyUpdateMessage(studyUuid, EVENTS_CRUD_FINISHED, MessageBuilder.withPayload("")

src/main/java/org/gridsuite/study/server/service/ConsumerService.java

@@ -70,6 +70,7 @@ public class ConsumerService {
     private final CaseService caseService;
     private final LoadFlowRestService loadFlowRestService;
     private final NetworkModificationTreeService networkModificationTreeService;
+    private final NetworkModificationService networkModificationService;
     private final StudyConfigService studyConfigService;
     private final RootNetworkNodeInfoService rootNetworkNodeInfoService;
     private final RootNetworkService rootNetworkService;
@@ -86,6 +87,7 @@ public ConsumerService(ObjectMapper objectMapper,
                            CaseService caseService,
                            LoadFlowRestService loadFlowRestService,
                            NetworkModificationTreeService networkModificationTreeService,
+                           NetworkModificationService networkModificationService,
                            StudyConfigService studyConfigService,
                            RootNetworkNodeInfoService rootNetworkNodeInfoService,
                            RootNetworkService rootNetworkService,
@@ -101,6 +103,7 @@ public ConsumerService(ObjectMapper objectMapper,
         this.caseService = caseService;
         this.loadFlowRestService = loadFlowRestService;
         this.networkModificationTreeService = networkModificationTreeService;
+        this.networkModificationService = networkModificationService;
         this.studyConfigService = studyConfigService;
         this.rootNetworkNodeInfoService = rootNetworkNodeInfoService;
         this.rootNetworkService = rootNetworkService;
@@ -856,4 +859,32 @@ public void createCase(String s3Key, NodeExportInfos nodeExport, String userId,
     public Consumer<Message<String>> consumeNetworkExportFinished() {
         return this::consumeNetworkExportFinished;
     }
+
+    @Bean
+    public Consumer<Message<Map<ReferenceAttributes.ReferenceType, List<ReferenceAttributes>>>> consumeSharedElementUpdate() {
+        return message -> handleSharedElementUpdate(message.getPayload());
+    }
+
+    // TODO need to handle by type and not group modifications list
+    private void handleSharedElementUpdate(Map<ReferenceAttributes.ReferenceType, List<ReferenceAttributes>> referencesByType) {
+        List<UUID> studyNodeUuids = extractReferenceIds(referencesByType, ReferenceAttributes.ReferenceType.STUDY_NODE);
+        List<UUID> networkModificationUuids = extractReferenceIds(referencesByType, ReferenceAttributes.ReferenceType.NETWORK_MODIFICATION);
+
+        Set<UUID> nodeUuidsToInvalidate = new HashSet<>(studyNodeUuids);
+
+        if (!networkModificationUuids.isEmpty()) {
+            Collection<UUID> rootGroupUuids = networkModificationService.findRootGroupByModification(networkModificationUuids).values();
+            if (!rootGroupUuids.isEmpty()) {
+                nodeUuidsToInvalidate.addAll(networkModificationTreeService.getNodeUuidsByModificationGroups(List.copyOf(rootGroupUuids)).values());
+            }
+        }
+
+        nodeUuidsToInvalidate.forEach(nodeUuid -> {
+            studyService.sharedElementUpdatedNotification(nodeUuid, networkModificationUuids);
+        });
+    }
+
+    private static List<UUID> extractReferenceIds(Map<ReferenceAttributes.ReferenceType, List<ReferenceAttributes>> referencesByType, ReferenceAttributes.ReferenceType type) {
+        return referencesByType.getOrDefault(type, List.of()).stream().map(ReferenceAttributes::getReferenceId).toList();
+    }
 }

src/main/java/org/gridsuite/study/server/service/DirectoryService.java

@@ -115,7 +115,8 @@ public boolean elementExists(UUID directoryUuid, String elementName, String type
      * creates references and add them to shared composite modifications stored in directory server
      * @param elementsUuids element uuids of the shared composites in directory server
      * @param userId id of the user who creates the references
-     * @param targetReferenceUuid where the new references will point
+     * @param targetReferenceUuid where the new references will point to
+     * @param targetReferenceType type of the target the new references point to
      */
     public void createsReferencesToSharedComposites(@NonNull List<UUID> elementsUuids, String userId, UUID targetReferenceUuid, ReferenceAttributes.ReferenceType targetReferenceType) {
         // TODO : instead of multiple calls, an endpoint in directory server should be created to handle multiple references creation

src/main/java/org/gridsuite/study/server/service/NetworkModificationService.java

@@ -211,7 +211,7 @@ public NetworkModificationsResult createModification(UUID groupUuid,
         return restTemplate.exchange(path, HttpMethod.POST, httpEntity, NetworkModificationsResult.class).getBody();
     }
 
-    public void updateModification(String createEquipmentAttributes, UUID modificationUuid) {
+    public void updateModification(String createEquipmentAttributes, UUID modificationUuid, String userId) {
         Objects.requireNonNull(createEquipmentAttributes);
 
         var path = UriComponentsBuilder
@@ -221,6 +221,7 @@ public void updateModification(String createEquipmentAttributes, UUID modificati
 
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set(HEADER_USER_ID, userId);
 
         HttpEntity<String> httpEntity = new HttpEntity<>(createEquipmentAttributes, headers);
 
@@ -245,7 +246,7 @@ public void stashModifications(UUID groupUUid, List<UUID> modificationsUuids) {
         restTemplate.exchange(path, HttpMethod.PUT, httpEntity, Void.class);
     }
 
-    public void updateModificationsMetadata(UUID groupUUid, List<UUID> modificationsUuids, NetworkModificationMetadata metadata) {
+    public void updateModificationsMetadata(UUID groupUUid, List<UUID> modificationsUuids, NetworkModificationMetadata metadata, String userId) {
         Objects.requireNonNull(groupUUid);
         Objects.requireNonNull(modificationsUuids);
         var path = UriComponentsBuilder
@@ -257,6 +258,7 @@ public void updateModificationsMetadata(UUID groupUUid, List<UUID> modifications
 
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set(HEADER_USER_ID, userId);
 
         HttpEntity<NetworkModificationMetadata> httpEntity = new HttpEntity<>(metadata, headers);
         restTemplate.exchange(path, HttpMethod.PUT, httpEntity, Void.class);
@@ -330,6 +332,35 @@ public Map<UUID, UUID> findParentComposites(List<UUID> modificationsUuids) {
         ).getBody();
     }
 
+    /**
+     * Resolves, for each given modification, the modification group it ultimately belongs to.
+     * @param modificationsUuids the modifications to resolve; each may sit directly in a group or be nested
+     * inside one or more composite modifications
+     * @return a map from modification uuid to the uuid of its enclosing root group (the outermost group,
+     * found by walking up through every level of nested composite modifications). A modification that is
+     * not reachable from any group is absent from the map.
+     */
+    public Map<UUID, UUID> findRootGroupByModification(List<UUID> modificationsUuids) {
+        Objects.requireNonNull(modificationsUuids);
+        var path = UriComponentsBuilder
+                .fromUriString(getNetworkModificationServerURI(false) + COMPOSITE_PATH + "root-groups")
+                .queryParam(UUIDS, modificationsUuids)
+                .buildAndExpand()
+                .toUriString();
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        HttpEntity<Void> httpEntity = new HttpEntity<>(headers);
+
+        return restTemplate.exchange(
+                path,
+                HttpMethod.GET,
+                httpEntity,
+                new ParameterizedTypeReference<Map<UUID, UUID>>() { }
+        ).getBody();
+    }
+
     /**
      * @return references data of the modifications in the group :
      * - element uuid in directory server

src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java

@@ -1460,4 +1460,10 @@ public UUID getNodeUuidByModificationGroup(UUID groupUuid) {
         var node = networkModificationNodeInfoRepository.findByModificationGroupUuidIn(List.of(groupUuid));
         return node.isEmpty() ? null : node.getFirst().getIdNode();
     }
+
+    @Transactional(readOnly = true)
+    public Map<UUID, UUID> getNodeUuidsByModificationGroups(List<UUID> groupUuids) {
+        return networkModificationNodeInfoRepository.findByModificationGroupUuidIn(groupUuids).stream()
+                .collect(Collectors.toMap(NetworkModificationNodeInfoEntity::getModificationGroupUuid, NetworkModificationNodeInfoEntity::getIdNode));
+    }
 }

src/main/java/org/gridsuite/study/server/service/StudyService.java

@@ -1219,7 +1219,7 @@ public void createNetworkModification(UUID studyUuid, UUID nodeUuid, String crea
     public void updateNetworkModification(UUID studyUuid, String updateModificationAttributes, UUID nodeUuid, UUID modificationUuid, String userId) {
         List<UUID> childrenUuids = networkModificationTreeService.getChildrenUuids(nodeUuid);
         try {
-            networkModificationService.updateModification(updateModificationAttributes, modificationUuid);
+            networkModificationService.updateModification(updateModificationAttributes, modificationUuid, userId);
             invalidateNodeTree(studyUuid, nodeUuid);
         } finally {
             notificationService.emitModificationsUpdated(studyUuid, nodeUuid, childrenUuids);
@@ -1466,6 +1466,18 @@ public void invalidateNodeTreeWhenMoveModification(UUID studyUuid, UUID nodeUuid
         invalidateNodeTree(studyUuid, nodeUuid, InvalidateNodeTreeParameters.ALL);
     }
 
+    @Transactional
+    public void invalidateNodeTreeWhenSharedModificationChanged(UUID studyUuid, UUID nodeUuid) {
+        invalidateNodeTree(studyUuid, nodeUuid, InvalidateNodeTreeParameters.ALL);
+    }
+
+    @Transactional
+    public void sharedElementUpdatedNotification(UUID nodeUuid, List<UUID> networkModificationUuids) {
+        UUID studyUuid = networkModificationTreeService.getStudyUuidForNodeId(nodeUuid);
+        invalidateNodeTree(studyUuid, nodeUuid);
+        notificationService.emitSharedElementUpdated(studyUuid, nodeUuid, networkModificationUuids);
+    }
+
     @Transactional
     public boolean invalidateNodeTreeWhenMoveModifications(UUID studyUuid, UUID targetNodeUuid, UUID originNodeUuid) {
         boolean isTargetInDifferentNodeTree = !targetNodeUuid.equals(originNodeUuid)
@@ -1500,11 +1512,11 @@ private void invalidateNodeTreeWithLF(UUID studyUuid, UUID nodeUuid, UUID rootNe
         invalidateNodeTree(studyUuid, nodeUuid, rootNetworkUuid, invalidateNodeTreeParameters);
     }
 
-    public void invalidateNodeTree(UUID studyUuid, UUID nodeUuid, UUID rootNetworkUuid) {
+    private void invalidateNodeTree(UUID studyUuid, UUID nodeUuid, UUID rootNetworkUuid) {
         invalidateNodeTree(studyUuid, nodeUuid, rootNetworkUuid, InvalidateNodeTreeParameters.ALL);
     }
 
-    public void invalidateNodeTree(UUID studyUuid, UUID nodeUuid, UUID rootNetworkUuid, InvalidateNodeTreeParameters invalidateTreeParameters) {
+    private void invalidateNodeTree(UUID studyUuid, UUID nodeUuid, UUID rootNetworkUuid, InvalidateNodeTreeParameters invalidateTreeParameters) {
         networkModificationTreeService.invalidateNodeTree(studyUuid, nodeUuid, rootNetworkUuid, invalidateTreeParameters, false);
     }
 
@@ -1562,7 +1574,7 @@ public void updateNetworkModificationsMetadata(UUID studyUuid, UUID nodeUuid, Li
                 throw new StudyException(NOT_ALLOWED);
             }
             UUID groupId = networkModificationTreeService.getModificationGroupUuid(nodeUuid);
-            networkModificationService.updateModificationsMetadata(groupId, modificationsUuids, metadata);
+            networkModificationService.updateModificationsMetadata(groupId, modificationsUuids, metadata, userId);
             if (metadata.getActivated() != null || metadata.getName() != null) {
                 invalidateNodeTree(studyUuid, nodeUuid);
             }

src/main/resources/config/application.yaml

@@ -15,13 +15,17 @@ spring:
       consumeLoadFlowResult;consumeLoadFlowStopped;consumeLoadFlowFailed;consumeLoadFlowCancelFailed;\
       consumeStateEstimationResult;consumeStateEstimationDebug;consumeStateEstimationStopped;consumeStateEstimationFailed;\
       consumePccMinResult;consumePccMinStopped;consumePccMinFailed;\
-      consumeNetworkExportFinished"
+      consumeNetworkExportFinished;\
+      consumeSharedElementUpdate"
     stream:
       bindings:
         publishStudyUpdate-out-0:
           destination: ${powsybl-ws.rabbitmq.destination.prefix:}study.update
         publishElementUpdate-out-0:
           destination: ${powsybl-ws.rabbitmq.destination.prefix:}element.update
+        consumeSharedElementUpdate-in-0:
+          destination: ${powsybl-ws.rabbitmq.destination.prefix:}element.shared.update
+          group: studySharedElementUpdateGroup
         consumeSaResult-in-0:
           destination: ${powsybl-ws.rabbitmq.destination.prefix:}sa.result
           group: studySaResultGroup