Skip to content

add userId header to duplicateSensitivityAnalysisParameters request #962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khouadrired merged 3 commits into from
Mar 10, 2026
Merged

add userId header to duplicateSensitivityAnalysisParameters request #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfb5ed0
add userId header to duplicateSensitivityAnalysisParameters request
khouadrired Mar 9, 2026
ec77789
move ContingencyCount to dto package
khouadrired Mar 9, 2026
5524987
remove userId header from create Request
khouadrired Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...tudy/server/service/ContingencyCount.java → ...te/study/server/dto/ContingencyCount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.study.server.service;
package org.gridsuite.study.server.dto;

/**
* @author Radouane KHOUADRI {@literal <redouane.khouadri at rte-france.com>}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/gridsuite/study/server/service/ActionsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import org.apache.commons.lang3.StringUtils;
import org.gridsuite.study.server.RemoteServicesProperties;
import org.gridsuite.study.server.dto.ContingencyCount;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/gridsuite/study/server/service/ConsumerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ private UUID createDefaultSensitivityAnalysisParameters(String userId, UserProfi
if (userProfileInfos != null && userProfileInfos.getSensitivityAnalysisParameterId() != null) {
// try to access/duplicate the user profile sensitivity analysis parameters
try {
return sensitivityAnalysisService.duplicateSensitivityAnalysisParameters(userProfileInfos.getSensitivityAnalysisParameterId());
return sensitivityAnalysisService.duplicateSensitivityAnalysisParameters(userProfileInfos.getSensitivityAnalysisParameterId(), userId);
Copy link
Contributor

@antoinebhs antoinebhs Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove on create?
https://github.com/gridsuite/study-server/pull/948/changes

Copy link
Contributor Author

@khouadrired khouadrired Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

} catch (Exception e) {
// TODO try to report a log in Root subreporter ?
LOGGER.error(String.format("Could not duplicate sensitivity analysis parameters with id '%s' from user/profile '%s/%s'. Using default parameters",
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/org/gridsuite/study/server/service/SensitivityAnalysisService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public UUID createDefaultSensitivityAnalysisParameters() {
return restTemplate.postForObject(sensitivityAnalysisServerBaseUri + path, null, UUID.class);
}

public UUID createSensitivityAnalysisParameters(String parameters, String userId) {
public UUID createSensitivityAnalysisParameters(String parameters) {

Objects.requireNonNull(parameters);

Expand All @@ -278,14 +278,13 @@ public UUID createSensitivityAnalysisParameters(String parameters, String userId
.toUriString();

HttpHeaders headers = new HttpHeaders();
headers.set(HEADER_USER_ID, userId);

HttpEntity<String> httpEntity = new HttpEntity<>(parameters, headers);

return restTemplate.postForObject(sensitivityAnalysisServerBaseUri + path, httpEntity, UUID.class);
}

public UUID duplicateSensitivityAnalysisParameters(UUID sourceParametersUuid) {
public UUID duplicateSensitivityAnalysisParameters(UUID sourceParametersUuid, String userId) {

Objects.requireNonNull(sourceParametersUuid);

Expand All @@ -295,7 +294,12 @@ public UUID duplicateSensitivityAnalysisParameters(UUID sourceParametersUuid) {
.buildAndExpand()
.toUriString();

return restTemplate.postForObject(sensitivityAnalysisServerBaseUri + path, null, UUID.class);
HttpHeaders headers = new HttpHeaders();
headers.set(HEADER_USER_ID, userId);

HttpEntity<String> httpEntity = new HttpEntity<>(headers);

return restTemplate.postForObject(sensitivityAnalysisServerBaseUri + path, httpEntity, UUID.class);
}

public void updateSensitivityAnalysisParameters(UUID parametersUuid, @Nullable String parameters) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/gridsuite/study/server/service/StudyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ private StudyEntity duplicateStudyEntity(StudyEntity sourceStudyEntity, UUID new

UUID copiedSensitivityAnalysisParametersUuid = null;
if (sourceStudyEntity.getSensitivityAnalysisParametersUuid() != null) {
copiedSensitivityAnalysisParametersUuid = sensitivityAnalysisService.duplicateSensitivityAnalysisParameters(sourceStudyEntity.getSensitivityAnalysisParametersUuid());
copiedSensitivityAnalysisParametersUuid = sensitivityAnalysisService.duplicateSensitivityAnalysisParameters(sourceStudyEntity.getSensitivityAnalysisParametersUuid(), userId);
}

UUID copiedVoltageInitParametersUuid = null;
Expand Down Expand Up @@ -3336,7 +3336,7 @@ public boolean createOrUpdateSensitivityAnalysisParameters(StudyEntity studyEnti
if (parameters == null && userProfileInfos.getSensitivityAnalysisParameterId() != null) {
// reset case, with existing profile, having default sensitivity analysis params
try {
UUID sensitivityAnalysisParametersFromProfileUuid = sensitivityAnalysisService.duplicateSensitivityAnalysisParameters(userProfileInfos.getSensitivityAnalysisParameterId());
UUID sensitivityAnalysisParametersFromProfileUuid = sensitivityAnalysisService.duplicateSensitivityAnalysisParameters(userProfileInfos.getSensitivityAnalysisParameterId(), userId);
studyEntity.setSensitivityAnalysisParametersUuid(sensitivityAnalysisParametersFromProfileUuid);
removeSensitivityAnalysisParameters(existingSensitivityAnalysisParametersUuid);
return userProfileIssue;
Expand All @@ -3349,7 +3349,7 @@ public boolean createOrUpdateSensitivityAnalysisParameters(StudyEntity studyEnti
}

if (existingSensitivityAnalysisParametersUuid == null) {
existingSensitivityAnalysisParametersUuid = sensitivityAnalysisService.createSensitivityAnalysisParameters(parameters, userId);
existingSensitivityAnalysisParametersUuid = sensitivityAnalysisService.createSensitivityAnalysisParameters(parameters);
studyEntity.setSensitivityAnalysisParametersUuid(existingSensitivityAnalysisParametersUuid);
} else {
sensitivityAnalysisService.updateSensitivityAnalysisParameters(existingSensitivityAnalysisParametersUuid, parameters);
Expand Down
1 change: 1 addition & 0 deletions src/test/java/org/gridsuite/study/server/rootnetworks/SecurityAnalysisTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.powsybl.security.LimitViolationType;
import com.powsybl.security.SecurityAnalysisParameters;
import org.gridsuite.study.server.ContextConfigurationWithTestChannel;
import org.gridsuite.study.server.dto.ContingencyCount;
import org.gridsuite.study.server.dto.NodeReceiver;
import org.gridsuite.study.server.dto.RootNetworkNodeInfo;
import org.gridsuite.study.server.networkmodificationtree.dto.*;
Expand Down