2929import org .gridsuite .modification .server .elasticsearch .ModificationApplicationInfosService ;
3030import org .gridsuite .modification .server .entities .ModificationEntity ;
3131import org .gridsuite .modification .server .impacts .AbstractBaseImpact ;
32+ import org .gridsuite .modification .server .repositories .NetworkModificationRepository ;
3233import org .gridsuite .modification .server .service .*;
3334import org .slf4j .Logger ;
3435import org .slf4j .LoggerFactory ;
@@ -63,6 +64,8 @@ public class NetworkModificationApplicator {
6364
6465 private final NetworkModificationObserver networkModificationObserver ;
6566
67+ private final NetworkModificationRepository networkModificationRepository ;
68+
6669 @ Value ("${impacts.collection-threshold:50}" )
6770 @ Setter // TODO REMOVE when VoltageInitReportTest will no longer use NetworkModificationApplicator
6871 private Integer collectionThreshold ;
@@ -75,6 +78,7 @@ public NetworkModificationApplicator(NetworkStoreService networkStoreService, Eq
7578 ReportService reportService , FilterService filterService ,
7679 LoadFlowService loadFlowService ,
7780 NetworkModificationObserver networkModificationObserver ,
81+ NetworkModificationRepository networkModificationRepository ,
7882 LargeNetworkModificationExecutionService largeNetworkModificationExecutionService ) {
7983 this .networkStoreService = networkStoreService ;
8084 this .equipmentInfosService = equipmentInfosService ;
@@ -83,6 +87,7 @@ public NetworkModificationApplicator(NetworkStoreService networkStoreService, Eq
8387 this .filterService = filterService ;
8488 this .loadFlowService = loadFlowService ;
8589 this .networkModificationObserver = networkModificationObserver ;
90+ this .networkModificationRepository = networkModificationRepository ;
8691 this .largeNetworkModificationExecutionService = largeNetworkModificationExecutionService ;
8792 }
8893
@@ -192,7 +197,7 @@ private ApplicationStatus apply(ModificationApplicationGroup modificationGroupIn
192197 .filter (ModificationEntity ::getActivated )
193198 .map (m -> {
194199 listener .initModificationApplication (modificationGroupInfos .groupUuid (), m );
195- return apply (m . toModificationInfos ( ), listener .getNetwork (), reportNode );
200+ return apply (networkModificationRepository . getModificationInfos ( m ), listener .getNetwork (), reportNode );
196201 })
197202 .reduce (ApplicationStatus ::max )
198203 .orElse (ApplicationStatus .ALL_OK );
0 commit comments