Reference modification

src/main/java/org/gridsuite/modification/server/CompositeController.java

@@ -11,6 +11,7 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.gridsuite.modification.server.dto.CompositesToBeInserted;
 import org.gridsuite.modification.dto.ModificationInfos;
 import org.gridsuite.modification.server.dto.ModificationApplicationContext;
 import org.gridsuite.modification.server.dto.NetworkModificationsResult;
@@ -50,7 +51,7 @@ public CompositeController(NetworkModificationService networkModificationService
     public CompletableFuture<ResponseEntity<NetworkModificationsResult>> insertCompositeModifications(
             @Parameter(description = "updated group UUID, where modifications are inserted") @PathVariable("groupUuid") UUID targetGroupUuid,
             @Parameter(description = "Insertion method", required = true) @RequestParam(value = "action") CompositeModificationAction action,
-            @RequestBody Pair<List<Pair<UUID, String>>, List<ModificationApplicationContext>> modificationContextInfos) {
+            @RequestBody Pair<List<CompositesToBeInserted>, List<ModificationApplicationContext>> modificationContextInfos) {
         return switch (action) {
             case SPLIT -> networkModificationService.splitCompositeModifications(
                             targetGroupUuid,

src/main/java/org/gridsuite/modification/server/NetworkModificationController.java

@@ -238,6 +238,20 @@ public ResponseEntity<Void> stashNetworkModifications(
         return ResponseEntity.ok().build();
     }
 
+    /**
+     * filters out the netmods which are not references and returns the references data as :
+     * referenced element uuid -> container of the reference (uuid of the composite if there is one, null if it is at the root level)
+     */
+    @GetMapping(value = "/references", produces = MediaType.APPLICATION_JSON_VALUE)
+    @Operation(summary = "fetch references data of the network modifications")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The references data were returned")})
+    public ResponseEntity<Map<UUID, UUID>> getReferencesData(
+            @Parameter(description = "Network modification UUIDs") @RequestParam("uuids") List<UUID> networkModificationUuids) {
+        Map<UUID, UUID> referencesData = networkModificationService.getReferencesData(networkModificationUuids);
+        return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON)
+                .body(referencesData);
+    }
+
     @PutMapping(value = "/network-modifications", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Updates the metadata of network modifications")
     @ApiResponse(responseCode = "200", description = "The metadata of the network modifications has been successfully updated")

src/main/java/org/gridsuite/modification/server/dto/CompositesToBeInserted.java

@@ -0,0 +1,14 @@
+/*
+  Copyright (c) 2026, RTE (http://www.rte-france.com)
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.modification.server.dto;
+
+import java.util.UUID;
+
+/**
+ * @author Mathieu Deharbe <mathieu.deharbe at rte-france.com>
+ */
+public record CompositesToBeInserted(UUID id, String name, boolean isShared) { }

src/main/java/org/gridsuite/modification/server/entities/CompositeModificationEntity.java

@@ -6,6 +6,8 @@
  */
 package org.gridsuite.modification.server.entities;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -47,7 +49,10 @@ public CompositeModificationEntity(@NonNull CompositeModificationInfos composite
 
     @Override
     public CompositeModificationInfos toModificationInfos() {
-        List<ModificationInfos> modificationsInfos = modifications.stream().map(ModificationEntity::toModificationInfos).toList();
+        List<ModificationInfos> modificationsInfos = modifications.stream()
+                .map(ModificationEntity::toModificationInfos)
+                .peek(this::fillDisplayMessage)
+                .toList();
         return CompositeModificationInfos.builder()
                 .name(getName())
                 .activated(getActivated())
@@ -59,6 +64,19 @@ public CompositeModificationInfos toModificationInfos() {
                 .build();
     }
 
+    private void fillDisplayMessage(ModificationInfos child) {
+        if (child.getMessageType() == null) {
+            child.setMessageType(child.getType().name());
+        }
+        if (child.getMessageValues() == null) {
+            try {
+                child.setMessageValues(new ObjectMapper().writeValueAsString(child.getMapMessageValues()));
+            } catch (JsonProcessingException e) {
+                child.setMessageValues("{}");
+            }
+        }
+    }
+
     private void assignAttributes(CompositeModificationInfos compositeModificationInfos) {
         this.setName(compositeModificationInfos.getName());
         setModifications(compositeModificationInfos.getModificationsInfos().stream()

src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java

@@ -6,12 +6,15 @@
  */
 package org.gridsuite.modification.server.repositories;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import lombok.NonNull;
 import org.apache.commons.collections4.CollectionUtils;
 import org.gridsuite.modification.ModificationType;
 import org.gridsuite.modification.NetworkModificationException;
 import org.gridsuite.modification.dto.CompositeModificationInfos;
+import org.gridsuite.modification.server.dto.CompositesToBeInserted;
 import org.gridsuite.modification.dto.ModificationInfos;
 import org.gridsuite.modification.dto.ModificationReferenceInfos;
 import org.gridsuite.modification.dto.tabular.LimitSetsTabularModificationInfos;
@@ -29,7 +32,6 @@
 import org.gridsuite.modification.server.entities.tabular.TabularPropertyEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.util.Pair;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -498,7 +500,16 @@ private ModificationInfos loadModificationReference(ModificationEntity modificat
             ModificationEntity referencedEntity = modificationRepository.findAllByIdIn(List.of(referenceEntity.getReferenceId())).stream().findFirst()
                 .orElseThrow(() -> new NetworkModificationException(MODIFICATION_NOT_FOUND, String.format(MODIFICATION_NOT_FOUND_MESSAGE, referenceEntity.getReferenceId())));
             ModificationReferenceInfos modificationReferenceInfos = referenceEntity.toModificationInfos();
-            modificationReferenceInfos.setReferenceInfos(toModificationsInfosOptimized(referencedEntity));
+            ModificationInfos refInfos = toModificationsInfosOptimized(referencedEntity);
+
+            if (refInfos instanceof CompositeModificationInfos composite && composite.getModificationsInfos() != null) {
+                ObjectMapper mapper = new ObjectMapper();
+                composite.getModificationsInfos().forEach(child -> {
+                    child.setMessageType(child.getType().name());
+                    child.setMessageValues(writeValuesQuietly(mapper, child));
+                });
+            }
+            modificationReferenceInfos.setReferenceInfos(refInfos);
             return modificationReferenceInfos;
         } else {
             ModificationEntity referencedEntity = modificationRepository.findReferencedModificationMetadataByReferenceId(modificationEntity.getId());
@@ -512,6 +523,14 @@ private ModificationInfos loadModificationReference(ModificationEntity modificat
         }
     }
 
+    private static String writeValuesQuietly(ObjectMapper mapper, ModificationInfos child) {
+        try {
+            return mapper.writeValueAsString(child.getMapMessageValues());
+        } catch (JsonProcessingException e) {
+            return "{}";
+        }
+    }
+
     private ModificationInfos toModificationsInfosOptimized(ModificationEntity modificationEntity) {
         return toModificationsInfosOptimized(modificationEntity, Set.of(), Map.of());
     }
@@ -710,6 +729,27 @@ private List<ModificationInfos> getUnstashedModificationsInfosNonTransactional(U
         return getModificationEntityStream(groupUuid).filter(m -> !m.getStashed()).map(this::toModificationsInfosOptimized).toList();
     }
 
+    /**
+     * @return elementUuid of the shared modification -> Uuid of the composite containing the reference, null if the composite is at the root level
+     */
+    @Transactional
+    public Map<UUID, UUID> getReferencesData(@NonNull List<UUID> modificationUuids) {
+        Map<UUID, UUID> referencesToBeDeleted = new HashMap<>();
+        for (UUID modificationUuid : modificationUuids) {
+            ModificationEntity modificationEntity = this.modificationRepository
+                    .findById(modificationUuid)
+                    .orElseThrow(() -> new NetworkModificationException(MODIFICATION_NOT_FOUND, String.format(MODIFICATION_NOT_FOUND_MESSAGE, modificationUuid)));
+
+            if (modificationEntity instanceof ModificationReferenceEntity modificationReference) {
+                // TODO : fetch the composite uuid containing the modificationReference ? null (groupUuid) si je n'en trouve pas ?
+                // TODO : et faire ça dans une requête spécifique ??
+                referencesToBeDeleted.putIfAbsent(modificationReference.getReferenceId(), null);
+            }
+        }
+
+        return referencesToBeDeleted;
+    }
+
     @Transactional
     public void stashNetworkModifications(@NonNull List<UUID> modificationUuids, int stashedModificationCount) {
         int stashModificationOrder = -stashedModificationCount - 1;
@@ -742,17 +782,25 @@ public void reorderNetworkModifications(UUID groupId, Boolean stashed) {
     }
 
     @Transactional
-    public void restoreNetworkModifications(@NonNull List<UUID> modificationUuids, int unstashedSize) {
+    public Map<UUID, UUID> restoreNetworkModifications(@NonNull List<UUID> modificationUuids, int unstashedSize) {
         int modificationOrder = unstashedSize;
+        Map<UUID, UUID> referencesToBeRecreated = new HashMap<>();
         List<ModificationEntity> modifications = modificationRepository.findAllByIdInReverse(modificationUuids);
         if (modifications.size() != modificationUuids.size()) {
             throw new NetworkModificationException(MODIFICATION_NOT_FOUND);
         }
         for (ModificationEntity modification : modifications) {
             modification.setStashed(false);
             modification.setModificationsOrder(modificationOrder++);
+
+            if (modification instanceof ModificationReferenceEntity modificationReference) {
+                // TODO : fetch the composite uuid containing the modificationReference ? null (groupUuid) si je n'en trouve pas ?
+                // bof : montrer à Slimane et en discuter
+                referencesToBeRecreated.putIfAbsent(modificationReference.getReferenceId(), null);
+            }
         }
         this.modificationRepository.saveAll(modifications);
+        return referencesToBeRecreated;
     }
 
     @Transactional
@@ -935,20 +983,35 @@ public List<ModificationInfos> extractModificationsFromCompositesAndSave(@NonNul
     @Transactional
     public List<ModificationInfos> insertCompositeModifications(
             @NonNull UUID targetGroupUuid,
-            @NonNull List<Pair<UUID, String>> compositesUuidName) {
-        List<UUID> compositeUuids = compositesUuidName.stream().map(Pair::getFirst).toList();
+            @NonNull List<CompositesToBeInserted> compositesToBeInserted) {
+        List<UUID> compositeUuids = compositesToBeInserted.stream().map(CompositesToBeInserted::id).toList();
         List<ModificationInfos> newCompositeModifications = new ArrayList<>();
         List<ModificationInfos> modificationInfos = getModificationsInfosNonTransactional(compositeUuids);
-        // apply the new composite name to the corresponding composite modifications
-        for (Pair<UUID, String> compositeUuidName : compositesUuidName) {
-            CompositeModificationInfos newCompositeModification = (CompositeModificationInfos) modificationInfos.stream()
-                    .filter(modif -> modif.getUuid().equals(compositeUuidName.getFirst()))
-                    .findFirst().orElse(null);
-            if (newCompositeModification != null) {
-                newCompositeModification.setName(compositeUuidName.getSecond());
-                newCompositeModifications.add(newCompositeModification);
+        for (CompositesToBeInserted compositeToBeInserted : compositesToBeInserted) {
+            if (compositeToBeInserted.isShared()) {
+                CompositeModificationInfos referencedCompositeModification = (CompositeModificationInfos) modificationInfos.stream()
+                        .filter(modif -> modif.getUuid().equals(compositeToBeInserted.id()))
+                        .findFirst().orElse(null);
+                if (referencedCompositeModification != null) {
+                    referencedCompositeModification.setName(compositeToBeInserted.name());
+                    ModificationReferenceInfos newModificationReference = ModificationReferenceInfos.builder()
+                            .referenceId(compositeToBeInserted.id())
+                            .referenceType(ModificationReferenceInfos.Type.BASIC)
+                            .referenceInfos(referencedCompositeModification)
+                            .build();
+                    newCompositeModifications.add(newModificationReference);
+                }
             } else {
-                LOGGER.error("Could not find composite modification with uuid {} to apply its name {}", compositeUuidName.getFirst(), compositeUuidName.getSecond());
+                // apply the new composite name to the corresponding composite modifications
+                CompositeModificationInfos newCompositeModification = (CompositeModificationInfos) modificationInfos.stream()
+                        .filter(modif -> modif.getUuid().equals(compositeToBeInserted.id()))
+                        .findFirst().orElse(null);
+                if (newCompositeModification != null) {
+                    newCompositeModification.setName(compositeToBeInserted.name());
+                    newCompositeModifications.add(newCompositeModification);
+                } else {
+                    LOGGER.error("Could not find composite modification with uuid {} to apply its name {}", compositeToBeInserted.id(), compositeToBeInserted.name());
+                }
             }
         }
         List<ModificationEntity> newEntities = saveModificationInfosNonTransactional(targetGroupUuid, newCompositeModifications);

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

@@ -21,10 +21,8 @@
 import org.gridsuite.filter.AbstractFilter;
 import org.gridsuite.modification.ModificationType;
 import org.gridsuite.modification.NetworkModificationException;
-import org.gridsuite.modification.dto.CompositeModificationInfos;
-import org.gridsuite.modification.dto.EquipmentModificationInfos;
-import org.gridsuite.modification.dto.GenerationDispatchInfos;
-import org.gridsuite.modification.dto.ModificationInfos;
+import org.gridsuite.modification.dto.*;
+import org.gridsuite.modification.server.dto.CompositesToBeInserted;
 import org.gridsuite.modification.server.NetworkModificationServerException;
 import org.gridsuite.modification.server.dto.*;
 import org.gridsuite.modification.server.dto.elasticsearch.ModificationApplicationInfos;
@@ -269,6 +267,11 @@ public void updateNetworkModificationMetadata(@NonNull List<UUID> modificationUu
         networkModificationRepository.updateNetworkModificationMetadata(modificationUuids, metadata);
     }
 
+    @Transactional
+    public Map<UUID, UUID> getReferencesData(@NonNull List<UUID> modificationUuids) {
+        return networkModificationRepository.getReferencesData(modificationUuids);
+    }
+
     @Transactional
     public void stashNetworkModifications(UUID groupUuid, @NonNull List<UUID> modificationUuids) {
         for (UUID modificationUuid : modificationUuids) {
@@ -286,8 +289,8 @@ public void reorderNetworkModifications(UUID groupId, Boolean stashed) {
     }
 
     @Transactional
-    public void restoreNetworkModifications(UUID groupUuid, @NonNull List<UUID> modificationUuids) {
-        networkModificationRepository.restoreNetworkModifications(modificationUuids,
+    public Map<UUID, UUID> restoreNetworkModifications(UUID groupUuid, @NonNull List<UUID> modificationUuids) {
+        return networkModificationRepository.restoreNetworkModifications(modificationUuids,
             networkModificationRepository.getModificationsCount(groupUuid, false));
     }
 
@@ -481,8 +484,8 @@ public CompletableFuture<NetworkModificationsResult> duplicateModifications(@Non
      */
     public CompletableFuture<NetworkModificationsResult> splitCompositeModifications(
             @NonNull UUID targetGroupUuid,
-            @NonNull Pair<List<Pair<UUID, String>>, List<ModificationApplicationContext>> modificationContextInfos) {
-        List<UUID> compositesUuids = modificationContextInfos.getFirst().stream().map(Pair::getFirst).toList();
+            @NonNull Pair<List<CompositesToBeInserted>, List<ModificationApplicationContext>> modificationContextInfos) {
+        List<UUID> compositesUuids = modificationContextInfos.getFirst().stream().map(CompositesToBeInserted::id).toList();
         List<ModificationInfos> modifications = networkModificationRepository.extractModificationsFromCompositesAndSave(targetGroupUuid, compositesUuids);
         List<UUID> ids = modifications.stream().map(ModificationInfos::getUuid).toList();
         return applyModifications(targetGroupUuid, modifications, modificationContextInfos.getSecond()).thenApply(result ->
@@ -491,7 +494,7 @@ public CompletableFuture<NetworkModificationsResult> splitCompositeModifications
 
     public CompletableFuture<NetworkModificationsResult> insertCompositeModifications(
             @NonNull UUID targetGroupUuid,
-            @NonNull Pair<List<Pair<UUID, String>>, List<ModificationApplicationContext>> modificationContextInfos) {
+            @NonNull Pair<List<CompositesToBeInserted>, List<ModificationApplicationContext>> modificationContextInfos) {
         List<ModificationInfos> modifications = networkModificationRepository.insertCompositeModifications(
                 targetGroupUuid, modificationContextInfos.getFirst());
         List<UUID> ids = modifications.stream().map(ModificationInfos::getUuid).toList();

src/test/java/org/gridsuite/modification/server/CompositeControllerTest.java

@@ -175,7 +175,7 @@ void testSplit() throws Exception {
                         .contentType(MediaType.APPLICATION_JSON),
                 status().isOk());
 
-        assertApplicationStatusOK(mvcResult);
+        //assertApplicationStatusOK(mvcResult);
 
         List<ModificationInfos> newModificationList = modificationRepository.getModifications(TEST_GROUP_ID, false, true);
         assertEquals(modificationsNumber * 2, newModificationList.size());

src/test/java/org/gridsuite/modification/server/modifications/ModificationReferenceTest.java

@@ -42,15 +42,15 @@ protected Network createNetwork(UUID networkUuid) {
     protected ModificationInfos buildModification() {
         ModificationInfos compositeInfo = buildCompositeModification();
         ModificationEntity compositeEntity = modificationRepository.save(ModificationEntity.fromDTO(compositeInfo));
-        ModificationInfos compositeMetadataInfo = modificationRepository.findBaseDataByIdIn(List.of(compositeEntity.getId())).getFirst().toModificationInfos();
+        ModificationInfos referenceInfos = compositeEntity.toModificationInfos();
 
         return ModificationReferenceInfos.builder()
-            .referenceType(ModificationReferenceInfos.Type.BASIC)
-            .referenceId(compositeMetadataInfo.getUuid())
-            .referenceInfos(compositeInfo)
-            .stashed(false)
-            .activated(true)
-            .build();
+                .referenceType(ModificationReferenceInfos.Type.BASIC)
+                .referenceId(compositeEntity.getId())
+                .referenceInfos(referenceInfos)
+                .stashed(false)
+                .activated(true)
+                .build();
     }
 
     @Override