Optimize tabular modifications database operations (#650)

Signed-off-by: David BRAQUART <[email protected]>

Author: dbraquart

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

@@ -20,6 +20,8 @@
 import org.gridsuite.modification.server.entities.equipment.modification.attribute.IntegerEquipmentAttributeModificationEntity;
 import org.gridsuite.modification.server.entities.equipment.modification.attribute.StringEquipmentAttributeModificationEntity;
 import org.gridsuite.modification.server.entities.equipment.modification.byfilter.*;
+import org.gridsuite.modification.server.entities.tabular.TabularCreationEntity;
+import org.gridsuite.modification.server.entities.tabular.TabularModificationEntity;
 
 /**
  * @author Ayoub LABIDI <ayoub.labidi at rte-france.com>

src/main/java/org/gridsuite/modification/server/entities/TabularBaseEntity.java renamed to src/main/java/org/gridsuite/modification/server/entities/tabular/TabularBaseEntity.java

@@ -4,7 +4,7 @@
   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.entities;
+package org.gridsuite.modification.server.entities.tabular;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.FetchType;
@@ -16,6 +16,7 @@
 import lombok.NoArgsConstructor;
 import org.gridsuite.modification.dto.ModificationInfos;
 import org.gridsuite.modification.dto.TabularBaseInfos;
+import org.gridsuite.modification.server.entities.ModificationEntity;
 
 import java.util.List;
 

src/main/java/org/gridsuite/modification/server/entities/TabularCreationEntity.java renamed to src/main/java/org/gridsuite/modification/server/entities/tabular/TabularCreationEntity.java

@@ -4,7 +4,7 @@
   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.entities;
+package org.gridsuite.modification.server.entities.tabular;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
@@ -21,6 +21,7 @@
 import org.gridsuite.modification.ModificationType;
 import org.gridsuite.modification.dto.ModificationInfos;
 import org.gridsuite.modification.dto.TabularCreationInfos;
+import org.gridsuite.modification.server.entities.ModificationEntity;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
@@ -40,7 +41,7 @@ public class TabularCreationEntity extends TabularBaseEntity {
     @Enumerated(EnumType.STRING)
     private ModificationType creationType;
 
-    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(cascade = CascadeType.ALL)
     @OrderColumn
     private List<ModificationEntity> creations;
 

src/main/java/org/gridsuite/modification/server/entities/TabularModificationEntity.java renamed to src/main/java/org/gridsuite/modification/server/entities/tabular/TabularModificationEntity.java

@@ -4,7 +4,7 @@
   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.entities;
+package org.gridsuite.modification.server.entities.tabular;
 
 import jakarta.persistence.*;
 import lombok.Getter;
@@ -17,6 +17,7 @@
 
 import org.gridsuite.modification.ModificationType;
 import org.gridsuite.modification.dto.*;
+import org.gridsuite.modification.server.entities.ModificationEntity;
 import org.springframework.util.CollectionUtils;
 
 /**
@@ -33,7 +34,7 @@ public class TabularModificationEntity extends TabularBaseEntity {
     @Enumerated(EnumType.STRING)
     private ModificationType modificationType;
 
-    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(cascade = CascadeType.ALL)
     @OrderColumn
     private List<ModificationEntity> modifications;
 

src/main/java/org/gridsuite/modification/server/entities/TabularPropertyEntity.java renamed to src/main/java/org/gridsuite/modification/server/entities/tabular/TabularPropertyEntity.java

@@ -5,7 +5,7 @@
  *  file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package org.gridsuite.modification.server.entities;
+package org.gridsuite.modification.server.entities.tabular;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

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

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2025, 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.repositories;
+
+import org.gridsuite.modification.server.entities.equipment.creation.BatteryCreationEntity;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author David Braquart <david.braquart_externe at rte-france.com>
+ */
+
+public interface BatteryCreationRepository extends JpaRepository<BatteryCreationEntity, UUID> {
+    @EntityGraph(attributePaths = {"reactiveCapabilityCurvePoints"}, type = EntityGraph.EntityGraphType.LOAD)
+    List<BatteryCreationEntity> findAllReactiveCapabilityCurvePointsByIdIn(List<UUID> ids);
+
+    @EntityGraph(attributePaths = {"properties"}, type = EntityGraph.EntityGraphType.LOAD)
+    List<BatteryCreationEntity> findAllPropertiesByIdIn(List<UUID> ids);
+
+    @Modifying
+    @Query(value = "BEGIN;" +
+            "DELETE FROM battery_creation_entity_reactive_capability_curve_points cp WHERE cp.battery_creation_entity_id IN ?1 ;" +
+            "DELETE FROM free_property fp WHERE fp.equipment_modification_id IN ?1 ;" +
+            "DELETE FROM battery_creation WHERE id IN ?1 ;" +
+            "DELETE FROM tabular_creation_creations WHERE tabular_creation_entity_id = ?2 ;" +
+            "DELETE FROM modification WHERE id IN ?1 ;" +
+            "COMMIT;", nativeQuery = true)
+    void deleteTabularSubModifications(List<UUID> subModificationIds, UUID tabularModificationId);
+
+    @Modifying
+    @Query(value = "BEGIN;" +
+            "DELETE FROM battery_creation_entity_reactive_capability_curve_points cp WHERE cp.battery_creation_entity_id IN ?1 ;" +
+            "DELETE FROM free_property fp WHERE fp.equipment_modification_id IN ?1 ;" +
+            "DELETE FROM battery_creation WHERE id IN ?1 ;" +
+            "DELETE FROM tabular_creation_creations WHERE tabular_creation_entity_id = ?2 ;" +
+            "DELETE FROM modification WHERE id IN ?1 ;" +
+            "DELETE FROM tabular_creation WHERE id = ?2 ;" +
+            "DELETE FROM modification WHERE id = ?2 ;" +
+            "COMMIT;", nativeQuery = true)
+    void deleteTabularModification(List<UUID> subModificationIds, UUID tabularModificationId);
+}

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

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025, 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.repositories;
+
+import org.gridsuite.modification.server.entities.equipment.modification.BatteryModificationEntity;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author David Braquart <david.braquart_externe at rte-france.com>
+ */
+@Repository
+public interface BatteryModificationRepository extends JpaRepository<BatteryModificationEntity, UUID> {
+
+    @EntityGraph(attributePaths = {"reactiveCapabilityCurvePoints"}, type = EntityGraph.EntityGraphType.LOAD)
+    List<BatteryModificationEntity> findAllReactiveCapabilityCurvePointsByIdIn(List<UUID> ids);
+
+    @EntityGraph(attributePaths = {"properties"}, type = EntityGraph.EntityGraphType.LOAD)
+    List<BatteryModificationEntity> findAllPropertiesByIdIn(List<UUID> ids);
+
+    @Modifying
+    @Query(value = "BEGIN;" +
+            "DELETE FROM battery_modification_entity_reactive_capability_curve_points cp WHERE cp.battery_modification_entity_id IN ?1 ;" +
+            "DELETE FROM free_property fp WHERE fp.equipment_modification_id IN ?1 ;" +
+            "DELETE FROM battery_modification WHERE id IN ?1 ;" +
+            "DELETE FROM tabular_modification_modifications WHERE tabular_modification_entity_id = ?2 ;" +
+            "DELETE FROM modification WHERE id IN ?1 ;" +
+            "COMMIT;", nativeQuery = true)
+    void deleteTabularSubModifications(List<UUID> subModificationIds, UUID tabularModificationId);
+
+    @Modifying
+    @Query(value = "BEGIN;" +
+            "DELETE FROM battery_modification_entity_reactive_capability_curve_points cp WHERE cp.battery_modification_entity_id IN ?1 ;" +
+            "DELETE FROM free_property fp WHERE fp.equipment_modification_id IN ?1 ;" +
+            "DELETE FROM battery_modification WHERE id IN ?1 ;" +
+            "DELETE FROM tabular_modification_modifications WHERE tabular_modification_entity_id = ?2 ;" +
+            "DELETE FROM modification WHERE id IN ?1 ;" +
+            "DELETE FROM tabular_modification WHERE id = ?2 ;" +
+            "DELETE FROM modification WHERE id = ?2 ;" +
+            "COMMIT;", nativeQuery = true)
+    void deleteTabularModification(List<UUID> subModificationIds, UUID tabularModificationId);
+}

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

@@ -10,6 +10,8 @@
 import org.gridsuite.modification.server.entities.equipment.creation.GeneratorCreationEntity;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 import java.util.UUID;
@@ -24,4 +26,26 @@ public interface GeneratorCreationRepository extends JpaRepository<GeneratorCrea
 
     @EntityGraph(attributePaths = {"properties"}, type = EntityGraph.EntityGraphType.LOAD)
     List<GeneratorCreationEntity> findAllPropertiesByIdIn(List<UUID> ids);
+
+    @Modifying
+    @Query(value = "BEGIN;" +
+            "DELETE FROM generator_creation_entity_reactive_capability_curve_points cp WHERE cp.generator_creation_entity_id IN ?1 ;" +
+            "DELETE FROM free_property fp WHERE fp.equipment_modification_id IN ?1 ;" +
+            "DELETE FROM generator_creation WHERE id IN ?1 ;" +
+            "DELETE FROM tabular_creation_creations WHERE tabular_creation_entity_id = ?2 ;" +
+            "DELETE FROM modification WHERE id IN ?1 ;" +
+            "COMMIT;", nativeQuery = true)
+    void deleteTabularSubModifications(List<UUID> subModificationIds, UUID tabularModificationId);
+
+    @Modifying
+    @Query(value = "BEGIN;" +
+            "DELETE FROM generator_creation_entity_reactive_capability_curve_points cp WHERE cp.generator_creation_entity_id IN ?1 ;" +
+            "DELETE FROM free_property fp WHERE fp.equipment_modification_id IN ?1 ;" +
+            "DELETE FROM generator_creation WHERE id IN ?1 ;" +
+            "DELETE FROM tabular_creation_creations WHERE tabular_creation_entity_id = ?2 ;" +
+            "DELETE FROM modification WHERE id IN ?1 ;" +
+            "DELETE FROM tabular_creation WHERE id = ?2 ;" +
+            "DELETE FROM modification WHERE id = ?2 ;" +
+            "COMMIT;", nativeQuery = true)
+    void deleteTabularModification(List<UUID> subModificationIds, UUID tabularModificationId);
 }

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

@@ -29,6 +29,16 @@ public interface GeneratorModificationRepository extends JpaRepository<Generator
     @EntityGraph(attributePaths = {"properties"}, type = EntityGraph.EntityGraphType.LOAD)
     List<GeneratorModificationEntity> findAllPropertiesByIdIn(List<UUID> ids);
 
+    @Modifying
+    @Query(value = "BEGIN;" +
+            "DELETE FROM generator_modification_entity_reactive_capability_curve_points cp WHERE cp.generator_modification_entity_id IN ?1 ;" +
+            "DELETE FROM free_property fp WHERE fp.equipment_modification_id IN ?1 ;" +
+            "DELETE FROM generator_modification WHERE id IN ?1 ;" +
+            "DELETE FROM tabular_modification_modifications WHERE tabular_modification_entity_id = ?2 ;" +
+            "DELETE FROM modification WHERE id IN ?1 ;" +
+            "COMMIT;", nativeQuery = true)
+    void deleteTabularSubModifications(List<UUID> subModificationIds, UUID tabularModificationId);
+
     @Modifying
     @Query(value = "BEGIN;" +
         "DELETE FROM generator_modification_entity_reactive_capability_curve_points cp WHERE cp.generator_modification_entity_id IN ?1 ;" +

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

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025, 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.repositories;
+
+import org.gridsuite.modification.server.entities.equipment.modification.LineModificationEntity;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author David Braquart <david.braquart_externe at rte-france.com>
+ */
+@Repository
+public interface LineModificationRepository extends JpaRepository<LineModificationEntity, UUID> {
+
+    @EntityGraph(attributePaths = {"opLimitsGroups1"}, type = EntityGraph.EntityGraphType.LOAD)
+    List<LineModificationEntity> findAllOperationalLimitsGroups1ByIdIn(List<UUID> ids);
+
+    @EntityGraph(attributePaths = {"opLimitsGroups2"}, type = EntityGraph.EntityGraphType.LOAD)
+    List<LineModificationEntity> findAllOperationalLimitsGroups2ByIdIn(List<UUID> ids);
+
+    @EntityGraph(attributePaths = {"properties"}, type = EntityGraph.EntityGraphType.LOAD)
+    List<LineModificationEntity> findAllPropertiesByIdIn(List<UUID> ids);
+
+    @Modifying
+    @Query(value = "BEGIN;" +
+            "DELETE FROM line_modification_op_limits_groups1 lm WHERE lm.branch_id IN ?3 ;" +
+            "DELETE FROM line_modification_op_limits_groups2 lm WHERE lm.branch_id IN ?3 ;" +
+            "DELETE FROM operational_limits_group_modification ol WHERE ol.uuid IN ?2 ;" +
+            "DELETE FROM current_temporary_limits_modification cl WHERE cl.id IN ?1 ;" +
+            "DELETE FROM current_limits_modification cl WHERE cl.id IN ?1 ;" +
+            "DELETE FROM free_property fp WHERE fp.equipment_modification_id IN ?3 ;" +
+            "DELETE FROM line_modification WHERE id IN ?3 ;" +
+            "DELETE FROM tabular_modification_modifications WHERE tabular_modification_entity_id = ?4 ;" +
+            "DELETE FROM modification WHERE id IN ?3 ;" +
+            "COMMIT;", nativeQuery = true)
+    void deleteTabularSubModifications(List<UUID> currentLimitsIds, List<UUID> opLimitsGroupsIds, List<UUID> subModificationIds, UUID tabularModificationId);
+
+    @Modifying
+    @Query(value = "BEGIN;" +
+            "DELETE FROM line_modification_op_limits_groups1 lm WHERE lm.branch_id IN ?3 ;" +
+            "DELETE FROM line_modification_op_limits_groups2 lm WHERE lm.branch_id IN ?3 ;" +
+            "DELETE FROM operational_limits_group_modification ol WHERE ol.uuid IN ?2 ;" +
+            "DELETE FROM current_temporary_limits_modification cl WHERE cl.id IN ?1 ;" +
+            "DELETE FROM current_limits_modification cl WHERE cl.id IN ?1 ;" +
+            "DELETE FROM free_property fp WHERE fp.equipment_modification_id IN ?3 ;" +
+            "DELETE FROM line_modification WHERE id IN ?3 ;" +
+            "DELETE FROM tabular_modification_modifications WHERE tabular_modification_entity_id = ?4 ;" +
+            "DELETE FROM modification WHERE id IN ?3 ;" +
+            "DELETE FROM tabular_modification WHERE id = ?4 ;" +
+            "DELETE FROM modification WHERE id = ?4 ;" +
+            "COMMIT;", nativeQuery = true)
+    void deleteTabularModification(List<UUID> currentLimitsIds, List<UUID> opLimitsGroupsIds, List<UUID> subModificationIds, UUID tabularModificationId);
+}