[DRAFT] Move contingency lists to SA parameters #220

carojeandat · 2026-02-05T09:08:12Z

PR Summary

Still to do:

return null name when the contingency list no longer exists
add tests

…s name from directory server

thangqp · 2026-02-09T21:11:10Z

src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisProviderMock.java

+    static final UUID CONTINGENCY_LIST_NAME = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791f"); //"list1";
+    static final UUID CONTINGENCY_LIST2_NAME = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791g"); //"list2";
+    static final UUID CONTINGENCY_LIST_ERROR_NAME = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791h"); //"listError";
+    static final UUID CONTINGENCY_LIST_NAME_VARIANT = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791i"); //"listVariant";


Suggested change

static final UUID CONTINGENCY_LIST_NAME = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791f"); //"list1";

static final UUID CONTINGENCY_LIST2_NAME = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791g"); //"list2";

static final UUID CONTINGENCY_LIST_ERROR_NAME = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791h"); //"listError";

static final UUID CONTINGENCY_LIST_NAME_VARIANT = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791i"); //"listVariant";

static final UUID CONTINGENCY_LIST_NAME = UUID.fromString("f7e8f79b-7626-4f46-939d-3bfdc895b0dd");

static final UUID CONTINGENCY_LIST2_NAME = UUID.fromString("99fdbba0-0f30-4f24-b206-5481b00ad910");

static final UUID CONTINGENCY_LIST_ERROR_NAME = UUID.fromString("d6e582ca-5084-4ad6-bf56-2ed3effdf9eb");

static final UUID CONTINGENCY_LIST_NAME_VARIANT = UUID.fromString("98b6dcfc-0186-4aa6-a4e0-e4d04c4faab2");

Correct UUID format, could you replace XXX_NAME to XXX_UUID and search 'NAME' or 'Name' in the whole code to replace by 'UUID' or 'Uuid'

thangqp · 2026-02-09T21:12:35Z

src/test/java/org/gridsuite/securityanalysis/server/service/ActionsServiceTest.java

+    private static final UUID LIST_NAME = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791j"); //"myList";
+    private static final UUID LIST_NAME_VARIANT = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791k"); //"myListVariant";

-    private static final String VERY_LARGE_LIST_NAME = "veryLargelist";
+    private static final UUID VERY_LARGE_LIST_NAME = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791l"); //"veryLargelist";


Suggested change

private static final UUID LIST_NAME = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791j"); //"myList";

private static final UUID LIST_NAME_VARIANT = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791k"); //"myListVariant";

private static final String VERY_LARGE_LIST_NAME = "veryLargelist";

private static final UUID VERY_LARGE_LIST_NAME = UUID.fromString("6afd3d28-3f99-48d7-be9e-e97ffd0b791l"); //"veryLargelist";

private static final UUID LIST_NAME = UUID.fromString("e6bc6e4b-bbf1-4342-a8ae-49b213f0c85a");

private static final UUID LIST_NAME_VARIANT = UUID.fromString("81bb191f-b899-4999-91e3-2d158d208764");

private static final UUID VERY_LARGE_LIST_NAME = UUID.fromString("4856bff4-9ebe-4ba2-b66d-0242f27fce7b");

Could you replace XXX_NAME to XXX_UUID

thangqp · 2026-02-09T21:15:45Z

...in/java/org/gridsuite/securityanalysis/server/entities/SecurityAnalysisParametersEntity.java

+        contingencyLists.clear();
+        contingencyLists.addAll(entities);


Suggested change

contingencyLists.clear();

contingencyLists.addAll(entities);

if (contingencyLists == null) { // due to the use of @Builder.Default, the field is not initialized with an empty array

this.contingencyLists = entities;

} else {

contingencyLists.clear();

contingencyLists.addAll(entities);

}

thangqp · 2026-02-09T21:19:28Z

...in/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisParametersService.java

+                .contingencyLists(entity.getContingencyLists().stream()
+                        .map(c -> new ParametersContingencyListDTO(
+                                parametersContingenciesService.toDTO(c.getContingenciesIds()),
+                                c.getDescription(),
+                                c.isActivated()))
+                        .toList())


Suggested change

.contingencyLists(entity.getContingencyLists().stream()

.map(c -> new ParametersContingencyListDTO(

parametersContingenciesService.toDTO(c.getContingenciesIds()),

c.getDescription(),

c.isActivated()))

.toList())

.contingencyLists(Optional.of(entity.getContingencyLists().stream()

.map(c -> new ParametersContingencyListDTO(

parametersContingenciesService.toDTO(c.getContingenciesIds()),

c.getDescription(),

c.isActivated()))

.toList())

.filter(list -> !list.isEmpty()) // if empty list return null

.orElse(null))

To satisfy roundtrip consistance between dto <-> entity, if not test create/get a params will be failed

thangqp · 2026-02-09T21:21:26Z

src/main/java/org/gridsuite/securityanalysis/server/dto/ParametersContingenciesDTO.java

@@ -0,0 +1,20 @@
+package org.gridsuite.securityanalysis.server.dto;


Suggested change

package org.gridsuite.securityanalysis.server.dto;

/**

* 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.securityanalysis.server.dto;

thangqp · 2026-02-09T22:09:04Z

...ain/java/org/gridsuite/securityanalysis/server/entities/ParametersContingencyListEntity.java

+    @CollectionTable(
+            name = "parameters_contingency_list_contingencies",
+            joinColumns = @JoinColumn(name = "contingency_list_id")
+    )


Suggested change

@CollectionTable(

name = "parameters_contingency_list_contingencies",

joinColumns = @JoinColumn(name = "contingency_list_id")

)

@CollectionTable(

name = "parameters_contingency_lists_contingency_list",

joinColumns = @JoinColumn(name = "parameters_contingency_lists_id")

foreignKey = @ForeignKey(name = "parameters_contingency_lists_id_fk")

)

thangqp · 2026-02-09T22:09:48Z

...ain/java/org/gridsuite/securityanalysis/server/entities/ParametersContingencyListEntity.java

+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    @Column(name = "contingency_list_id")


Suggested change

@Column(name = "contingency_list_id")

@Column(name = "id")

thangqp · 2026-02-09T22:13:57Z

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

@@ -0,0 +1,63 @@
+package org.gridsuite.securityanalysis.server.service;


Suggested change

package org.gridsuite.securityanalysis.server.service;

/**

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.securityanalysis.server.service;

thangqp · 2026-02-09T22:16:28Z

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

+        this.restTemplate = restTemplate;
+    }
+
+    public String getContingenciesName(UUID contingenciesId) {


It is better with a bulk fetch with a list of uuid and make the signature more generic, for example

Map<UUID, String> getElementNames(List elementUuids)

thangqp · 2026-02-09T22:30:00Z

src/main/java/org/gridsuite/securityanalysis/server/service/ParametersContingenciesService.java

+ * @author Caroline Jeandat {@literal <caroline.jeandat at rte-france.com>}
+ */
+@Service
+public class ParametersContingenciesService {


I am not sure we need a dedicated service just for mapping

carojeandat added 5 commits February 5, 2026 10:04

draft version

3da711f

add several contingencies for each contingencyList + get contingencie…

357b562

…s name from directory server

add changelog

c3f8d59

add changelog

c529e1f

fix index name

40863e6

thangqp reviewed Feb 9, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DRAFT] Move contingency lists to SA parameters #220

[DRAFT] Move contingency lists to SA parameters #220

Uh oh!

carojeandat commented Feb 5, 2026 •

edited

Loading

Uh oh!

thangqp Feb 9, 2026

Uh oh!

thangqp Feb 9, 2026

Uh oh!

thangqp Feb 9, 2026

Uh oh!

thangqp Feb 9, 2026

Uh oh!

thangqp Feb 9, 2026

Uh oh!

thangqp Feb 9, 2026

Uh oh!

thangqp Feb 9, 2026

Uh oh!

thangqp Feb 9, 2026

Uh oh!

thangqp Feb 9, 2026

Uh oh!

thangqp Feb 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		@@ -0,0 +1,20 @@
		package org.gridsuite.securityanalysis.server.dto;

-package org.gridsuite.securityanalysis.server.dto;
+/**
+ * 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.securityanalysis.server.dto;

		@@ -0,0 +1,63 @@
		package org.gridsuite.securityanalysis.server.service;

[DRAFT] Move contingency lists to SA parameters #220

Are you sure you want to change the base?

[DRAFT] Move contingency lists to SA parameters #220

Uh oh!

Conversation

carojeandat commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Summary

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

carojeandat commented Feb 5, 2026 •

edited

Loading